From MAILER-DAEMON Thu Dec 01 05:50:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RW4E1-0001zQ-NO for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 05:50:45 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 11:55:05 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4535 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 10:50:43 -0000 Author: danydb Date: 2011-12-01 11:55:03 +0100 (Thu, 01 Dec 2011) New Revision: 4535 Modified: phpcompta/trunk/html/style.css Log: style.css place of dossier Modified: phpcompta/trunk/html/style.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style.css 2011-12-01 01:59:31 UTC (rev 4534) +++ phpcompta/trunk/html/style.css 2011-12-01 10:55:03 UTC (rev 4535) @@ -989,13 +989,14 @@ { display:inline; float:left; - width:400px; + width:40em; =20 } #calc { display:inline; float:left; + width: 15em; } div#wait_box { From MAILER-DAEMON Thu Dec 01 06:18:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RW4eb-00014B-87 for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 06:18:13 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 12:22:40 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4536 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 11:18:12 -0000 Author: danydb Date: 2011-12-01 12:22:39 +0100 (Thu, 01 Dec 2011) New Revision: 4536 Modified: phpcompta/trunk/html/style-color.css phpcompta/trunk/html/style-light.css phpcompta/trunk/html/style.css Log: improve css : place of dossier name Modified: phpcompta/trunk/html/style-color.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-color.css 2011-12-01 10:55:03 UTC (rev 453= 5) +++ phpcompta/trunk/html/style-color.css 2011-12-01 11:22:39 UTC (rev 453= 6) @@ -138,7 +138,6 @@ div.u_tool { float:right; margin-right:10px; - text-align:right; =20 } div.module { @@ -194,9 +193,8 @@ =20 } div.content{ - - float:left; padding-top:7px; + margin-top:7px; width:100%; font-family:verdana,helvetica,sans-serif; clear:both; @@ -995,7 +993,6 @@ { display:inline; float:left; - width:400px; =20 } #calc 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-12-01 10:55:03 UTC (rev 453= 5) +++ phpcompta/trunk/html/style-light.css 2011-12-01 11:22:39 UTC (rev 453= 6) @@ -138,8 +138,6 @@ div.u_tool { float:right; margin-right:10px; - text-align:right; - } div.module { position:absolute; @@ -195,13 +193,9 @@ } div.content{ =20 - float:left; padding-top:7px; width:100%; font-family:verdana,helvetica,sans-serif; - clear:both; - - } div.content30{ =20 @@ -993,8 +987,6 @@ { display:inline; float:left; - width:400px; - } #calc { Modified: phpcompta/trunk/html/style.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style.css 2011-12-01 10:55:03 UTC (rev 4535) +++ phpcompta/trunk/html/style.css 2011-12-01 11:22:39 UTC (rev 4536) @@ -134,8 +134,6 @@ div.u_tool { float:right; margin-right:10px; - text-align:right; - } div.module { position:absolute; @@ -191,11 +189,10 @@ } div.content{ =20 - float:left; padding-top:7px; + margin-top:7px; width:100%; font-family:verdana,helvetica,sans-serif; - clear:both; =20 =20 } @@ -845,12 +842,11 @@ h2.dossier { color:darkblue; font-style: italic; -display:inline; - -font-size:14px; -margin:0; -padding:0; -text-align:center; + display:inline; + font-size:14px; + margin:0px; + padding:0px; + font-variant:small-caps; } /* */ div.add_todo_list { @@ -989,14 +985,11 @@ { display:inline; float:left; - width:40em; - } #calc { display:inline; float:left; - width: 15em; } div#wait_box { From MAILER-DAEMON Thu Dec 01 06:22:38 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RW4is-00033C-DC for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 06:22:38 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 12:27:06 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4537 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 11:22:36 -0000 Author: danydb Date: 2011-12-01 12:27:05 +0100 (Thu, 01 Dec 2011) New Revision: 4537 Modified: phpcompta/trunk/html/style-epad.css Log: improve css : place of dossier name Modified: phpcompta/trunk/html/style-epad.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-epad.css 2011-12-01 11:22:39 UTC (rev 4536= ) +++ phpcompta/trunk/html/style-epad.css 2011-12-01 11:27:05 UTC (rev 4537= ) @@ -194,8 +194,6 @@ =20 } div.content{ - - float:left; padding-top:7px; width:100%; font-family:verdana,helvetica,sans-serif; @@ -991,8 +989,6 @@ { display:inline; float:left; - width:400px; - } #calc { @@ -1101,6 +1097,5 @@ #dossier { display:inline; float:left; - width:40em; top:0px; } \ No newline at end of file From MAILER-DAEMON Thu Dec 01 14:40:47 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWCUx-0002eQ-3K for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 14:40:47 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 20:45:21 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4538 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 19:40:45 -0000 Author: danydb Date: 2011-12-01 20:45:12 +0100 (Thu, 01 Dec 2011) New Revision: 4538 Modified: phpcompta/trunk/html/style-color.css phpcompta/trunk/html/style-epad.css phpcompta/trunk/html/style-light.css phpcompta/trunk/html/style.css Log: topmenu is not float 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-12-01 11:27:05 UTC (rev 453= 7) +++ phpcompta/trunk/html/style-color.css 2011-12-01 19:45:12 UTC (rev 453= 8) @@ -841,7 +841,6 @@ =20 } div.topmenu { - float:left; width:100%; =20 } Modified: phpcompta/trunk/html/style-epad.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-epad.css 2011-12-01 11:27:05 UTC (rev 4537= ) +++ phpcompta/trunk/html/style-epad.css 2011-12-01 19:45:12 UTC (rev 4538= ) @@ -837,7 +837,6 @@ =20 } div.topmenu { - float:left; width:100%; =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-12-01 11:27:05 UTC (rev 453= 7) +++ phpcompta/trunk/html/style-light.css 2011-12-01 19:45:12 UTC (rev 453= 8) @@ -835,7 +835,7 @@ =20 } div.topmenu { - float:left; + width:100%; =20 } Modified: phpcompta/trunk/html/style.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style.css 2011-12-01 11:27:05 UTC (rev 4537) +++ phpcompta/trunk/html/style.css 2011-12-01 19:45:12 UTC (rev 4538) @@ -835,7 +835,6 @@ } div.topmenu { float:left; - width:100%; margin-top:2px; } =20 From MAILER-DAEMON Thu Dec 01 14:53:32 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWChI-0006Jp-Ur for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 14:53:32 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 20:58:08 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4539 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 19:53:31 -0000 Author: danydb Date: 2011-12-01 20:58:06 +0100 (Thu, 01 Dec 2011) New Revision: 4539 Modified: phpcompta/trunk/html/style.css Log: remove float for div.topmenu Modified: phpcompta/trunk/html/style.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style.css 2011-12-01 19:45:12 UTC (rev 4538) +++ phpcompta/trunk/html/style.css 2011-12-01 19:58:06 UTC (rev 4539) @@ -834,7 +834,6 @@ =20 } div.topmenu { - float:left; margin-top:2px; } =20 From MAILER-DAEMON Thu Dec 01 15:29:53 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWDGT-0005Al-FV for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 15:29:53 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 21:34:28 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4540 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 20:29:51 -0000 Author: danydb Date: 2011-12-01 21:34:26 +0100 (Thu, 01 Dec 2011) New Revision: 4540 Modified: phpcompta/trunk/include/template/form_ledger_fin.php Log: Bug with nbm Modified: phpcompta/trunk/include/template/form_ledger_fin.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/form_ledger_fin.php 2011-12-01 19:58= :06 UTC (rev 4539) +++ phpcompta/trunk/include/template/form_ledger_fin.php 2011-12-01 20:34= :26 UTC (rev 4540) @@ -32,7 +32,7 @@ echo td($item['qcode'].$item['search']); echo td($item['span']); echo td($item['comment']); -echo td(nbm($item['amount'])); +echo td($item['amount']); echo td($item['concerned']); echo ''; } From MAILER-DAEMON Thu Dec 01 16:03:10 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWDmg-0003tJ-4f for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 16:03:10 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 22:07:43 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4541 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 21:03:09 -0000 Author: danydb Date: 2011-12-01 22:07:42 +0100 (Thu, 01 Dec 2011) New Revision: 4541 Added: phpcompta/trunk/include/ajax_bank_saldo.php Removed: phpcompta/trunk/include/ajax_bank_saldo.php.php Modified: phpcompta/trunk/include/constant.php Log: rename file Copied: phpcompta/trunk/include/ajax_bank_saldo.php (from rev 4539, phpco= mpta/trunk/include/ajax_bank_saldo.php.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_bank_saldo.php (= rev 0) +++ phpcompta/trunk/include/ajax_bank_saldo.php 2011-12-01 21:07:42 UTC (= rev 4541) @@ -0,0 +1,78 @@ +check(); +if ( $user->check_jrn($_GET['j'])=3D=3D'X' ) return '{"saldo":"0"}'; +/* make a filter on the exercice */ + +$filter_year=3D" j_tech_per in (select p_id from parm_periode ". + "where p_exercice=3D'".$user->get_exercice()."')"; + + +$id=3D$cn->get_value('select jrn_def_bank from jrn_def where jrn_def_id=3D= $1',array($_GET['j'])); +$acc=3Dnew Fiche($cn,$id); + +$res=3D$acc->get_bk_balance($filter_year." and ( trim(jr_pj_number) !=3D= '' and jr_pj_number is not null)" ); + + +if ( empty($res) ) return '{"saldo":"0"}'; +$solde=3D$res['solde']; +if ( $res['debit'] < $res['credit'] ) $solde=3D$solde*(-1); + +//header("Content-type: text/html; charset: utf8",true); +echo '{"saldo":"'.$solde.'"}'; + + + +?> + Deleted: phpcompta/trunk/include/ajax_bank_saldo.php.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_bank_saldo.php.php 2011-12-01 20:34:26 U= TC (rev 4540) +++ phpcompta/trunk/include/ajax_bank_saldo.php.php 2011-12-01 21:07:42 U= TC (rev 4541) @@ -1,67 +0,0 @@ -Check(); - -$Ledger=3Dnew Acc_Ledger($cn,$l); -$prop=3D$Ledger->get_propertie(); -$pj_seq=3D$Ledger->guess_pj(); -$string=3D'{"pj":"'.$pj_seq.'"}'; - -header("Content-type: text/json; charset: utf8",true); -echo $string; - - -?> - Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-01 20:34:26 UTC (rev 454= 0) +++ phpcompta/trunk/include/constant.php 2011-12-01 21:07:42 UTC (rev 454= 1) @@ -36,12 +36,12 @@ /* uncomment for production */ =20 =20 -$version_phpcompta=3DSVNINFO; +/*$version_phpcompta=3DSVNINFO; define ("DEBUG",false); +*/ +$version_phpcompta=3D4444; +define ("DEBUG",false); =20 -/*$version_phpcompta=3D4444; -define ("DEBUG",false); -*/ define ("DBVERSION",98); define ("DBVERSIONREPO",14); define ('NOTFOUND','--not found--'); From MAILER-DAEMON Thu Dec 01 16:07:10 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWDqY-0004P2-GM for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 16:07:10 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 1 Dec 2011 22:11:44 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4542 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 21:07:08 -0000 Author: danydb Date: 2011-12-01 22:11:43 +0100 (Thu, 01 Dec 2011) New Revision: 4542 Modified: phpcompta/trunk/include/constant.php Log: remove debug Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-01 21:07:42 UTC (rev 454= 1) +++ phpcompta/trunk/include/constant.php 2011-12-01 21:11:43 UTC (rev 454= 2) @@ -36,12 +36,12 @@ /* uncomment for production */ =20 =20 -/*$version_phpcompta=3DSVNINFO; +$version_phpcompta=3DSVNINFO; define ("DEBUG",false); + +/* $version_phpcompta=3D4444; +define ("DEBUG",false); */ -$version_phpcompta=3D4444; -define ("DEBUG",false); - define ("DBVERSION",98); define ("DBVERSIONREPO",14); define ('NOTFOUND','--not found--'); From MAILER-DAEMON Thu Dec 01 18:05:02 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWFgc-0004Jw-7H for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 18:05:02 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 2 Dec 2011 00:09:33 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4543 - phpcompta/trunk/html/js X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 23:05:00 -0000 Author: danydb Date: 2011-12-02 00:09:32 +0100 (Fri, 02 Dec 2011) New Revision: 4543 Modified: phpcompta/trunk/html/js/ajax_fiche.js Log: erreur solde Modified: phpcompta/trunk/html/js/ajax_fiche.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/ajax_fiche.js 2011-12-01 21:11:43 UTC (rev 45= 42) +++ phpcompta/trunk/html/js/ajax_fiche.js 2011-12-01 23:09:32 UTC (rev 45= 43) @@ -177,7 +177,7 @@ } function ajax_error_saldo(request,json) { - alert('erreur : ajax fiche'); + alert('erreur : ajax solde '); } /*!\brief this function get the saldo * \param p_ctl the ctrl where we take the quick_code From MAILER-DAEMON Thu Dec 01 18:05:47 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWFhK-0004ju-Vu for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 18:05:46 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 2 Dec 2011 00:10:21 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4544 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 23:05:45 -0000 Author: danydb Date: 2011-12-02 00:10:20 +0100 (Fri, 02 Dec 2011) New Revision: 4544 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/template/module.php Log: Improve look for ANC + Add payment method + card name Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-01 23:0= 9:32 UTC (rev 4543) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-01 23:1= 0:20 UTC (rev 4544) @@ -1471,16 +1471,7 @@ $r.=3DHtmlInput::hidden('e_mp',$e_mp); /* 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}); =20 - /* needed for generating a invoice */ - $r.=3DHtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp}= ); - - $r.=3D"Pay=C3=A9 par ".${'e_mp_qcode_'.$e_mp}; - $r.=3D'
'; - } for ($i=3D0;$i < $nb_item;$i++) { $r.=3DHtmlInput::hidden("e_march".$i,${"e_march".$i}); @@ -1493,9 +1484,22 @@ $r.=3DHtmlInput::hidden("e_quant".$i,${"e_quant".$i}); =20 } + if ( ! $p_summary ) $r.=3D$this->extra_info(); + 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}); + + /* needed for generating a invoice */ + $r.=3DHtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_= mp}); + $fname =3D new Fiche($this->db); + $fname->get_by_qcode(${'e_mp_qcode_' . $e_mp}); + $r.=3D'

' . "Pay=C3=A9 pa= r " . ${'e_mp_qcode_' . $e_mp} . + " ".$fname->getName() . '

'; + $r.=3D'
'; + } // check for upload piece - if ( ! $p_summary ) $r.=3D$this->extra_info(); =20 + 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 2011-12-01 23:09:32= UTC (rev 4543) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-01 23:10:20= UTC (rev 4544) @@ -865,7 +865,10 @@ /* needed for generating a invoice */ $r.=3DHtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp}= ); =20 - $r.=3D_("Pay=C3=A9 par ").${'e_mp_qcode_'.$e_mp}; + $fname=3Dnew Fiche($this->db); + $fname->get_by_qcode(${'e_mp_qcode_'.$e_mp}); + $r.=3D'

'."Pay=C3=A9 par = ".${'e_mp_qcode_'.$e_mp}. + " ".$fname->getName().'

'; $r.=3D'
'; } =20 Modified: phpcompta/trunk/include/template/module.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/module.php 2011-12-01 23:09:32 UTC (= rev 4543) +++ phpcompta/trunk/include/template/module.php 2011-12-01 23:10:20 UTC (= rev 4544) @@ -47,6 +47,7 @@

Dossier :

+
@@ -85,4 +86,5 @@
=20
- \ No newline at end of file + +
\ No newline at end of file From MAILER-DAEMON Thu Dec 01 18:58:42 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWGWY-00064T-Vc for mharc-phpcompta-dev@gnu.org; Thu, 01 Dec 2011 18:58:42 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 2 Dec 2011 01:03:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4545 - in phpcompta/trunk: html html/image include/template 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: Thu, 01 Dec 2011 23:58:41 -0000 Author: danydb Date: 2011-12-02 01:03:15 +0100 (Fri, 02 Dec 2011) New Revision: 4545 Added: phpcompta/trunk/html/image/bg-submit5.png Modified: phpcompta/trunk/html/style-color.css phpcompta/trunk/html/style-light.css phpcompta/trunk/html/style.css phpcompta/trunk/include/template/module.php Log: improve style-light.css Added: phpcompta/trunk/html/image/bg-submit5.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: phpcompta/trunk/html/image/bg-submit5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: phpcompta/trunk/html/style-color.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-color.css 2011-12-01 23:10:20 UTC (rev 454= 4) +++ phpcompta/trunk/html/style-color.css 2011-12-02 00:03:15 UTC (rev 454= 5) @@ -838,7 +838,8 @@ } td.tool { border: solid 1px gray; - + background-color:white; +=09 } div.topmenu { width:100%; 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-12-01 23:10:20 UTC (rev 454= 4) +++ phpcompta/trunk/html/style-light.css 2011-12-02 00:03:15 UTC (rev 454= 5) @@ -316,13 +316,12 @@ text-decoration:none; display:inline; color: blue; - +=09 } a.mtitle:hover { font-size:10px; text-decoration:none; display:inline; - color: darkblue; background-color:#5D90CD; =20 @@ -331,7 +330,7 @@ font-size:1em; text-decoration:none; display:block; - color:white; + color:lightgrey; } a.dossier { font-size:10px; @@ -794,22 +793,23 @@ input[disabled], textarea[disabled], option[disabled], optgroup[disabled= ], select[disabled] { -moz-user-focus:ignore; -moz-user-input:disabled; - background-color:lightgrey; +background-color: teal; + color:black; cursor:inherit; } =20 a#anchorbutton, .button, a.button,div.content a.button { font-size:10px; - color:darkblue; + color:lightblue; font-weight: bold; - + border:1px black outset ; +=09 +background-image: url("image/bg-submit5.png"); +background-repeat: repeat-x; + background-position: left; text-decoration:none; font-family: arial,helvetica,sans-serif; - background-color: inherit; - border-style: solid ; - border-color: #0066ff; - border-width:1px; padding-bottom: 4px; padding-top: 4px; padding-right: 6px; @@ -819,20 +819,22 @@ margin-right:3px; margin-left:3px; cursor:pointer; - + font-size:1.1em; +=09 } a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:= hover { cursor:pointer; - background-color:darkblue; - color:#DEE3E5; + color:#90f979; margin-top:3px; margin-bottom:3px; margin-right:3px; margin-left:3px; + +border:1px #90f979 inset; } td.tool { border: solid 1px gray; - + background-color:lightgrey; } div.topmenu { =20 Modified: phpcompta/trunk/html/style.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style.css 2011-12-01 23:10:20 UTC (rev 4544) +++ phpcompta/trunk/html/style.css 2011-12-02 00:03:15 UTC (rev 4545) @@ -831,7 +831,8 @@ } td.tool { border: solid 1px gray; - + background-color: white; +=09 } div.topmenu { margin-top:2px; Modified: phpcompta/trunk/include/template/module.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/module.php 2011-12-01 23:10:20 UTC (= rev 4544) +++ phpcompta/trunk/include/template/module.php 2011-12-02 00:03:15 UTC (= rev 4545) @@ -54,7 +54,7 @@ "; From MAILER-DAEMON Fri Dec 02 07:54:03 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWSct-0006It-Tz for mharc-phpcompta-dev@gnu.org; Fri, 02 Dec 2011 07:54:03 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 2 Dec 2011 13:58:26 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4546 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2011 12:54:01 -0000 Author: danydb Date: 2011-12-02 13:58:23 +0100 (Fri, 02 Dec 2011) New Revision: 4546 Modified: phpcompta/trunk/include/action.common.inc.php phpcompta/trunk/include/adm.inc.php phpcompta/trunk/include/client.inc.php phpcompta/trunk/include/supplier.inc.php Log: Fix cosmetic bug for IE7 : span float replace by div Modified: phpcompta/trunk/include/action.common.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.common.inc.php 2011-12-02 00:03:15 UTC= (rev 4545) +++ phpcompta/trunk/include/action.common.inc.php 2011-12-02 12:58:23 UTC= (rev 4546) @@ -299,7 +299,7 @@ =20
- +
@@ -355,7 +355,7 @@ =20 =20
- +
=20
- +
"> "> - +
- +
"> ">
- +
"> "> "> - + From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4547 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2011 13:03:39 -0000 Author: danydb Date: 2011-12-03 14:08:01 +0100 (Sat, 03 Dec 2011) New Revision: 4547 Added: phpcompta/trunk/sql/upgrade.sql Log: attr_Def ad_id=3D20 must be numeric Added: 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 (rev 0) +++ phpcompta/trunk/sql/upgrade.sql 2011-12-03 13:08:01 UTC (rev 4547) @@ -0,0 +1 @@ +update attr_def set ad_type=3D'numeric' where ad_id=3D20; From MAILER-DAEMON Sat Dec 03 15:18:44 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWw2m-0005Ps-7V for mharc-phpcompta-dev@gnu.org; Sat, 03 Dec 2011 15:18:44 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 3 Dec 2011 21:23:11 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4548 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2011 20:18:43 -0000 Author: danydb Date: 2011-12-03 21:23:10 +0100 (Sat, 03 Dec 2011) New Revision: 4548 Modified: phpcompta/trunk/include/class_iposte.php Log: 0479 longueur iposte Modified: phpcompta/trunk/include/class_iposte.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iposte.php 2011-12-03 13:08:01 UTC (rev= 4547) +++ phpcompta/trunk/include/class_iposte.php 2011-12-03 20:23:10 UTC (rev= 4548) @@ -82,6 +82,24 @@ */ class IPoste extends HtmlInput { + + function __construct($p_name=3D"",$p_value=3D"") + { + $this->name=3D$p_name; + $this->readOnly=3Dfalse; + $this->size=3D10; + $this->width=3D50; + $this->heigh=3D20; + $this->value=3D$p_value; + $this->selected=3D""; + $this->table=3D0; + $this->disabled=3Dfalse; + $this->javascript=3D""; + $this->extra2=3D"all"; + $this->attribute=3Darray(); + + } + static function ipopup($p_name) { $ip=3Dnew IPopup($p_name); @@ -134,7 +152,6 @@ =20 /* create the text */ $itext=3Dnew IText($this->name,$this->value); - $itext->size=3D(isset($this->size))?$this->size:10; =20 /* create the button */ $ibutton=3D$this->dsp_button(); From MAILER-DAEMON Sat Dec 03 15:21:03 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWw51-0005VJ-Ey for mharc-phpcompta-dev@gnu.org; Sat, 03 Dec 2011 15:21:03 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 3 Dec 2011 21:25:31 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4549 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2011 20:21:02 -0000 Author: danydb Date: 2011-12-03 21:25:30 +0100 (Sat, 03 Dec 2011) New Revision: 4549 Modified: phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/search.inc.php Log: 0480 recherche ne fonctionne plus 0481 recherche dans recocile ne fonctionne plus Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-03 20:23:10 UTC = (rev 4548) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-03 20:25:30 UTC = (rev 4549) @@ -600,7 +600,7 @@ // Count $count=3D$this->db->count_sql($sql); // Add the limit - $sql.=3D$limit; + $sql.=3D" order by jr_date asc ".$limit; =20 // Execute SQL stmt $Res=3D$this->db->exec_sql($sql); @@ -665,7 +665,7 @@ if ( $this->type=3D=3D'') $r.=3Dtd($row['jrn_def_name']); // date $r.=3D""; - $r.=3D$row['jr_date']; + $r.=3D$row['str_jr_date']; $r.=3D""; =20 // pj @@ -794,7 +794,6 @@ $count=3D$this->db->count_sql($sql); // Add the limit $sql.=3D$order.$limit.$offset; - // Execute SQL stmt $Res=3D$this->db->exec_sql($sql); =20 @@ -859,11 +858,11 @@ if ( $this->type=3D=3D'') $r.=3Dtd($row['jrn_def_name']); // date $r.=3D""; - $r.=3D$row['jr_date']; + $r.=3D$row['str_jr_date']; $r.=3D""; // echeance $r.=3D""; - $r.=3D$row['jr_ech']; + $r.=3D$row['str_jr_ech']; $r.=3D""; =20 // pj @@ -2398,8 +2397,8 @@ $sql=3D"select jr_id , jr_montant, substr(jr_comment,1,60) as jr_comment, - to_char(jr_ech,'DD.MM.YYYY') as jr_ech, - to_char(jr_date,'DD.MM.YYYY') as jr_date, + to_char(jr_ech,'DD.MM.YYYY') as str_jr_ech, + to_char(jr_date,'DD.MM.YYYY') as str_jr_date, jr_date as jr_date_order, jr_grpt_id, jr_rapt, @@ -2442,8 +2441,8 @@ join jrn_def on jrn_def_id=3Djr_def_id join parm_periode on p_id=3Djr_tech_per"; =20 - if ( $p_array !=3D null ) - extract($p_array); + if ( ! empty($p_array)) extract($p_array); + =09 $r_jrn=3D(isset($r_jrn))?$r_jrn:-1; =20 /* if no variable are set then give them a default @@ -2558,26 +2557,26 @@ $and=3D" and "; } // date - if ( isDate($date_start) !=3D null ) + if (isset ($date_start) && isDate($date_start) !=3D null ) { $fil_date=3D$and." jr_date >=3D to_date('".$date_start."','D= D.MM.YYYY')"; $and=3D" and "; } - if ( isDate($date_end) !=3D null ) + if (isset ($date_end) && isDate($date_end) !=3D null ) { $fil_date.=3D$and." jr_date <=3D to_date('".$date_end."','DD= .MM.YYYY')"; $and=3D" and "; } // comment - $desc=3Dsql_string($desc); - if ( $desc !=3D null ) + if (isset ($desc) && $desc !=3D null ) { + $desc=3Dsql_string($desc); $fil_desc=3D$and." ( upper(jr_comment) like upper('%".$desc.= "%') or upper(jr_pj_number) like upper('%".$desc."%') ". " or upper(jr_internal) like upper('%".$desc."%')= )"; $and=3D" and "; } // Poste - if ( $accounting !=3D null ) + if ( isset ($accounting) && $accounting !=3D null ) { $fil_account=3D$and." jr_grpt_id in (select j_grpt from jrnx where j_poste::text like '$accounting= %' ) "; @@ -2585,7 +2584,7 @@ } // Quick Code if ( isset ($qcodesearch_op)) $qcode=3D$qcodesearch_op; - if ( $qcode !=3D null ) + if ( isset ($qcode) && $qcode !=3D null ) { $fil_qcode=3D$and." jr_grpt_id in ( select j_grpt from jrnx where trim(j_qcode) =3D upper(trim('$qcode')= ))"; Modified: phpcompta/trunk/include/search.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/search.inc.php 2011-12-03 20:23:10 UTC (rev 4= 548) +++ phpcompta/trunk/include/search.inc.php 2011-12-03 20:25:30 UTC (rev 4= 549) @@ -80,12 +80,7 @@ put_global( array ( - array('key'=3D>'ledger_type','value'=3D>'ALL'), - array('key'=3D>'date_start','value'=3D>'ALL'), - array('key'=3D>'date_end','value'=3D>'ALL'), - array('key'=3D>'desc','value'=3D>''), - array('key'=3D>'qcode','value'=3D>''), - array('key'=3D>'accounting','value'=3D>'') + array('key'=3D>'ledger_type','value'=3D>'ALL') ) =20 ); @@ -106,6 +101,12 @@ else $array=3D$_GET; $array['p_action']=3D'ALL'; + if ( ! isset ($array['date_start']) || ! isset ($array['date_end'])) + { + // get first date of current exercice + list($array['date_start'],$array['date_end'])=3D$User->get_limit_curre= nt_exercice(); + } + list($sql,$where)=3D$ledger->build_search_sql($array); // Count nb of line $max_line=3D$cn->count_sql($sql); From MAILER-DAEMON Sat Dec 03 15:29:12 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWwCu-0006gy-Uo for mharc-phpcompta-dev@gnu.org; Sat, 03 Dec 2011 15:29:12 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 3 Dec 2011 21:33:41 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4550 - in phpcompta/trunk: html/admin/sql/patch include sql 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, 03 Dec 2011 20:29:11 -0000 Author: danydb Date: 2011-12-03 21:33:40 +0100 (Sat, 03 Dec 2011) New Revision: 4550 Added: phpcompta/trunk/html/admin/sql/patch/upgrade98.sql Modified: phpcompta/trunk/include/constant.php phpcompta/trunk/sql/upgrade.sql Log: champs dans attr_def Ajout dans PCMN poste comptable manquant Added: phpcompta/trunk/html/admin/sql/patch/upgrade98.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/admin/sql/patch/upgrade98.sql = (rev 0) +++ phpcompta/trunk/html/admin/sql/patch/upgrade98.sql 2011-12-03 20:33:4= 0 UTC (rev 4550) @@ -0,0 +1,10 @@ +begin; + +update attr_def set ad_type=3D'numeric' where ad_id=3D20; +insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',1),tva_comment,substring(split_part(tva_poste,',',= 1),1,3),'PAS' from tva_rate where split_part(tva_poste,',',1) not in (se= lect pcm_val from tmp_pcmn); +insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',= 2),1,3),'ACT' from tva_rate where split_part(tva_poste,',',2) not in (se= lect pcm_val from tmp_pcmn); + + +update version set val=3D99; + +commit; \ No newline at end of file Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-03 20:25:30 UTC (rev 454= 9) +++ phpcompta/trunk/include/constant.php 2011-12-03 20:33:40 UTC (rev 455= 0) @@ -42,7 +42,7 @@ /* $version_phpcompta=3D4444; define ("DEBUG",false); */ -define ("DBVERSION",98); +define ("DBVERSION",99); define ("DBVERSIONREPO",14); define ('NOTFOUND','--not found--'); =20 Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-12-03 20:25:30 UTC (rev 4549) +++ phpcompta/trunk/sql/upgrade.sql 2011-12-03 20:33:40 UTC (rev 4550) @@ -1 +1,3 @@ update attr_def set ad_type=3D'numeric' where ad_id=3D20; +insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',1),tva_comment,substring(split_part(tva_poste,',',= 1),1,3),'PAS' from tva_rate where split_part(tva_poste,',',1) not in (se= lect pcm_val from tmp_pcmn); +insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',= 2),1,3),'ACT' from tva_rate where split_part(tva_poste,',',2) not in (se= lect pcm_val from tmp_pcmn); \ No newline at end of file From MAILER-DAEMON Sat Dec 03 16:16:51 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RWwx1-0005xp-6g for mharc-phpcompta-dev@gnu.org; Sat, 03 Dec 2011 16:16:51 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 3 Dec 2011 22:21:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4551 - in phpcompta/trunk: html/admin/sql/patch html/js include sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2011 21:16:49 -0000 Author: danydb Date: 2011-12-03 22:21:16 +0100 (Sat, 03 Dec 2011) New Revision: 4551 Modified: phpcompta/trunk/html/admin/sql/patch/upgrade98.sql phpcompta/trunk/html/js/card.js phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/class_fiche_def.php phpcompta/trunk/include/class_iposte.php phpcompta/trunk/sql/upgrade.sql Log: size of attribut Modified: phpcompta/trunk/html/admin/sql/patch/upgrade98.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/admin/sql/patch/upgrade98.sql 2011-12-03 20:33:4= 0 UTC (rev 4550) +++ phpcompta/trunk/html/admin/sql/patch/upgrade98.sql 2011-12-03 21:21:1= 6 UTC (rev 4551) @@ -1,6 +1,9 @@ begin; =20 -update attr_def set ad_type=3D'numeric' where ad_id=3D20; +update attr_def set ad_type=3D'poste' where ad_id=3D5; +update attr_def set ad_type=3D'numeric',ad_size=3D6 where ad_id in (20,3= 1); +update attr_def set ad_size=3D17 where ad_type=3D'poste'; + insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',1),tva_comment,substring(split_part(tva_poste,',',= 1),1,3),'PAS' from tva_rate where split_part(tva_poste,',',1) not in (se= lect pcm_val from tmp_pcmn); insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',= 2),1,3),'ACT' from tva_rate where split_part(tva_poste,',',2) not in (se= lect pcm_val from tmp_pcmn); =20 Modified: phpcompta/trunk/html/js/card.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/card.js 2011-12-03 20:33:40 UTC (rev 4550) +++ phpcompta/trunk/html/js/card.js 2011-12-03 21:21:16 UTC (rev 4551) @@ -299,7 +299,7 @@ var content=3D'card_'+card_layer; var nTop=3DposY-40; var nLeft=3DposX-20; - var str_style=3D"top:"+nTop+";left:"+nLeft+";width:40em;height:auto"= ; + var str_style=3D"top:"+nTop+";left:"+nLeft+";width:45em;height:auto"= ; =20 var popup=3D{'id': content,'cssclass':'inner_box','style':str_style= ,'html':loading(),'drag':true}; =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 2011-12-03 20:33:40 UTC (rev = 4550) +++ phpcompta/trunk/include/class_fiche.php 2011-12-03 21:21:16 UTC (rev = 4551) @@ -643,6 +643,7 @@ $w=3Dnew IPoste("av_text".$r->ad_id); $w->set_attribute('ipopup','ipop_account'); $w->set_attribute('account',"av_text".$r->ad_id); + $w->width=3D$r->ad_size; $w->table=3D0; $bulle=3DHtmlInput::infobulle(14); break; @@ -651,6 +652,7 @@ // filter on frd_id $sql=3D' select fd_id from fiche_def '; $filter=3D$this->cn->make_list($sql); + $w->width=3D$r->ad_size; $w->extra=3D$filter; $w->extra2=3D0; $label=3Dnew ISpan(); Modified: phpcompta/trunk/include/class_fiche_def.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche_def.php 2011-12-03 20:33:40 UTC (= rev 4550) +++ phpcompta/trunk/include/class_fiche_def.php 2011-12-03 21:21:16 UTC (= rev 4551) @@ -88,7 +88,7 @@ $t->jnt_order=3D$row['jnt_order']; $t->ad_size=3D$row['ad_size']; $t->ad_type=3D$row['ad_type']; - $this->attribut[$i]=3D$t; + $this->attribut[$i]=3Dclone $t; } return $this->attribut; } Modified: phpcompta/trunk/include/class_iposte.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iposte.php 2011-12-03 20:33:40 UTC (rev= 4550) +++ phpcompta/trunk/include/class_iposte.php 2011-12-03 21:21:16 UTC (rev= 4551) @@ -21,8 +21,8 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 /*!\file - * \brief Html Input=20 - *=20 + * \brief Html Input + * */ require_once('class_html_input.php'); require_once('class_itext.php'); @@ -31,7 +31,7 @@ require_once('function_javascript.php'); /** *@brief show a button, for selecting a account and a input text for man= ually inserting an account - * the different value of table are=20 + * the different value of table are * - 0 no table, it means no TD tags * - 1 the button and the text are separated by TD tags * - 2 the button and the text are in the same column (TD) @@ -63,11 +63,11 @@ echo js_include('controls.js'); echo js_include('dragdrop.js'); echo js_include('accounting_item.js'); -=20 -=20 + + require_once('class_iposte.php'); echo IPoste::ipopup('ipop_account'); -=20 + // In the FORM $text=3Dnew IPoste(); $text->name('field'); @@ -76,8 +76,8 @@ $text->set_attribute('gDossier',Dossier::id()); $text->set_attribute('jrn',0); $text->set_attribute('account','field'); -=20 -=20 + + \endcode */ class IPoste extends HtmlInput @@ -88,8 +88,6 @@ $this->name=3D$p_name; $this->readOnly=3Dfalse; $this->size=3D10; - $this->width=3D50; - $this->heigh=3D20; $this->value=3D$p_value; $this->selected=3D""; $this->table=3D0; @@ -152,7 +150,7 @@ =20 /* create the text */ $itext=3Dnew IText($this->name,$this->value); - + $itext->size=3D$this->size; /* create the button */ $ibutton=3D$this->dsp_button(); if ( $this->table=3D=3D3) Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-12-03 20:33:40 UTC (rev 4550) +++ phpcompta/trunk/sql/upgrade.sql 2011-12-03 21:21:16 UTC (rev 4551) @@ -1,3 +1,6 @@ update attr_def set ad_type=3D'numeric' where ad_id=3D20; insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',1),tva_comment,substring(split_part(tva_poste,',',= 1),1,3),'PAS' from tva_rate where split_part(tva_poste,',',1) not in (se= lect pcm_val from tmp_pcmn); -insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',= 2),1,3),'ACT' from tva_rate where split_part(tva_poste,',',2) not in (se= lect pcm_val from tmp_pcmn); \ No newline at end of file +insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',= 2),1,3),'ACT' from tva_rate where split_part(tva_poste,',',2) not in (se= lect pcm_val from tmp_pcmn); +update attr_def set ad_type=3D'numeric',ad_size=3D6 where ad_id=3D20; +update attr_def set ad_type=3D'poste' where ad_id=3D5; +update attr_def set ad_size=3D10 where ad_type=3D'poste'; From MAILER-DAEMON Sun Dec 04 00:17:57 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RX4Sb-0006iy-6F for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 00:17:57 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 06:22:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4552 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 05:17:56 -0000 Author: danydb Date: 2011-12-04 06:22:15 +0100 (Sun, 04 Dec 2011) New Revision: 4552 Modified: phpcompta/trunk/include/class_inum.php Log: size is set in the constructor Modified: phpcompta/trunk/include/class_inum.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_inum.php 2011-12-03 21:21:16 UTC (rev 4= 551) +++ phpcompta/trunk/include/class_inum.php 2011-12-04 05:22:15 UTC (rev 4= 552) @@ -42,7 +42,6 @@ /*!\brief print in html the readonly value of the widget*/ public function display() { - $this->size=3D9; $readonly=3D" readonly "; $style=3D'style=3D"border:solid 1px blue;color:black;background:= #EDEDED;text-align:right"'; $this->value=3Dstr_replace('"','',$this->value); From MAILER-DAEMON Sun Dec 04 00:28:11 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RX4cV-0007Rv-QR for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 00:28:11 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 06:32:37 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4553 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 05:28:10 -0000 Author: danydb Date: 2011-12-04 06:32:34 +0100 (Sun, 04 Dec 2011) New Revision: 4553 Modified: phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/export_histo_csv.php Log: date problem with CSV (str_jr_date instead of jr_date) Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 05:22:15 UTC = (rev 4552) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 05:32:34 UTC = (rev 4553) @@ -2442,7 +2442,7 @@ join parm_periode on p_id=3Djr_tech_per"; =20 if ( ! empty($p_array)) extract($p_array); - =09 + $r_jrn=3D(isset($r_jrn))?$r_jrn:-1; =20 /* if no variable are set then give them a default @@ -2452,22 +2452,17 @@ $amount_min=3D0; $amount_max=3D0; =20 - if ( ! isset ($date_start)) - { - $user=3Dnew User($this->db); - $exercice=3D$user->get_exercice(); - - $per=3Dnew Periode($this->db); - list($per_start,$per_end)=3D$per->limit_year($exercice); - list($date_start,$none)=3D$per_start->get_date_limit(); - list($none,$date_end)=3D$per_end->get_date_limit(); - - } $desc=3D''; $qcode=3D(isset($qcode))?$qcode:""; if ( isset($qcodesearch_op)) $qcode=3D$qcodesearch_op; $accounting=3D(isset($accounting))?$accounting:""; - + $periode=3Dnew Periode($this->db); + $user=3Dnew User($this->db); + $p_id=3D$user->get_periode(); + if ( $p_id !=3D null ) + { + list($date_start,$date_end)=3D$periode->get_date_limit($p_id); + } } =20 /* if p_jrn : 0 if means all ledgers, if -1 means all ledger of = this Modified: phpcompta/trunk/include/export_histo_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_histo_csv.php 2011-12-04 05:22:15 UTC = (rev 4552) +++ phpcompta/trunk/include/export_histo_csv.php 2011-12-04 05:32:34 UTC = (rev 4553) @@ -50,8 +50,8 @@ { printf('"%s";',$res[$i]['jr_internal']); printf('"%s";',$res[$i]['jrn_def_name']); - printf('"%s";',$res[$i]['jr_date']); - printf('"%s";',$res[$i]['jr_ech']); + printf('"%s";',$res[$i]['str_jr_date']); + printf('"%s";',$res[$i]['str_jr_ech']); printf('"%s";',$res[$i]['jr_pj_number']); printf('"%s";',$res[$i]['quick_code']); printf('"%s %s";',$res[$i]['name'],$res[$i]['first_name']); From MAILER-DAEMON Sun Dec 04 00:30:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RX4eV-00080D-KH for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 00:30:15 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 06:34:42 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r205 - trunk/tools/include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 05:30:14 -0000 Author: danydb Date: 2011-12-04 06:34:38 +0100 (Sun, 04 Dec 2011) New Revision: 205 Modified: trunk/tools/include/template/search_view.php Log: date problem with CSV (str_jr_date instead of jr_date) Modified: trunk/tools/include/template/search_view.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tools/include/template/search_view.php 2011-11-30 17:07:52 UTC = (rev 204) +++ trunk/tools/include/template/search_view.php 2011-12-04 05:34:38 UTC = (rev 205) @@ -140,7 +140,7 @@ =20 =20 > - + From MAILER-DAEMON Sun Dec 04 00:31:50 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RX4g2-00086R-TY for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 00:31:50 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 06:36:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r206 - trunk/tools/include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 05:31:49 -0000 Author: danydb Date: 2011-12-04 06:36:15 +0100 (Sun, 04 Dec 2011) New Revision: 206 Modified: trunk/tools/include/template/search_view.php Log: date problem with CSV (str_jr_date instead of jr_date) Modified: trunk/tools/include/template/search_view.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tools/include/template/search_view.php 2011-12-04 05:34:38 UTC = (rev 205) +++ trunk/tools/include/template/search_view.php 2011-12-04 05:36:15 UTC = (rev 206) @@ -140,7 +140,7 @@ =20 =20 > - + From MAILER-DAEMON Sun Dec 04 01:02:40 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RX59s-0001Gx-Qu for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 01:02:40 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 07:07:03 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4554 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 06:02:39 -0000 Author: danydb Date: 2011-12-04 07:07:02 +0100 (Sun, 04 Dec 2011) New Revision: 4554 Modified: phpcompta/trunk/include/class_acc_ledger.php Log: No filter on ledger Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 05:32:34 UTC = (rev 4553) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 06:07:02 UTC = (rev 4554) @@ -2479,17 +2479,10 @@ $and=3D''; $user=3Dnew User($this->db); $p_action=3D$ledger_type; + if ( $p_action =3D=3D '') $p_action=3D'ALL'; if ( $r_jrn =3D=3D -1 ) { =20 - /* Specific action allow to see all the ledgers in once */ - if ( $ledger_type=3D=3D 'gl') $p_action=3D'ALL'; - /* actions from commercial.php */ - if ( $p_action =3D=3D 'client') $p_action=3D'ALL'; - if ( $p_action =3D=3D 'supplier') $p_action=3D'ALL'; - if ( $p_action =3D=3D 'adm') $p_action=3D'ALL'; - if ( $p_action =3D=3D 'ALL') $p_action=3D'ALL'; - /* from compta.php the p_action is quick_writing instead of = ODS */ if ( $p_action =3D=3D 'quick_writing') $p_action=3D'ODS'; =20 @@ -2499,13 +2492,12 @@ } else { - if ( $p_action =3D=3D 'gl') $p_action=3D'ALL'; + if ( $p_action =3D=3D 'quick_writing') $p_action=3D'ODS'; =20 $aLedger=3D$user->get_ledger($p_action,3); $fil_ledger=3D''; $sp=3D''; - for ($i=3D0;$i < count($aLedger) ;$i ++) { if ( isset($r_jrn[$i])) From MAILER-DAEMON Sun Dec 04 16:19:09 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXJSn-0003X9-4r for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 16:19:09 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 22:23:24 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4555 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 21:19:06 -0000 Author: danydb Date: 2011-12-04 22:23:23 +0100 (Sun, 04 Dec 2011) New Revision: 4555 Modified: phpcompta/trunk/include/class_acc_ledger.php Log: montant toujours en absolu Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 06:07:02 UTC = (rev 4554) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 21:23:23 UTC = (rev 4555) @@ -2519,8 +2519,8 @@ } =20 /* format the number */ - $amount_min=3DtoNumber($amount_min); - $amount_max=3DtoNumber($amount_max); + $amount_min=3Dabs(toNumber($amount_min)); + $amount_max=3Dabs(toNumber($amount_max)); if ( $amount_min > 0 && isNumber($amount_min) ) { $fil_amount=3D$and.' jr_montant >=3D' .$amount_min; From MAILER-DAEMON Sun Dec 04 16:20:58 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXJUY-0003eC-EO for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 16:20:58 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 22:25:22 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4556 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 21:20:57 -0000 Author: danydb Date: 2011-12-04 22:25:21 +0100 (Sun, 04 Dec 2011) New Revision: 4556 Modified: phpcompta/trunk/include/class_acc_ledger.php Log: montant toujours en absolu Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 21:23:23 UTC = (rev 4555) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 21:25:21 UTC = (rev 4556) @@ -2318,9 +2318,9 @@ =20 /* widget for amount */ $f_amount_min=3Dnew INum('amount_min'); - $f_amount_min->value=3D(isset($_REQUEST['amount_min']))?$_REQUES= T['amount_min']:0; + $f_amount_min->value=3D(isset($_REQUEST['amount_min']))?abs($_RE= QUEST['amount_min']):0; $f_amount_max=3Dnew INum('amount_max'); - $f_amount_max->value=3D(isset($_REQUEST['amount_max']))?$_REQUES= T['amount_max']:0; + $f_amount_max->value=3D(isset($_REQUEST['amount_max']))?abs($_RE= QUEST['amount_max']):0; =20 /* input quick code */ $f_qcode=3Dnew ICard('qcode'.$div); From MAILER-DAEMON Sun Dec 04 16:22:01 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXJVZ-0003jd-JS for mharc-phpcompta-dev@gnu.org; Sun, 04 Dec 2011 16:22:01 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 4 Dec 2011 22:26:25 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4557 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2011 21:22:00 -0000 Author: danydb Date: 2011-12-04 22:26:23 +0100 (Sun, 04 Dec 2011) New Revision: 4557 Modified: phpcompta/trunk/include/class_acc_ledger.php Log: potential bug [ if ($this->id=3D-1) ] is not a test Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 21:25:21 UTC = (rev 4556) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-04 21:26:23 UTC = (rev 4557) @@ -2345,7 +2345,7 @@ /* input poste comptable */ $f_accounting=3Dnew IPoste('accounting'); $f_accounting->value=3D(isset($_REQUEST['accounting']))?$_REQUES= T['accounting']:''; - if ( $this->id=3D-1) $jrn=3D0; + if ( $this->id=3D=3D-1) $jrn=3D0; else $jrn=3D$this->id; $f_accounting->set_attribute('jrn',$jrn); $f_accounting->set_attribute('ipopup','ipop_account'); From MAILER-DAEMON Mon Dec 05 15:14:55 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXewB-0001Uf-5X for mharc-phpcompta-dev@gnu.org; Mon, 05 Dec 2011 15:14:55 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 5 Dec 2011 21:19:07 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4558 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 20:14:53 -0000 Author: danydb Date: 2011-12-05 21:19:05 +0100 (Mon, 05 Dec 2011) New Revision: 4558 Modified: phpcompta/trunk/html/ajax_misc.php phpcompta/trunk/include/class_lettering.php phpcompta/trunk/include/template/letter_prop.php Log: 484: Affichage de tous les op?\195?\169rations lettr?\195?\169es dans le = d?\195?\169tail Modified: phpcompta/trunk/html/ajax_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_misc.php 2011-12-04 21:26:23 UTC (rev 4557) +++ phpcompta/trunk/html/ajax_misc.php 2011-12-05 20:19:05 UTC (rev 4558) @@ -260,7 +260,7 @@ case 'dl': require_once('class_lettering.php'); $exercice =3D $user->get_exercice(); - if ($user->check_module("LETCARD") =3D=3D 0 && $user->ch= eck_module("LETACC") =3D=3D 0) exit(); + if ($user->check_module("LETCARD") =3D=3D 0 && $user->check_modu= le("LETACC") =3D=3D 0) exit(); $periode =3D new Periode($cn); list($first_per, $last_per) =3D $periode->get_limit($exercice); =20 Modified: phpcompta/trunk/include/class_lettering.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_lettering.php 2011-12-04 21:26:23 UTC (= rev 4557) +++ phpcompta/trunk/include/class_lettering.php 2011-12-05 20:19:05 UTC (= rev 4558) @@ -28,11 +28,11 @@ /** *@brief mother class for the lettering by account and by card * use the tables jnt_letter, letter_deb and letter_cred - * - "account"=3D>"account", =3D> the accounting of the j_id (use = by Lettering_Account)=20 - * - "quick_code"=3D>"quick_code", =3D> the quick_code of the j_id (used= by Lettering_Card)=20 - * - "start"=3D>"start", =3D> date of the first day=20 - * - "end"=3D>"end", =3D> date of the last day=20 - * - "sql_ledger"=3D>"sql_ledger" =3D> the sql clause to filter on the = available ledgers=20 + * - "account"=3D>"account", =3D> the accounting of the j_id (use = by Lettering_Account) + * - "quick_code"=3D>"quick_code", =3D> the quick_code of the j_id (used= by Lettering_Card) + * - "start"=3D>"start", =3D> date of the first day + * - "end"=3D>"end", =3D> date of the last day + * - "sql_ledger"=3D>"sql_ledger" =3D> the sql clause to filter on the = available ledgers */ class Lettering { @@ -85,16 +85,30 @@ */ function insert_couple($j_id1,$j_id2) { - $jl_id=3D$this->db->get_next_seq("jnt_letter_jl_id_seq"); - $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', - array($jl_id)); + /* take needed data */ $first=3D$this->db->get_value('select j_debit from jrnx where j_= id=3D$1',array($j_id1)); if ( $this->db->count() =3D=3D 0 ) throw new Exception ('Op=C3=A9= ration non existante'); =20 $second=3D$this->db->get_value('select j_debit from jrnx where j= _id=3D$1',array($j_id2)); if ( $this->db->count() =3D=3D 0 ) throw new Exception ('Op=C3=A9= ration non existante'); - /* insert */ + $sql_already=3D"select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1"; + + $already=3D$this->db->get_array($sql_already,array($j_id1)); + if ( count ($already ) > 0) return; + + $already=3D$this->db->get_array($sql_already,array($j_id2)); + if ( count ($already ) > 0) return; + + $jl_id=3D$this->db->get_next_seq("jnt_letter_jl_id_seq"); + $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', + array($jl_id)); + /* insert */ if ( $first =3D=3D 't') { // save into letter_deb @@ -128,7 +142,7 @@ *@param $p_array @code 'gDossier' =3D> string '13' (length=3D2) - 'letter_j_id' =3D>=20 + 'letter_j_id' =3D> array 0 =3D> string '5' (length=3D1) 1 =3D> string '23' (length=3D2) @@ -228,8 +242,21 @@ ob_clean(); return $r; } + function get_linked($p_jlid) + { + $sql=3D"select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt, + j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id, + coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter + from jrnx join jrn on (j_grpt =3D jr_grpt_id) + where + j_id in (select j_id from letter_cred where jl_id=3D$1 + union all + select j_id from letter_deb where jl_id=3D$1)"; + + $this->linked=3D$this->db->get_array($sql,array($p_jlid)); + } /** - *show only the lettered records from jrnx=20 + *show only the lettered records from jrnx *it fills the array $this->content */ protected function show_lettered() @@ -243,7 +270,7 @@ return $r; } /** - *show only the not lettered records from jrnx=20 + *show only the not lettered records from jrnx *it fills the array $this->content */ protected function show_not_lettered() @@ -282,14 +309,21 @@ { $j_debit=3D$this->db->get_value('select j_Debit from jrnx where = j_id=3D$1',array($p_jid)); $amount_init=3D$this->db->get_value('select j_montant from jrnx = where j_id=3D$1',array($p_jid)); + $this->get_filter($p_jid); // retrieve jnt_letter.id $sql=3D"select distinct(jl_id) from jnt_letter left outer join = letter_deb using (jl_id) left outer join letter_cred using (jl_id) where letter_deb.j_id =3D $1 or letter_cred.j_id=3D$2"; - $jnt_id=3D$this->db->get_value($sql,array($p_jid,$p_jid)); + $a_jnt_id=3D$this->db->get_array($sql,array($p_jid,$p_jid)); =20 - if ($this->db->count()=3D=3D0 ) $jnt_id=3D-2; - + if (count($a_jnt_id)=3D=3D0 ) + { + $jnt_id=3D-2; + } else + { + $jnt_id=3D$a_jnt_id[0]['jl_id']; + } + $this->get_linked($jnt_id); ob_start(); require_once('template/letter_prop.php'); $r=3Dob_get_contents(); @@ -332,6 +366,7 @@ $this->account=3D$p_account; $this->object_type=3D'account'; } + /** * fills the this->content, datas are filtered thanks * - fil_deb poss values t (debit), f(credit), ' ' (everything) Modified: phpcompta/trunk/include/template/letter_prop.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/letter_prop.php 2011-12-04 21:26:23 = UTC (rev 4557) +++ phpcompta/trunk/include/template/letter_prop.php 2011-12-05 20:19:05 = UTC (rev 4558) @@ -8,7 +8,7 @@ ?>

=20 - @@ -39,11 +39,47 @@ =20 content=3Darray_merge($this->linked,$this->content); +$amount_deb=3D($j_debit=3D=3D't')?$amount_init:0; $amount_cred=3D($j_debit=3D=3D'f')?$amount_init:0; + +$linked_limit=3Dcount($this->linked); + for ($i=3D0;$icontent);$i++): $class=3D""; if ( ($i % 2) =3D=3D 0 ) $class=3D"odd"; +if ( $i < $linked_limit ) $class=3D"even"; +if ($linked_limit !=3D 0 && $i=3D=3D$linked_limit) +{ + ?> + + + + + + + + + + + > =20 - -content[$i]['letter'] && $this-= >content[$i]['j_debit']=3D=3D't')?$this->content[$i]['j_montant']:0; $amount_cred+=3D( $jnt_id =3D=3D $this->content[$i]['letter'] && $this= ->content[$i]['j_debit']=3D=3D'f')?$this->content[$i]['j_montant']:0; - +} endfor; ?>
+ + + + + + + + + + + + + + +
@@ -52,7 +88,7 @@ =20 if ($this->content[$i]['j_id']=3D=3D$p_jid) continue; $check=3Dnew ICheckbox('ck'.$i); -if ( $jnt_id =3D=3D $this->content[$i]['letter'] ) $check->selected=3Dtr= ue; else $check->selected=3Dfalse; +if ( $jnt_id =3D=3D $this->content[$i]['letter'] && $i < $linked_limit) = $check->selected=3Dtrue; else $check->selected=3Dfalse; =20 if ( $this->content[$i]['letter'] =3D=3D -1 || $check->selected =3D=3D = true ) echo $check->input(); @@ -94,18 +130,19 @@
+

Total lettr=C3=A9

<= ?=3D$amount_deb?> = =20 - \ No newline at end of file From MAILER-DAEMON Mon Dec 05 15:15:57 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXexB-0001eE-AW for mharc-phpcompta-dev@gnu.org; Mon, 05 Dec 2011 15:15:57 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 5 Dec 2011 21:20:16 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4559 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 20:15:55 -0000 Author: danydb Date: 2011-12-05 21:20:15 +0100 (Mon, 05 Dec 2011) New Revision: 4559 Modified: phpcompta/trunk/include/class_acc_ledger_fin.php Log: Fix bug when several op. reconcilied Modified: phpcompta/trunk/include/class_acc_ledger_fin.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_fin.php 2011-12-05 20:19:05 = UTC (rev 4558) +++ phpcompta/trunk/include/class_acc_ledger_fin.php 2011-12-05 20:20:15 = UTC (rev 4559) @@ -530,8 +530,11 @@ $r.=3D''; if (${"e_concerned".$i} !=3D '') { - $jr_internal=3D$this->db->get_value("select jr_internal from jrn whe= re jr_id=3D$1",array(${"e_concerned".$i})); - $r.=3DHtmlInput::detail_op(${"e_concerned".$i},$jr_internal= ); + $jr_internal=3D$this->db->get_array("select jr_internal from jrn whe= re jr_id in (".${"e_concerned".$i}.")"); + for ($x=3D0;$x'; // encode the pa From MAILER-DAEMON Mon Dec 05 16:27:38 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXg4Y-00084C-H9 for mharc-phpcompta-dev@gnu.org; Mon, 05 Dec 2011 16:27:38 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 5 Dec 2011 22:31:52 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4560 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 21:27:37 -0000 Author: danydb Date: 2011-12-05 22:31:52 +0100 (Mon, 05 Dec 2011) New Revision: 4560 Modified: phpcompta/trunk/include/ac_common.php Log: smaller date in html Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-12-05 20:20:15 UTC (rev 45= 59) +++ phpcompta/trunk/include/ac_common.php 2011-12-05 21:31:52 UTC (rev 45= 60) @@ -682,6 +682,16 @@ $str_date =3D substr($date, 0, 4) . substr($date, 6, 2); return $str_date; } +/** + * @brief shrink the date, make a date shorter for the printing + * @param $p_date format DD.MM.YYYY + * @return date in the format DDMMYY (size =3D 13 mm in arial 8) + */ +function smaller_date($p_date) +{ + $str_date =3D substr($p_date, 0, 6) . substr($p_date, 8, 2); + return $str_date; +} =20 /** * @brief format the date, when taken from the database the format From MAILER-DAEMON Mon Dec 05 16:27:48 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXg4i-00084b-KP for mharc-phpcompta-dev@gnu.org; Mon, 05 Dec 2011 16:27:48 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 5 Dec 2011 22:32:09 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4561 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 21:27:47 -0000 Author: danydb Date: 2011-12-05 22:32:07 +0100 (Mon, 05 Dec 2011) New Revision: 4561 Modified: phpcompta/trunk/include/class_acc_ledger.php Log: smaller date in html Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-05 21:31:52 UTC = (rev 4560) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-05 21:32:07 UTC = (rev 4561) @@ -858,11 +858,11 @@ if ( $this->type=3D=3D'') $r.=3Dtd($row['jrn_def_name']); // date $r.=3D""; - $r.=3D$row['str_jr_date']; + $r.=3Dsmaller_date($row['str_jr_date']); $r.=3D""; // echeance $r.=3D""; - $r.=3D$row['str_jr_ech']; + $r.=3Dsmaller_date($row['str_jr_ech']); $r.=3D""; =20 // pj From MAILER-DAEMON Mon Dec 05 16:32:33 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXg9J-00013c-Rb for mharc-phpcompta-dev@gnu.org; Mon, 05 Dec 2011 16:32:33 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 5 Dec 2011 22:36:53 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4562 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 21:32:32 -0000 Author: danydb Date: 2011-12-05 22:36:52 +0100 (Mon, 05 Dec 2011) New Revision: 4562 Modified: phpcompta/trunk/include/class_acc_reconciliation.php Log: auto letter when reconcile Modified: phpcompta/trunk/include/class_acc_reconciliation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_reconciliation.php 2011-12-05 21:32= :07 UTC (rev 4561) +++ phpcompta/trunk/include/class_acc_reconciliation.php 2011-12-05 21:36= :52 UTC (rev 4562) @@ -23,11 +23,12 @@ /*!\file * \brief class acc_reconciliation, this class is new and the code * must use it - * =20 + * */ require_once("class_iconcerned.php"); require_once ('class_database.php'); require_once ('class_dossier.php'); +require_once 'class_lettering.php'; =20 /*! \brief new class for managing the reconciliation it must be used * instead of the function InsertRapt, ... @@ -60,7 +61,7 @@ } /*! *\brief Insert into jrn_rapt the concerned operations - * =20 + * * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned or a strin= g * like "jr_id2,jr_id3,jr_id4..." * @@ -90,9 +91,9 @@ } =20 /*! - *\brief Insert into jrn_rapt the concerned operations=20 + *\brief Insert into jrn_rapt the concerned operations * should not be called directly, use insert instead - * =20 + * * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned * * \return none @@ -118,16 +119,55 @@ { // Ok we can insert $Res=3D$this->db->exec_sql("insert into jrn_rapt(jr_id,jra_c= oncerned) values ". - "(".$this->jr_id.",$jr_id2)"); + "(".$this->jr_id.",$jr_id2)"); + // try to letter automatically same account from both operation + $this->auto_letter($jr_id2); } return true; } - /*! + /** + * @brief try to letter same card between $p_jrid and $this->jr_id + * @param jrn.jr_id $p_jrid the operation to reconcile + */ + function auto_letter($p_jrid) + { + // Try to find same card from both operation + $sql=3D"select j1.f_id as fiche ,coalesce(j1.j_id,-1) as jrnx_id1,coal= esce(j2.j_id,-1) as jrnx_id2, +j1.j_poste as poste + from jrnx as j1 + join jrn as jr1 on (j1.j_grpt=3Djr1.jr_grpt_id) + join jrnx as j2 on (coalesce(j1.f_id,-1)=3Dcoalesce(j2.f_id,-1) and= j1.j_poste=3Dj2.j_poste) + join jrn as jr2 on (j2.j_grpt=3Djr2.jr_grpt_id) + where + jr1.jr_id=3D$1 + and + jr2.jr_id=3D $2"; + $result=3D$this->db->get_array($sql,array($this->jr_id,$p_jrid)); + if ( count($result) =3D=3D 0) + { + return; + } elseif (count($result)=3D=3D1) + { + if ( $result[0]['fiche'] !=3D -1) + { + $letter =3D new Lettering_Card($this->db); + $letter->insert_couple($result[0]['jrnx_id1'],$result[0]['jrnx_id2']= ); + } + else + { + $letter =3D new Lettering_Account($this->db); + $letter->insert_couple($result[0]['jrnx_id1'],$result[0]['jrnx_id2']= ); + } + } + + } + + /*! *\brief Insert into jrn_rapt the concerned operations - * =20 + * * \param $this->jr_id (jrn.jr_id) =3D> jrn_rapt.jr_id * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned - *=20 + * * \return none */ function remove($jr_id2) @@ -144,8 +184,29 @@ select jra_id from jrn_rapt where jra_= concerned=3D$jr_id2 ". " and jr_id=3D".$this->jr_id) !=3D0) { - // Ok we can delete - $Res=3D$this->db->exec_sql("delete from jrn_rapt where ". + /** + * remove also lettering between both operation + */ + $sql =3D " delete from + jnt_letter + where jl_id in ( select jl_id from jnt_letter + join letter_cred as lc using(jl_id) + join letter_deb as ld using (jl_id) + where + lc.j_id in (select j_id + from jrnx join jrn on (j_grpt=3Djr_grpt_id) + where jr_id in ($1,$2)) + or + ld.j_id in (select j_id + from jrnx join jrn on (j_grpt=3Djr_grpt_id) + where jr_id in ($1,$2)) + + + + )"; + $this->db->exec_sql($sql, array($jr_id2, $this->jr_id)); + // Ok we can delete + $Res=3D$this->db->exec_sql("delete from jrn_rapt where ". "(jra_concerned=3D$jr_id2 and jr_id= =3D".$this->jr_id.") or (jra_concerned=3D".$this->jr_id." a= nd jr_id=3D$jr_id2) "); } @@ -153,8 +214,8 @@ =20 /*! *\brief Return an array of the concerned operation - * =20 - * =20 + * + * *\param database connection * \return array if something is found or null */ @@ -188,7 +249,7 @@ } /** *@brief return array of not-reconciled operation -=20 + */ function get_not_reconciled() { @@ -207,7 +268,7 @@ return $ret; } /** - *Create a sql condition to filter by security and by asked ledger=20 + *Create a sql condition to filter by security and by asked ledger * based on $this->a_jrn *@return a valid sql stmt to include *@see get_not_reconciled get_reconciled @@ -309,7 +370,7 @@ $user=3Dnew User($this->db); list($start,$end)=3D$user->get_limit_current_exercice(); =20 - if (isDate($this->start_day) =3D=3Dnull)=20 + if (isDate($this->start_day) =3D=3Dnull) { $this->start_day=3D$start; } From MAILER-DAEMON Mon Dec 05 16:33:01 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXg9l-00016m-Fb for mharc-phpcompta-dev@gnu.org; Mon, 05 Dec 2011 16:33:01 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 5 Dec 2011 22:37:15 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4563 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 21:33:00 -0000 Author: danydb Date: 2011-12-05 22:37:14 +0100 (Mon, 05 Dec 2011) New Revision: 4563 Modified: phpcompta/trunk/include/class_lettering.php phpcompta/trunk/include/template/letter_prop.php Log: show lettered operation first Modified: phpcompta/trunk/include/class_lettering.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_lettering.php 2011-12-05 21:36:52 UTC (= rev 4562) +++ phpcompta/trunk/include/class_lettering.php 2011-12-05 21:37:14 UTC (= rev 4563) @@ -143,24 +143,7 @@ @code 'gDossier' =3D> string '13' (length=3D2) 'letter_j_id' =3D> - array - 0 =3D> string '5' (length=3D1) - 1 =3D> string '23' (length=3D2) - 2 =3D> string '67' (length=3D2) - 3 =3D> string '136' (length=3D3) - 4 =3D> string '139' (length=3D3) - 5 =3D> string '145' (length=3D3) - 6 =3D> string '374' (length=3D3) - 7 =3D> string '148' (length=3D3) - 8 =3D> string '156' (length=3D3) - 9 =3D> string '254' (length=3D3) - 10 =3D> string '277' (length=3D3) - 'ck0' =3D> string 'on' (length=3D2) - 'ck1' =3D> string 'on' (length=3D2) - 'ck10' =3D> string 'on' (length=3D2) - 'j_id' =3D> string '142' (length=3D3) - 'jnt_id' =3D> string '-2' (length=3D2) - 'record' =3D> string 'Sauver' (length=3D6) + ck =3D> array @endcode */ public function save($p_array) @@ -188,20 +171,20 @@ // save dest for($i=3D0;$idb->get_value('select j_debit,j_montant fr= om jrnx where j_id=3D$1',array($p_array['letter_j_id'][$i])); + $deb=3D$this->db->get_value('select j_debit,j_montant fr= om jrnx where j_id=3D$1',array($p_array['ck'][$i])); if ( $deb =3D=3D 't') { $count++; // save into letter_deb - $ld_id=3D$this->db->get_value('insert into letter_de= b(j_id,jl_id) values($1,$2) returning ld_id',array($p_array['letter_j_id'= ][$i],$jl_id)); + $ld_id=3D$this->db->get_value('insert into letter_de= b(j_id,jl_id) values($1,$2) returning ld_id',array($p_array['ck'][$i],$jl= _id)); } else { $count++; - $lc_id=3D$this->db->get_value('insert into letter_cr= ed(j_id,jl_id) values($1,$2) returning lc_id',array($p_array['letter_j_i= d'][$i],$jl_id)); + $lc_id=3D$this->db->get_value('insert into letter_cr= ed(j_id,jl_id) values($1,$2) returning lc_id',array($p_array['ck'][$i],$= jl_id)); } } //end if 1 } //end for @@ -251,7 +234,8 @@ where j_id in (select j_id from letter_cred where jl_id=3D$1 union all - select j_id from letter_deb where jl_id=3D$1)"; + select j_id from letter_deb where jl_id=3D$1) + order by j_date"; =20 $this->linked=3D$this->db->get_array($sql,array($p_jlid)); } Modified: phpcompta/trunk/include/template/letter_prop.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/letter_prop.php 2011-12-05 21:36:52 = UTC (rev 4562) +++ phpcompta/trunk/include/template/letter_prop.php 2011-12-05 21:37:14 = UTC (rev 4563) @@ -84,14 +84,16 @@ > content[$i]['j_id']); =20 if ($this->content[$i]['j_id']=3D=3D$p_jid) continue; -$check=3Dnew ICheckbox('ck'.$i); +if ( $jnt_id =3D=3D $this->content[$i]['letter'] && $i >=3D $linked_limi= t) continue; + +$check=3Dnew ICheckbox('ck[]',$this->content[$i]['j_id']); if ( $jnt_id =3D=3D $this->content[$i]['letter'] && $i < $linked_limit) = $check->selected=3Dtrue; else $check->selected=3Dfalse; =20 if ( $this->content[$i]['letter'] =3D=3D -1 || $check->selected =3D=3D = true ) echo $check->input(); +echo HtmlInput::hidden('letter_j_id[]',$this->content[$i]['j_id']); ?> @@ -100,7 +102,7 @@ ?> - content[$i]['j_date_fmt']?> + content[$i]['j_date_fmt'])?> %s', $this->content[$i]['jr_id'], $gDossier, $this->content[$i]['jr_inte= rnal']); From MAILER-DAEMON Mon Dec 05 16:35:22 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RXgC2-0001Lm-7A for mharc-phpcompta-dev@gnu.org; Mon, 05 Dec 2011 16:35:22 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 5 Dec 2011 22:39:41 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4564 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 21:35:20 -0000 Author: danydb Date: 2011-12-05 22:39:40 +0100 (Mon, 05 Dec 2011) New Revision: 4564 Modified: phpcompta/trunk/include/template/letter_all.php Log: smaller date in html Modified: phpcompta/trunk/include/template/letter_all.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/letter_all.php 2011-12-05 21:37:14 U= TC (rev 4563) +++ phpcompta/trunk/include/template/letter_all.php 2011-12-05 21:39:40 U= TC (rev 4564) @@ -45,7 +45,7 @@ if ( ($i % 2) =3D=3D 0 ) $class=3D"odd"; ?> > -=20 + content[$i]['letter']=3D=3D-1)?"x":$this->content[$i][= 'letter']; $js=3D"this.gDossier=3D".dossier::id(). @@ -53,10 +53,10 @@ ";this.obj_type=3D'".$this->object_type."'". ";dsp_letter(this)"; =20 -?>=20 +?> "> - content[$i]['j_date_fmt']?> + content[$i]['j_date_fmt'])?> content[$i]['jr_pj_number']?> =20 From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4565 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 21:47:13 -0000 Author: danydb Date: 2011-12-05 22:51:27 +0100 (Mon, 05 Dec 2011) New Revision: 4565 Modified: phpcompta/trunk/include/adm_card.inc.php phpcompta/trunk/include/client_card.inc.php phpcompta/trunk/include/supplier_card.inc.php Log: cosmetic : in operation filter was not correct Modified: phpcompta/trunk/include/adm_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/adm_card.inc.php 2011-12-05 21:39:40 UTC (rev= 4564) +++ phpcompta/trunk/include/adm_card.inc.php 2011-12-05 21:51:27 UTC (rev= 4565) @@ -63,7 +63,7 @@ $ss_action=3D'dc'; } $f=3Dnew Fiche($cn,$_REQUEST['f_id']); -echo '
'; +echo '
'; echo ShowItem(array( array($root."&sc=3Ddc",_('Fiche'),_('D=C3=A9tail de la= fiche'),1), array($root.'&sc=3Dsv',_('Suivi'),_('Suivi adm, devis,= bon de commande, courrier'),2), Modified: phpcompta/trunk/include/client_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/client_card.inc.php 2011-12-05 21:39:40 UTC (= rev 4564) +++ phpcompta/trunk/include/client_card.inc.php 2011-12-05 21:51:27 UTC (= rev 4565) @@ -61,7 +61,7 @@ $ss_action=3D'dc'; } $f=3Dnew Fiche($cn,$_REQUEST['f_id']); -echo '
'; +echo '
'; echo ShowItem(array( array($root."&sc=3Ddc",_('Fiche'),_('D=C3=A9tail de la= fiche'),1), array($root.'&sc=3Dsv',_('Suivi'),_('Suivi client, dev= is, bon de commande, courrier'),2), Modified: phpcompta/trunk/include/supplier_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/supplier_card.inc.php 2011-12-05 21:39:40 UTC= (rev 4564) +++ phpcompta/trunk/include/supplier_card.inc.php 2011-12-05 21:51:27 UTC= (rev 4565) @@ -63,7 +63,7 @@ } $f=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 -echo '
'; +echo '
'; echo ShowItem(array( array($root."&sc=3Ddc",_('Fiche'),_('D=C3=A9tail de la= fiche'),1), array($root.'&sc=3Dsv',_('Suivi'),_('Suivi Fournisseur= , devis, bon de commande, courrier'),2), From MAILER-DAEMON Tue Dec 06 16:49:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RY2tV-0007AX-Rc for mharc-phpcompta-dev@gnu.org; Tue, 06 Dec 2011 16:49:45 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 6 Dec 2011 22:53:54 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4566 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2011 21:49:44 -0000 Author: danydb Date: 2011-12-06 22:53:52 +0100 (Tue, 06 Dec 2011) New Revision: 4566 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: 0000485: Ecran de confirmation vente Correction des d?\195?\169tails vente quand on devient assujetti Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-05 21:5= 1:27 UTC (rev 4565) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-06 21:5= 3:52 UTC (rev 4566) @@ -1281,7 +1281,7 @@ $r.=3D"tva"; $r.=3D' '._('Montant TVA').'<= /th>'; $r.=3D''._('Montant HTVA').'<= /th>'; - $r.=3D''._('Totaux').''; + $r.=3D''._('Montant TVAC').'<= /th>'; } else { Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-05 21:51:27= UTC (rev 4565) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-06 21:53:52= UTC (rev 4566) @@ -616,7 +616,9 @@ /*!@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 + * */ function confirm($p_array,$p_summary=3Dfalse) { @@ -676,14 +678,19 @@ $r.=3D""._('D=C3=A9nomination').""; $r.=3D""._('prix').""; $r.=3D""._('quantit=C3=A9').""; - $r.=3D""._('tva').""; =20 =20 if ( $g_parameter->MY_TVA_USE=3D=3D'Y') { + $r.=3D""._('tva').""; $r.=3D' '._('Montant TVA').'<= /th>'; $r.=3D''._('Montant HTVA').'<= /th>'; + $r.=3D''._('Montant TVAC').'<= /th>'; } + else + { + $r.=3D''._('Montant').''; + } /* if we use the AC */ if ($g_parameter->MY_ANALYTIC!=3D'nu') { @@ -751,20 +758,29 @@ $r.=3D$oTva->get_parameter('label'); $r.=3D''; $r.=3D''; - $r.=3Dnbm($tva_item); /* warning if tva_computed and given are not the same */ if ( bcsub($tva_item,$tva_computed) !=3D 0) { - echo _("Attention Diff=C3=A9rence"); + $r.=3D'' + .nbm($tva_item).''; } + else + $r.=3Dnbm($tva_item); $r.=3D''; + $r.=3D''; + $r.=3Dnbm($amount); + $r.=3D''; + $tot_row=3Dbcadd($tva_item,$amount); + $r.=3Dtd(nbm($tot_row),'class=3D"num"'); } - $r.=3D''; - $r.=3Dnbm($amount); - $r.=3D''; - - // encode the pa + else + { + $r.=3D''; + $r.=3Dnbm($amount); + $r.=3D''; + } + // encode the pa if ( $g_parameter->MY_ANALYTIC!=3D'nu') // use of AA { // show form Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-05 21:= 51:27 UTC (rev 4565) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-06 21:= 53:52 UTC (rev 4566) @@ -144,7 +144,8 @@ $pu=3Dbcdiv($q['qs_price'],$q['qs_quantite']); $row.=3Dtd(nbm($pu),'class=3D"num"'); $row.=3Dtd(nbm($q['qs_quantite']),'class=3D"num"'); - if ( $owner->MY_TVA_USE=3D=3D'Y') { + $sym_tva=3D''; + if ( $owner->MY_TVA_USE=3D=3D'Y' && $q['qs_vat_code'] !=3D '') { /* retrieve TVA symbol */ $tva=3Dnew Acc_Tva($cn,$q['qs_vat_code']); $tva->load(); From MAILER-DAEMON Tue Dec 06 16:56:17 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RY2zp-00086B-VK for mharc-phpcompta-dev@gnu.org; Tue, 06 Dec 2011 16:56:17 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 6 Dec 2011 23:00:32 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4567 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2011 21:56:16 -0000 Author: danydb Date: 2011-12-06 23:00:31 +0100 (Tue, 06 Dec 2011) New Revision: 4567 Modified: phpcompta/trunk/include/class_todo_list.php Log: 0000486: Todo list :N'enregistre pas le titre Modified: phpcompta/trunk/include/class_todo_list.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_todo_list.php 2011-12-06 21:53:52 UTC (= rev 4566) +++ phpcompta/trunk/include/class_todo_list.php 2011-12-06 22:00:31 UTC (= rev 4567) @@ -30,7 +30,7 @@ * This class manages the table todo_list * * - * Data Member :=20 + * Data Member : * - $cn database connx * - $variable * - id (todo_list.tl_id) @@ -38,7 +38,7 @@ * - title (todo_list.title) * - desc (todo_list.tl_desc) * - owner (todo_list.use_id) - *=20 + * */ class Todo_List { @@ -160,14 +160,14 @@ if (trim($this->tl_title)=3D=3D'') $this->tl_title=3Dsubstr(trim($this->tl_desc),0,40); =20 - if (trim($this->tl_title)=3D=3D'') + if (trim($this->tl_desc)=3D=3D'') { alert('La note est vide'); return; } =20 /* limit the title to 35 char */ - $this->tl_title=3Dsubstr(trim($this->tl_desc),0,40); + $this->tl_title=3Dsubstr(trim($this->tl_title),0,40); =20 $sql=3D"update todo_list set tl_title=3D$1,tl_date=3Dto_date($2,= 'DD.MM.YYYY'),tl_desc=3D$3 ". " where tl_id =3D $4"; From MAILER-DAEMON Tue Dec 06 17:04:34 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RY37q-0001GY-9E for mharc-phpcompta-dev@gnu.org; Tue, 06 Dec 2011 17:04:34 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 6 Dec 2011 23:08:48 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4568 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2011 22:04:32 -0000 Author: danydb Date: 2011-12-06 23:08:47 +0100 (Tue, 06 Dec 2011) New Revision: 4568 Modified: phpcompta/trunk/include/compta_fin_rec.inc.php Log: Si rapprochement ?\195?\169choue, r?\195?\169affiche les choix pr?\195?\1= 69c?\195?\169dents Modified: phpcompta/trunk/include/compta_fin_rec.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-06 22:00:31 UT= C (rev 4567) +++ phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-06 22:08:47 UT= C (rev 4568) @@ -95,9 +95,11 @@ echo '' . hb(h($Ledger->get_bank_name())) . '= '; echo '

'; $iextrait =3D new IText('ext'); -$iextrait->value =3D $Ledger->guess_pj(); +if ( isset ($_POST['ext'])) $iextrait->value=3D$_POST['ext']; else $iext= rait->value =3D $Ledger->guess_pj(); $nstart_extrait =3D new INum('start_extrait'); +if( isset($_POST['start_extrait'])) $nstart_extrait->value=3D$_POST['sta= rt_extrait']; $nend_extrait =3D new INum('end_extrait'); +if( isset($_POST['end_extrait'])) $nend_extrait->value=3D$_POST['end_ext= rait']; =20 echo "Extrait / relev=C3=A9 :" . $iextrait->input(); echo 'solde D=C3=A9but' . $nstart_extrait->input(); @@ -128,6 +130,18 @@ $tot_not_reconcilied+=3D$row['jr_montant']; $diff+=3D$cn->get_value('select qf_amount from quant_fin where jr_id=3D= $1', array($row['jr_id'])); $iradio->value =3D $row['jr_id']; + $iradio->selected=3Dfalse; + if (isset($_POST['op'])) + { + for ($x=3D0;$xselected=3Dtrue; + break; + } + } + } $r.=3Dtd(HtmlInput::hidden('jrid[]', $row['jr_id']) . $iradio->input(),= ' style=3D"text-align:center" '); if ($i % 2 =3D=3D 0) echo tr($r, ' class=3D"odd" '); From MAILER-DAEMON Tue Dec 06 17:48:56 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RY3om-00021c-Fa for mharc-phpcompta-dev@gnu.org; Tue, 06 Dec 2011 17:48:56 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 6 Dec 2011 23:53:10 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4569 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2011 22:48:55 -0000 Author: danydb Date: 2011-12-06 23:53:09 +0100 (Tue, 06 Dec 2011) New Revision: 4569 Modified: phpcompta/trunk/include/compta_fin_rec.inc.php Log: cosmetic rapprochement bancaire Modified: phpcompta/trunk/include/compta_fin_rec.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-06 22:08:47 UT= C (rev 4568) +++ phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-06 22:53:09 UT= C (rev 4569) @@ -61,8 +61,12 @@ $diff =3D bcsub($_POST['start_extrait'], $_POST['end_extrait']); if ($diff !=3D 0 && $diff !=3D $tot) { + $remain=3Dbcsub($tot,$diff); $cn->rollback(); - alert("D'apr=C3=A8s l'extrait il y aurait du avoir un montant de $dif= f =C3=A0 rapprocher alors qu'il y a $tot rapproch=C3=A9s, mise =C3=A0 jou= r annul=C3=A9e"); + alert("D'apr=C3=A8s l'extrait il y aurait du avoir un montant de $dif= f =C3=A0 rapprocher alors qu'il y a $tot rapproch=C3=A9s, mise =C3=A0 jou= r annul=C3=A9e, la diff=C3=A9rence est de $remain"); + echo '

'; + echo '

'._("D'apr=C3=A8s l'extrait il y aurait du avoir un montant = de $diff =C3=A0 rapprocher alors qu'il y a $tot rapproch=C3=A9s, la diff=C3= =A9rence est de $remain
mise =C3=A0 jour annul=C3=A9e").'

'; + echo '
'; } $cn->commit(); } @@ -106,7 +110,7 @@ echo 'solde Fin' . $nend_extrait->input(); echo IButton::tooggle_checkbox('rec1'); echo '

'; - +echo HtmlInput::submit('save', 'Mettre =C3=A0 jour le n=C2=B0 de relev=C3= =A9 banquaire'); echo ''; $r =3D th('Date'); $r.=3Dth('Libell=C3=A9'); @@ -125,10 +129,11 @@ $r.=3Dtd($row['fmt_date']); $r.=3Dtd($row['jr_comment']); $r.=3Dtd($js); - $r.=3Dtd(sprintf("%.2f", $row['jr_montant']), ' class=3D"num" '); + $amount=3D$cn->get_value('select qf_amount from quant_fin where jr_id=3D= $1', array($row['jr_id'])); + $r.=3Dtd(nbm ($amount), ' class=3D"num" '); =20 + $diff=3Dbcadd($diff,$amount); $tot_not_reconcilied+=3D$row['jr_montant']; - $diff+=3D$cn->get_value('select qf_amount from quant_fin where jr_id=3D= $1', array($row['jr_id'])); $iradio->value =3D $row['jr_id']; $iradio->selected=3Dfalse; if (isset($_POST['op'])) @@ -165,23 +170,23 @@ echo '
'; echo ''; echo td("Solde compte "); -echo td(sprintf('%.2f', ($saldo['debit'] - $saldo['credit'])), ' style=3D= "text-align:right"'); +echo td(nbm(bcsub($saldo['debit'] , $saldo['credit'])), ' style=3D"text-= align:right"'); echo ''; =20 echo ''; echo td("Solde non rapproch=C3=A9 "); -echo td(sprintf('%.2f', ($saldo_not_reconcilied['debit'] - $saldo_not_re= concilied['credit'])), ' style=3D"text-align:right"'); +echo td(nbm (bcsub($saldo_not_reconcilied['debit'], $saldo_not_reconcili= ed['credit'])), ' style=3D"text-align:right"'); echo ''; =20 echo ''; echo td("Solde rapproch=C3=A9 "); -echo td(sprintf('%.2f', ($saldo_reconcilied['debit'] - $saldo_reconcilie= d['credit'])), ' style=3D"text-align:right"'); +echo td(nbm(bcsub($saldo_reconcilied['debit'] , $saldo_reconcilied['cred= it'])), ' style=3D"text-align:right"'); echo ''; =20 =20 echo ''; echo td("Total montant "); -echo td(sprintf('%.2f', ($tot_not_reconcilied)), ' style=3D"text-align:r= ight"'); +echo td(nbm ($tot_not_reconcilied), ' style=3D"text-align:right"'); echo ''; =20 echo '
'; From MAILER-DAEMON Wed Dec 07 07:12:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYGMB-0005RF-QI for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 07:12:15 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 13:16:18 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4570 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 12:12:14 -0000 Author: danydb Date: 2011-12-07 13:16:16 +0100 (Wed, 07 Dec 2011) New Revision: 4570 Modified: phpcompta/trunk/include/ac_common.php Log: add doc Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-12-06 22:53:09 UTC (rev 45= 69) +++ phpcompta/trunk/include/ac_common.php 2011-12-07 12:16:16 UTC (rev 45= 70) @@ -19,8 +19,10 @@ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr -/* ! \file - * \brief common utilities for a lot of procedure, classe + +/** + * @file + * @brief common utilities for a lot of procedure, classe */ =20 include_once("constant.php"); From MAILER-DAEMON Wed Dec 07 08:25:33 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYHV7-0002ZD-9t for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 08:25:33 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 14:29:41 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4571 - in phpcompta/trunk: html html/js include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 13:25:29 -0000 Author: danydb Date: 2011-12-07 14:29:40 +0100 (Wed, 07 Dec 2011) New Revision: 4571 Added: phpcompta/trunk/include/ajax_create_menu.php phpcompta/trunk/include/ajax_mod_menu.php phpcompta/trunk/include/class_menu_ref.php phpcompta/trunk/include/template/menu_detail.php Modified: phpcompta/trunk/html/ajax_misc.php phpcompta/trunk/html/js/scripts.js phpcompta/trunk/include/ajax_add_menu.php phpcompta/trunk/include/ajax_get_menu_detail.php phpcompta/trunk/include/menu.inc.php Log: CFGMENU let add new menu or modify them Modified: phpcompta/trunk/html/ajax_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_misc.php 2011-12-07 12:16:16 UTC (rev 4570) +++ phpcompta/trunk/html/ajax_misc.php 2011-12-07 13:29:40 UTC (rev 4571) @@ -532,6 +532,12 @@ require_once('ajax_anc_search.php'); break; case 'autoanc': - require_once('ajax_auto_anc_card.php'); + require_once 'ajax_auto_anc_card.php' ; break; + case 'create_menu'; + require_once 'ajax_create_menu.php'; + break; + case 'add_menu'; + require_once 'ajax_mod_menu.php'; + break; } \ No newline at end of file Modified: phpcompta/trunk/html/js/scripts.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/scripts.js 2011-12-07 12:16:16 UTC (rev 4570) +++ phpcompta/trunk/html/js/scripts.js 2011-12-07 13:29:40 UTC (rev 4571) @@ -1242,7 +1242,7 @@ onSuccess:function(req){ try{ remove_waiting_box(); - var pos=3Dfixed_position(250,150)+";width:30%";; + var pos=3Dfixed_position(250,150)+";width:30%"; add_div({id:"divplugin",drag:1,cssclass:"inner_box",style:pos}); $('divplugin').innerHTML=3Dreq.responseText; } catch(e){alert(e.message);} @@ -1273,7 +1273,65 @@ } ); } +function create_menu(p_dossier) +{ + waiting_box(); + removeDiv('divmenu'); + var qs=3D"op=3Dcreate_menu&gDossier=3D"+p_dossier+"&ctl=3Ddivmenu"; =20 + var action=3Dnew Ajax.Request ( 'ajax_misc.php', + { + method:'get', + parameters:qs, + onFailure:null, + onSuccess:function(req){ + try{ + remove_waiting_box(); + var pos=3Dfixed_position(250,150)+";width:30%"; + add_div({ + id:"divmenu", + drag:1, + cssclass:"inner_box", + style:pos + }); + $('divmenu').innerHTML=3Dreq.responseText; + } catch(e){ + alert(e.message); + } + } + } + ); +} +function mod_menu(p_dossier,me_code) +{ + waiting_box(); + removeDiv('divmenu'); + var qs=3D"op=3Dmod_menu&gDossier=3D"+p_dossier+"&ctl=3Ddivmenu&me_co= de=3D"+me_code; + + var action=3Dnew Ajax.Request ( 'ajax_misc.php', + { + method:'get', + parameters:qs, + onFailure:null, + onSuccess:function(req){ + try{ + remove_waiting_box(); + var pos=3Dfixed_position(250,150)+";width:30%"; + add_div({ + id:"divmenu", + drag:1, + cssclass:"inner_box", + style:pos + }); + $('divmenu').innerHTML=3Dreq.responseText; + + } catch(e){ + alert(e.message); + } + } + } + ); +} function get_properties(obj) { var a_array=3D[]; Modified: phpcompta/trunk/include/ajax_add_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_add_menu.php 2011-12-07 12:16:16 UTC (re= v 4570) +++ phpcompta/trunk/include/ajax_add_menu.php 2011-12-07 13:29:40 UTC (re= v 4571) @@ -33,7 +33,7 @@ UNION ALL select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')= from menu_ref where - me_code=3D'EXTENSION' + me_code=3D'EXT' order by 1 ",1); $ame_code=3D$cn->make_array(" Added: phpcompta/trunk/include/ajax_create_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_create_menu.php = (rev 0) +++ phpcompta/trunk/include/ajax_create_menu.php 2011-12-07 13:29:40 UTC = (rev 4571) @@ -0,0 +1,10 @@ +'; +require_once 'template/menu_detail.php'; +echo HtmlInput::submit('create_menu','Sauver'); +echo HtmlInput::button_close('divmenu'); +echo ''; +?> Modified: phpcompta/trunk/include/ajax_get_menu_detail.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_get_menu_detail.php 2011-12-07 12:16:16 = UTC (rev 4570) +++ phpcompta/trunk/include/ajax_get_menu_detail.php 2011-12-07 13:29:40 = UTC (rev 4571) @@ -35,7 +35,7 @@ UNION ALL select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')= from menu_ref where - me_code=3D'EXTENSION'",1); + me_code=3D'EXT'",1); $a_type=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type= ",1); =20 $array=3D$cn->get_array("select p_id,pm_id,me_code,me_code_dep,p_order,p= _type_display,pm_default Added: phpcompta/trunk/include/ajax_mod_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_mod_menu.php (re= v 0) +++ phpcompta/trunk/include/ajax_mod_menu.php 2011-12-07 13:29:40 UTC (re= v 4571) @@ -0,0 +1,11 @@ +me_code.h($m->menu); +echo '
'; +require_once 'template/menu_detail.php'; + +echo HtmlInput::submit('mod_menu','Sauver'); +echo HtmlInput::button_close('divmenu'); +echo '
'; +?> Added: phpcompta/trunk/include/class_menu_ref.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_menu_ref.php (r= ev 0) +++ phpcompta/trunk/include/class_menu_ref.php 2011-12-07 13:29:40 UTC (r= ev 4571) @@ -0,0 +1,38 @@ +me_code=3Dstrtoupper($this->me_code); + $this->me_code=3Dtrim($this->me_code); + $this->me_code=3Dstr_replace('<','',$this->me_code); + $this->me_code=3Dstr_replace('>','',$this->me_code); + } + function verify() + { + parent::verify(); + if ( $this->me_code =3D=3D -1) + { + $this->format_code(); + if ( $this->cn->get_value("select count(*) from menu_ref whe= re me_code=3D$1",array($this->me_code)) > 0) + return -1; + if (trim($this->me_code)=3D=3D'') + return -2; + } + return 0; + } + =20 +} + +?> Modified: phpcompta/trunk/include/menu.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/menu.inc.php 2011-12-07 12:16:16 UTC (rev 457= 0) +++ phpcompta/trunk/include/menu.inc.php 2011-12-07 13:29:40 UTC (rev 457= 1) @@ -27,7 +27,7 @@ * \brief Show the table menu and let you add your own * */ -require_once 'class_menu_ref_sql.php'; +require_once 'class_menu_ref.php'; require_once 'class_sort_table.php'; require_once 'class_extension.php'; =20 @@ -69,6 +69,29 @@ } } /** + * if post save then we save a new one + */ +if ( isset($_POST['create_menu'])|| isset($_POST['mod_menu'])) +{ + extract($_POST); + $menu_ref=3Dnew Menu_Ref($cn); + $menu_ref->me_code=3D$me_code; + $menu_ref->me_menu=3D$me_menu; + $menu_ref->me_file=3D$me_file; + $menu_ref->me_description=3D$me_description; + $menu_ref->me_parameter=3D$me_parameter; + $menu_ref->me_url=3D$me_url; + $menu_ref->me_javascript=3D$me_javascript; + $menu_ref->me_type=3D'ME'; + if ( isset($_POST['create_menu'])) + { + if ( $menu_ref->verify() =3D=3D 0) $menu_ref->ins= ert(); + }elseif (isset ($_POST['mod_menu'])) + { + if ( $menu_ref->verify() =3D=3D 0)$menu_ref->update(); + } +} +/** * if delete then delete */ =20 @@ -131,6 +154,7 @@ '; echo ''; echo ''.$table->get_header(0).''; @@ -143,29 +167,30 @@ echo ''.$table->get_header(7).''; echo ''; =20 -for ($i=3D0;$iget_object($ret, $i); - $js=3D$row->me_code; - switch ($row->me_type) - { - case 'PL': - $js=3Dsprintf('
%s', - $gDossier,$row->me_code,$row->me_code); - break; - - } - $class=3D ( $i%2 =3D=3D 0)?$class=3D' class=3D"odd"':$class=3D' class=3D= "even"'; - echo ""; - echo td($js); - echo td($row->me_menu); - echo td($row->me_description); - echo td($row->me_file); - echo td($row->me_url); - echo td($row->me_parameter); - echo td($row->me_javascript); - echo td($row->me_type); - echo ''; + $row =3D $menu->get_object($ret, $i); + $js =3D $row->me_code; + switch ($row->me_type) + { + case 'PL': + $js =3D sprintf('%s', $gDossier, $row->me_co= de, $row->me_code); + break; + case 'ME': + $js =3D sprintf('%s', $gDossier, $row->me_code= , $row->me_code); + break; + } + $class =3D ( $i % 2 =3D=3D 0) ? $class =3D ' class=3D"odd"' : $class= =3D ' class=3D"even"'; + echo ""; + echo td($js); + echo td($row->me_menu); + echo td($row->me_description); + echo td($row->me_file); + echo td($row->me_url); + echo td($row->me_parameter); + echo td($row->me_javascript); + echo td($row->me_type); + echo ''; } echo ''; =20 Added: 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 = (rev 0) +++ phpcompta/trunk/include/template/menu_detail.php 2011-12-07 13:29:40 = UTC (rev 4571) @@ -0,0 +1,72 @@ +me_code); +if ( $m->me_code !=3D -1) $str_code->setReadOnly (true); + +$str_menu=3Dnew IText('me_menu',$m->me_menu); +$str_desc=3Dnew IText('me_description',$m->me_description); +$str_file=3Dnew IText('me_file',$m->me_file); +$str_url=3Dnew IText('me_url',$m->me_url); +$str_js=3Dnew IText('me_javascript',$m->me_javascript); + +?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Code du menu + + input()?> +
+ Libell=C3=A9 du menu + + input()?> +
+ Description + + input()?> +
+ Fichier =C3=A0 inclure (depuis le r=C3=A9pertoire include) + + input()?> +
+ URL + + input()?> +
+ Param=C3=A8ttre + + input()?> +
+ Javascript + + input()?> +
\ No newline at end of file From MAILER-DAEMON Wed Dec 07 08:51:27 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYHuB-0006YD-BI for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 08:51:27 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 14:55:29 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4572 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 13:51:25 -0000 Author: danydb Date: 2011-12-07 14:55:27 +0100 (Wed, 07 Dec 2011) New Revision: 4572 Modified: phpcompta/trunk/html/ajax_misc.php Log: ajax_misc.php default var_dump($_GET) Modified: phpcompta/trunk/html/ajax_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_misc.php 2011-12-07 13:29:40 UTC (rev 4571) +++ phpcompta/trunk/html/ajax_misc.php 2011-12-07 13:55:27 UTC (rev 4572) @@ -540,4 +540,6 @@ case 'add_menu'; require_once 'ajax_mod_menu.php'; break; -} \ No newline at end of file + default: + var_dump($_GET); +} From MAILER-DAEMON Wed Dec 07 09:03:39 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYI5z-0000mT-7B for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 09:03:39 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 15:07:48 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4573 - in phpcompta/trunk: html include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 14:03:37 -0000 Author: danydb Date: 2011-12-07 15:07:46 +0100 (Wed, 07 Dec 2011) New Revision: 4573 Modified: phpcompta/trunk/html/ajax_misc.php phpcompta/trunk/include/template/menu_detail.php Log: Add/modify menu=20 Modified: phpcompta/trunk/html/ajax_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_misc.php 2011-12-07 13:55:27 UTC (rev 4572) +++ phpcompta/trunk/html/ajax_misc.php 2011-12-07 14:07:46 UTC (rev 4573) @@ -537,7 +537,7 @@ case 'create_menu'; require_once 'ajax_create_menu.php'; break; - case 'add_menu'; + case 'mod_menu'; require_once 'ajax_mod_menu.php'; break; default: 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 2011-12-07 13:55:27 = UTC (rev 4572) +++ phpcompta/trunk/include/template/menu_detail.php 2011-12-07 14:07:46 = UTC (rev 4573) @@ -1,7 +1,7 @@ me_code); if ( $m->me_code !=3D -1) $str_code->setReadOnly (true); =20 @@ -9,6 +9,7 @@ $str_desc=3Dnew IText('me_description',$m->me_description); $str_file=3Dnew IText('me_file',$m->me_file); $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); =20 ?> @@ -69,4 +70,4 @@ input()?> - \ No newline at end of file + From MAILER-DAEMON Wed Dec 07 09:17:30 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYIJO-0003P4-FT for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 09:17:30 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 15:21:35 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4574 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 14:17:28 -0000 Author: danydb Date: 2011-12-07 15:21:33 +0100 (Wed, 07 Dec 2011) New Revision: 4574 Modified: phpcompta/trunk/include/ajax_create_menu.php phpcompta/trunk/include/ajax_mod_menu.php Log: Confirm change or creation menu Modified: phpcompta/trunk/include/ajax_create_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_create_menu.php 2011-12-07 14:07:46 UTC = (rev 4573) +++ phpcompta/trunk/include/ajax_create_menu.php 2011-12-07 14:21:33 UTC = (rev 4574) @@ -2,7 +2,7 @@ require_once 'class_menu_ref.php'; $msg=3D"Cr=C3=A9ation"; $m=3Dnew Menu_Ref($cn); -echo '
'; +echo ''; require_once 'template/menu_detail.php'; echo HtmlInput::submit('create_menu','Sauver'); echo HtmlInput::button_close('divmenu'); Modified: phpcompta/trunk/include/ajax_mod_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_mod_menu.php 2011-12-07 14:07:46 UTC (re= v 4573) +++ phpcompta/trunk/include/ajax_mod_menu.php 2011-12-07 14:21:33 UTC (re= v 4574) @@ -2,7 +2,7 @@ require_once 'class_menu_ref.php'; $m=3Dnew Menu_Ref($cn,$me_code); $msg=3D"Modification ".$m->me_code.h($m->menu); -echo ''; +echo ''; require_once 'template/menu_detail.php'; =20 echo HtmlInput::submit('mod_menu','Sauver'); From MAILER-DAEMON Wed Dec 07 13:14:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYM0l-0003D6-UG for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 13:14:31 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 19:18:37 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4575 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 18:14:29 -0000 Author: danydb Date: 2011-12-07 19:18:35 +0100 (Wed, 07 Dec 2011) New Revision: 4575 Modified: phpcompta/trunk/include/compta_fin_rec.inc.php Log: cosmetic in reconciliation : diff not computed properly Modified: phpcompta/trunk/include/compta_fin_rec.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-07 14:21:33 UT= C (rev 4574) +++ phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-07 18:18:35 UT= C (rev 4575) @@ -58,7 +58,7 @@ $cn->exec_sql('update jrn set jr_pj_number=3D$1 where jr_id=3D$2', ar= ray($_POST['ext'], $array[$i])); $tot =3D bcadd($tot, $cn->get_value('select qf_amount from quant_fin = where jr_id=3D$1', array($array[$i]))); } - $diff =3D bcsub($_POST['start_extrait'], $_POST['end_extrait']); + $diff =3D bcsub($_POST['end_extrait'], $_POST['start_extrait']); if ($diff !=3D 0 && $diff !=3D $tot) { $remain=3Dbcsub($tot,$diff); From MAILER-DAEMON Wed Dec 07 13:50:04 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYMZA-0004Ja-Fl for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 13:50:04 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 19:54:13 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4576 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 18:50:01 -0000 Author: danydb Date: 2011-12-07 19:54:12 +0100 (Wed, 07 Dec 2011) New Revision: 4576 Modified: phpcompta/trunk/include/compta_fin_rec.inc.php Log: add bcscale Modified: phpcompta/trunk/include/compta_fin_rec.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-07 18:18:35 UT= C (rev 4575) +++ phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-07 18:54:12 UT= C (rev 4576) @@ -28,6 +28,7 @@ * */ require_once 'class_acc_ledger_fin.php'; +bcscale(2); echo '
'; $Ledger =3D new Acc_Ledger_Fin($cn, 0); if (!isset($_REQUEST['p_jrn'])) From MAILER-DAEMON Wed Dec 07 13:59:44 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYMiV-0007og-W8 for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 13:59:43 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 20:03:54 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4577 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 18:59:42 -0000 Author: danydb Date: 2011-12-07 20:03:53 +0100 (Wed, 07 Dec 2011) New Revision: 4577 Modified: phpcompta/trunk/include/compta_fin_rec.inc.php phpcompta/trunk/include/constant.php Log: cosmetic rec. Modified: phpcompta/trunk/include/compta_fin_rec.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-07 18:54:12 UT= C (rev 4576) +++ phpcompta/trunk/include/compta_fin_rec.inc.php 2011-12-07 19:03:53 UT= C (rev 4577) @@ -27,6 +27,7 @@ * \brief reconcile operation * */ +global $g_failed,$g_succeed; require_once 'class_acc_ledger_fin.php'; bcscale(2); echo '
'; @@ -66,9 +67,14 @@ $cn->rollback(); alert("D'apr=C3=A8s l'extrait il y aurait du avoir un montant de $dif= f =C3=A0 rapprocher alors qu'il y a $tot rapproch=C3=A9s, mise =C3=A0 jou= r annul=C3=A9e, la diff=C3=A9rence est de $remain"); echo '
'; - echo '

'._("D'apr=C3=A8s l'extrait il y aurait du avoir un montant = de $diff =C3=A0 rapprocher alors qu'il y a $tot rapproch=C3=A9s, la diff=C3= =A9rence est de $remain
mise =C3=A0 jour annul=C3=A9e").'

'; + echo '

'.$g_failed._("D'apr=C3=A8s l'extrait il y aurait du avoir u= n montant de $diff =C3=A0 rapprocher alors qu'il y a $tot rapproch=C3=A9s= , la diff=C3=A9rence est de $remain
mise =C3=A0 jour annul=C3=A9e").'=

'; echo '
'; } + else + { + echo '
'.$g_succeed.' Mise =C3=A0 jour extra= it '.$_POST['ext'].'
'; + } + =09 $cn->commit(); } } Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-07 18:54:12 UTC (rev 457= 6) +++ phpcompta/trunk/include/constant.php 2011-12-07 19:03:53 UTC (rev 457= 7) @@ -29,9 +29,10 @@ global $version_phpcompta; =20 =20 -global $g_captcha; +global $g_captcha,$g_failed,$g_succeed; $g_captcha=3Dfalse; - +$g_failed=3D"✖"= ; = = =20 +$g_succeed=3D"✓"; =20 /*set to none for production */ /* uncomment for production */ =20 From MAILER-DAEMON Wed Dec 07 14:36:59 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYNIZ-0006am-FE for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 14:36:59 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 20:41:11 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4578 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 19:36:58 -0000 Author: danydb Date: 2011-12-07 20:41:09 +0100 (Wed, 07 Dec 2011) New Revision: 4578 Modified: phpcompta/trunk/include/class_menu_ref.php Log: check if file exists Modified: phpcompta/trunk/include/class_menu_ref.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_menu_ref.php 2011-12-07 19:03:53 UTC (r= ev 4577) +++ phpcompta/trunk/include/class_menu_ref.php 2011-12-07 19:41:09 UTC (r= ev 4578) @@ -30,6 +30,8 @@ if (trim($this->me_code)=3D=3D'') return -2; } + if ( ! file_exists('../include/'.$this->me_file)) return -3; + =20 return 0; } =20 From MAILER-DAEMON Wed Dec 07 14:49:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYNUC-0001Mk-FH for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 14:49:00 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 20:53:10 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4579 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 19:48:59 -0000 Author: danydb Date: 2011-12-07 20:53:08 +0100 (Wed, 07 Dec 2011) New Revision: 4579 Modified: phpcompta/trunk/include/constant.php phpcompta/trunk/include/menu.inc.php Log: Ajout de test Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-07 19:41:09 UTC (rev 457= 8) +++ phpcompta/trunk/include/constant.php 2011-12-07 19:53:08 UTC (rev 457= 9) @@ -37,12 +37,12 @@ /* uncomment for production */ =20 =20 -$version_phpcompta=3DSVNINFO; +/*$version_phpcompta=3DSVNINFO; define ("DEBUG",false); +*/ + $version_phpcompta=3D4444; +define ("DEBUG",false); =20 -/* $version_phpcompta=3D4444; -define ("DEBUG",false); -*/ define ("DBVERSION",99); define ("DBVERSIONREPO",14); define ('NOTFOUND','--not found--'); Modified: phpcompta/trunk/include/menu.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/menu.inc.php 2011-12-07 19:41:09 UTC (rev 457= 8) +++ phpcompta/trunk/include/menu.inc.php 2011-12-07 19:53:08 UTC (rev 457= 9) @@ -83,14 +83,33 @@ $menu_ref->me_url=3D$me_url; $menu_ref->me_javascript=3D$me_javascript; $menu_ref->me_type=3D'ME'; - if ( isset($_POST['create_menu'])) - { - if ( $menu_ref->verify() =3D=3D 0) $menu_ref->ins= ert(); - }elseif (isset ($_POST['mod_menu'])) - { - if ( $menu_ref->verify() =3D=3D 0)$menu_ref->update(); - } -} + $check=3D$menu_ref->verify(); + if ( $check =3D=3D 0)=20 + { + if ( isset($_POST['create_menu'])) + { + $menu_ref->insert(); + }elseif (isset ($_POST['mod_menu'])) + { + if ( $menu_ref->verify() =3D=3D 0)$menu_ref->update(); + } + } + else + { + switch($check) + { + case -1: + echo '
Doublon : ce menu existe d=C3=A9j=C3=A0 '.h= ($menu_ref->me_code).'
'; + break; + case -2: + echo '
Le code ne peut pas =C3=AAtre vide
'; + break; + case -3: + echo '
Ce fichier n\'existe pas '.h($menu_ref->me_= file).'
'; + break; + } + } +}=20 /** * if delete then delete */ From MAILER-DAEMON Wed Dec 07 14:49:27 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYNUd-0001Pd-2E for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 14:49:27 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 20:53:39 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4580 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 19:49:26 -0000 Author: danydb Date: 2011-12-07 20:53:37 +0100 (Wed, 07 Dec 2011) New Revision: 4580 Modified: phpcompta/trunk/include/constant.php Log: remove test Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-07 19:53:08 UTC (rev 457= 9) +++ phpcompta/trunk/include/constant.php 2011-12-07 19:53:37 UTC (rev 458= 0) @@ -37,11 +37,12 @@ /* uncomment for production */ =20 =20 -/*$version_phpcompta=3DSVNINFO; +$version_phpcompta=3DSVNINFO; define ("DEBUG",false); -*/ +/* $version_phpcompta=3D4444; define ("DEBUG",false); +*/ =20 define ("DBVERSION",99); define ("DBVERSIONREPO",14); From MAILER-DAEMON Wed Dec 07 15:49:53 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYOR7-0008C2-6A for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 15:49:53 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 7 Dec 2011 21:54:03 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4581 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 20:49:52 -0000 Author: danydb Date: 2011-12-07 21:54:02 +0100 (Wed, 07 Dec 2011) New Revision: 4581 Modified: phpcompta/trunk/include/ajax_mod_menu.php phpcompta/trunk/include/class_menu_ref.php phpcompta/trunk/include/menu.inc.php Log: Fix bug : in ajax_mod_menu : unknown variable $m->menu + exception handli= ng Modified: phpcompta/trunk/include/ajax_mod_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_mod_menu.php 2011-12-07 19:53:37 UTC (re= v 4580) +++ phpcompta/trunk/include/ajax_mod_menu.php 2011-12-07 20:54:02 UTC (re= v 4581) @@ -1,7 +1,7 @@ me_code.h($m->menu); +$msg=3D"Modification ".$m->me_code.' '.h($m->me_menu); echo ''; require_once 'template/menu_detail.php'; =20 Modified: phpcompta/trunk/include/class_menu_ref.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_menu_ref.php 2011-12-07 19:53:37 UTC (r= ev 4580) +++ phpcompta/trunk/include/class_menu_ref.php 2011-12-07 20:54:02 UTC (r= ev 4581) @@ -21,20 +21,27 @@ } function verify() { + try + { parent::verify(); if ( $this->me_code =3D=3D -1) { $this->format_code(); if ( $this->cn->get_value("select count(*) from menu_ref whe= re me_code=3D$1",array($this->me_code)) > 0) - return -1; + throw new Exception ('Doublon'); if (trim($this->me_code)=3D=3D'') - return -2; + throw new Exception ('Ce menu existe d=C3=A9j=C3=A0'= ); } - if ( ! file_exists('../include/'.$this->me_file)) return -3; - =20 + if ( ! file_exists('../include/'.$this->me_file)) throw new Exce= ption ('Ce menu fichier '.$this->me_file." n'existe pas"); + return 0; + } catch (Exception $e) + { + alert($e->getMessage()); + return -1; + } } - =20 + } =20 ?> Modified: phpcompta/trunk/include/menu.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/menu.inc.php 2011-12-07 19:53:37 UTC (rev 458= 0) +++ phpcompta/trunk/include/menu.inc.php 2011-12-07 20:54:02 UTC (rev 458= 1) @@ -84,32 +84,19 @@ $menu_ref->me_javascript=3D$me_javascript; $menu_ref->me_type=3D'ME'; $check=3D$menu_ref->verify(); - if ( $check =3D=3D 0)=20 - { - if ( isset($_POST['create_menu'])) - { - $menu_ref->insert(); - }elseif (isset ($_POST['mod_menu'])) + if ($check =3D=3D 0) + { + if (isset($_POST['create_menu'])) { - if ( $menu_ref->verify() =3D=3D 0)$menu_ref->update(); + $menu_ref->insert(); } - } - else - { - switch($check) - { - case -1: - echo '
Doublon : ce menu existe d=C3=A9j=C3=A0 '.h= ($menu_ref->me_code).'
'; - break; - case -2: - echo '
Le code ne peut pas =C3=AAtre vide
'; - break; - case -3: - echo '
Ce fichier n\'existe pas '.h($menu_ref->me_= file).'
'; - break; - } - } -}=20 + elseif (isset($_POST['mod_menu'])) + { + if ($menu_ref->verify() =3D=3D 0) + $menu_ref->update(); + } + } +} /** * if delete then delete */ From MAILER-DAEMON Wed Dec 07 18:06:28 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYQZI-0004xM-3n for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 18:06:28 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 8 Dec 2011 00:10:29 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4582 - in phpcompta/trunk: html html/js include sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 23:06:25 -0000 Author: danydb Date: 2011-12-08 00:10:27 +0100 (Thu, 08 Dec 2011) New Revision: 4582 Modified: phpcompta/trunk/html/ajax_misc.php phpcompta/trunk/html/export.php phpcompta/trunk/html/js/scripts.js phpcompta/trunk/include/ajax_add_menu.php phpcompta/trunk/include/ajax_get_menu_detail.php phpcompta/trunk/include/ajax_mod_menu.php phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/class_pre_operation.php phpcompta/trunk/include/impress_jrn.inc.php phpcompta/trunk/include/menu.inc.php phpcompta/trunk/include/profile.inc.php phpcompta/trunk/sql/upgrade.sql Log: fix bug in menu, profile and security for PRINTJRN Modified: phpcompta/trunk/html/ajax_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_misc.php 2011-12-07 20:54:02 UTC (rev 4581) +++ phpcompta/trunk/html/ajax_misc.php 2011-12-07 23:10:27 UTC (rev 4582) @@ -537,7 +537,7 @@ case 'create_menu'; require_once 'ajax_create_menu.php'; break; - case 'mod_menu'; + case 'modify_menu'; require_once 'ajax_mod_menu.php'; break; default: Modified: phpcompta/trunk/html/export.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/export.php 2011-12-07 20:54:02 UTC (rev 4581) +++ phpcompta/trunk/html/export.php 2011-12-07 23:10:27 UTC (rev 4582) @@ -26,17 +26,17 @@ * */ =20 - +global $g_user; require_once('class_database.php'); require_once('class_user.php'); $gDossier=3Ddossier::id(); $cn=3Dnew Database($gDossier); =20 -$user=3Dnew User($cn); -$user->Check(); -$action=3D$user->check_dossier($gDossier); +$g_user=3Dnew User($cn); +$g_user->Check(); +$action=3D$g_user->check_dossier($gDossier); =20 -if ( $action=3D=3D'X' || ! isset($_GET['act']) || $user->check_print($_G= ET['act'])=3D=3D0 ) +if ( $action=3D=3D'X' || ! isset($_GET['act']) || $g_user->check_print($= _GET['act'])=3D=3D0 ) { echo alert('Acc=C3=A8s interdit'); redirect("do.php?".dossier::get()); Modified: phpcompta/trunk/html/js/scripts.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/scripts.js 2011-12-07 20:54:02 UTC (rev 4581) +++ phpcompta/trunk/html/js/scripts.js 2011-12-07 23:10:27 UTC (rev 4582) @@ -1302,11 +1302,11 @@ } ); } -function mod_menu(p_dossier,me_code) +function modify_menu(p_dossier,me_code) { waiting_box(); removeDiv('divmenu'); - var qs=3D"op=3Dmod_menu&gDossier=3D"+p_dossier+"&ctl=3Ddivmenu&me_co= de=3D"+me_code; + var qs=3D"op=3Dmodify_menu&gDossier=3D"+p_dossier+"&ctl=3Ddivmenu&me= _code=3D"+me_code; =20 var action=3Dnew Ajax.Request ( 'ajax_misc.php', { Modified: phpcompta/trunk/include/ajax_add_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_add_menu.php 2011-12-07 20:54:02 UTC (re= v 4581) +++ phpcompta/trunk/include/ajax_add_menu.php 2011-12-07 23:10:27 UTC (re= v 4582) @@ -29,8 +29,9 @@ select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') = from menu_ref where - me_file is null and me_javascript is null and me_type<>'PR' - UNION ALL + me_file is null and me_javascript is null and me_url is null and me_typ= e<>'PR' and me_type <> 'SP' + and me_code in (select me_code from profile_menu where p_id=3D".sql_str= ing($p_id).")". + " UNION ALL select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')= from menu_ref where me_code=3D'EXT' Modified: phpcompta/trunk/include/ajax_get_menu_detail.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_get_menu_detail.php 2011-12-07 20:54:02 = UTC (rev 4581) +++ phpcompta/trunk/include/ajax_get_menu_detail.php 2011-12-07 23:10:27 = UTC (rev 4582) @@ -29,13 +29,18 @@ // retrieve data $profile=3D$cn->get_value("select p_id from profile_menu where pm_id=3D$= 1",array($pm_id)); $a_value=3D$cn->make_array("select me_code,me_code||' '||me_menu||' '||c= oalesce(me_description,'') from menu_ref",0); -$a_value_null=3D$cn->make_array("select me_code,me_code||' '||me_menu||'= '||coalesce(me_description,'') from menu_ref +$ame_code_dep=3D$cn->make_array(" + select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'') = from + menu_ref where - me_code in (select me_code from profile_menu where p_id=3D$profile and = p_type_display<>'P' and pm_id <> $pm_id) - UNION ALL + me_file is null and me_javascript is null and me_url is null and me_typ= e<>'PR' and me_type <> 'SP' + and me_code in (select me_code from profile_menu where p_id=3D".sql_str= ing($profile).")". + " UNION ALL select me_code,me_code||' '||me_menu||' '||coalesce(me_description,'')= from menu_ref where - me_code=3D'EXT'",1); + me_code=3D'EXT' + order by 1 + ",1); $a_type=3D$cn->make_array("select pm_type,pm_desc from profile_menu_type= ",1); =20 $array=3D$cn->get_array("select p_id,pm_id,me_code,me_code_dep,p_order,p= _type_display,pm_default @@ -54,7 +59,7 @@ $me_code->selected=3D$array[0]['me_code']; =20 $me_code_dep=3Dnew ISelect('me_code_dep'); -$me_code_dep->value=3D$a_value_null; +$me_code_dep->value=3D$ame_code_dep; $me_code_dep->selected=3D$array[0]['me_code_dep']; =20 $p_order=3Dnew Inum('p_order',$array[0]['p_order']); Modified: phpcompta/trunk/include/ajax_mod_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_mod_menu.php 2011-12-07 20:54:02 UTC (re= v 4581) +++ phpcompta/trunk/include/ajax_mod_menu.php 2011-12-07 23:10:27 UTC (re= v 4582) @@ -5,7 +5,7 @@ echo ''; require_once 'template/menu_detail.php'; =20 -echo HtmlInput::submit('mod_menu','Sauver'); +echo HtmlInput::submit('modify_menu','Sauver'); echo HtmlInput::button_close('divmenu'); echo ''; ?> Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-07 20:54:02 UTC = (rev 4581) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-07 23:10:27 UTC = (rev 4582) @@ -340,6 +340,7 @@ */ function get_row($p_from,$p_to,$p_limit=3D-1,$p_offset=3D-1) { + global $g_user; $periode=3Dsql_filter_per($this->db,$p_from,$p_to,'p_id','jr_tec= h_per'); =20 $cond_limite=3D($p_limit!=3D-1)?" limit ".$p_limit." offset ".$p= _offset:""; @@ -379,7 +380,10 @@ jr_montant, j_qcode, jr_rapt as oc, j_tech_per as period= e from jrnx left join jrn on ". - "jr_grpt_id=3Dj_grpt left join tmp_= pcmn on pcm_val=3Dj_poste where ". + "jr_grpt_id=3Dj_grpt left join tmp_= pcmn on pcm_val=3Dj_poste + join jrn_def on (jr_def_id=3Djrn_def_id) + where ". + $g_user->get_ledger_sql()." and ". " ".$periode." order by j_date::da= te,substring(jr_pj_number,'\\\\d+$') asc,j_grpt,j_debit desc ". $cond_limite); =20 @@ -494,9 +498,10 @@ */ function get_rowSimple($p_from,$p_to,$trunc=3D0,$p_limit=3D-1,$p_off= set=3D-1) { + global $g_user; // Grand-livre : id=3D 0 //--- - $jrn=3D($this->id =3D=3D 0 )?"":"and jrn_def_id =3D ".$this->id; + $jrn=3D($this->id =3D=3D 0 )?"and ".$g_user->get_ledger_sql():"a= nd jrn_def_id =3D ".$this->id; =20 $periode=3Dsql_filter_per($this->db,$p_from,$p_to,'p_id','jr_tec= h_per'); =20 @@ -2679,13 +2684,14 @@ */ function get_operation($p_from,$p_to) { - $jrn=3D($this->id=3D=3D0)?'':' and jr_def_id =3D '.$this->id; + global $g_user; + $jrn=3D($this->id=3D=3D0)?'and '.$g_user->get_ledger_sql():' and= jr_def_id =3D '.$this->id; $sql=3D"select jr_id as id ,jr_internal as internal, ". "jr_pj_number as pj,jr_grpt_id,". " to_char(jr_date,'DDMMYY') as date_fmt, ". " jr_comment as comment, jr_montant as montant ,". " jr_grpt_id,jr_def_id". - " from jrn where ". + " from jrn join jrn_def on (jr_def_id=3Djrn_def_id) where = ". " jr_date >=3D (select p_start from parm_periode where p_id =3D $1) and jr_date <=3D (select p_end from parm_periode where p_id =3D $= 2)" . ' '.$jrn.' order by jr_date,substring(jr_pj_number,\'\\\d+= $\')::numeric asc'; Modified: phpcompta/trunk/include/class_pre_operation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_pre_operation.php 2011-12-07 20:54:02 U= TC (rev 4581) +++ phpcompta/trunk/include/class_pre_operation.php 2011-12-07 23:10:27 U= TC (rev 4582) @@ -184,7 +184,7 @@ $this->db=3D$p_cn; $this->operation=3Dnew Pre_operation($this->db); $this->valid=3Darray('ledger'=3D>'jrn_def_id','ledger_type'=3D>'= jrn_type','direct'=3D>'od_direct'); - + $this->jrn_def_id=3D-1; } =20 =20 @@ -224,6 +224,7 @@ } public function get_operation() { + if ( $this->jrn_def_id=3D=3D'') return array(); $value=3D$this->db->make_array("select od_id,od_name from op_pre= def ". " where jrn_def_id=3D".sql_string($= this->jrn_def_id). " and od_direct =3D'".sql_string($t= his->od_direct)."'". Modified: phpcompta/trunk/include/impress_jrn.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_jrn.inc.php 2011-12-07 20:54:02 UTC (= rev 4581) +++ phpcompta/trunk/include/impress_jrn.inc.php 2011-12-07 23:10:27 UTC (= rev 4582) @@ -42,7 +42,7 @@ join user_sec_jrn on uj_jrn_id=3Djrn_def_id where uj_login=3D'$g_user->login' - and uj_priv !=3D'X' + and uj_priv in ('R','W') "; $ret=3D$cn->make_array($sql); } @@ -52,7 +52,6 @@ from jrn_def join jrn_type on jrn_def_type=3Djr= n_type_id"); =20 } - // Count the forbidden journaux $NoPriv=3D$cn->count_sql("select jrn_def_id,jrn_def_name,jrn_def_class_d= eb,jrn_def_class_cred,jrn_type_id,jrn_desc,uj_priv, jrn_deb_max_line,jrn_cred_max_line @@ -63,7 +62,7 @@ and uj_priv =3D'X' "); // Pour voir tout les journal ? -if ( $NoPriv =3D=3D 0 ) +if ( $NoPriv =3D=3D 0 && $ret !=3D null ) { $a=3Dcount($ret); $all=3Darray('value'=3D>0,'label'=3D>'Tous les journaux'); Modified: phpcompta/trunk/include/menu.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/menu.inc.php 2011-12-07 20:54:02 UTC (rev 458= 1) +++ phpcompta/trunk/include/menu.inc.php 2011-12-07 23:10:27 UTC (rev 458= 2) @@ -71,7 +71,7 @@ /** * if post save then we save a new one */ -if ( isset($_POST['create_menu'])|| isset($_POST['mod_menu'])) +if ( isset($_POST['create_menu'])|| isset($_POST['modify_menu'])) { extract($_POST); $menu_ref=3Dnew Menu_Ref($cn); @@ -90,7 +90,7 @@ { $menu_ref->insert(); } - elseif (isset($_POST['mod_menu'])) + elseif (isset($_POST['modify_menu'])) { if ($menu_ref->verify() =3D=3D 0) $menu_ref->update(); @@ -183,7 +183,7 @@ $js =3D sprintf('%s', $gDossier, $row->me_co= de, $row->me_code); break; case 'ME': - $js =3D sprintf('%s', $gDossier, $row->me_code= , $row->me_code); + $js =3D sprintf('%s', $gDossier, $row->me_c= ode, $row->me_code); break; } $class =3D ( $i % 2 =3D=3D 0) ? $class =3D ' class=3D"odd"' : $class= =3D ' class=3D"even"'; Modified: phpcompta/trunk/include/profile.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/profile.inc.php 2011-12-07 20:54:02 UTC (rev = 4581) +++ phpcompta/trunk/include/profile.inc.php 2011-12-07 23:10:27 UTC (rev = 4582) @@ -118,11 +118,8 @@ try { $cn->start(); - $me_code_dep=3D$cn->get_value("select me_code from profile_menu where - pm_id=3D$1",array($pm_id)); - $cn->exec_sql("delete from profile_menu where pm_id in - (select pm_id from profile_menu where me_code_dep=3D$1 and p_id=3D$2= )", - array($me_code_dep,$p_id)); + $cn->exec_sql("delete from profile_menu where pm_id in (select * from= get_menu_dependency($1)", + array($pm_id)); $cn->exec_sql("delete from profile_menu where pm_id=3D$1", array($pm_id)); $cn->commit(); Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-12-07 20:54:02 UTC (rev 4581) +++ phpcompta/trunk/sql/upgrade.sql 2011-12-07 23:10:27 UTC (rev 4582) @@ -1,6 +1,28 @@ -update attr_def set ad_type=3D'numeric' where ad_id=3D20; -insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',1),tva_comment,substring(split_part(tva_poste,',',= 1),1,3),'PAS' from tva_rate where split_part(tva_poste,',',1) not in (se= lect pcm_val from tmp_pcmn); -insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select sp= lit_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',= 2),1,3),'ACT' from tva_rate where split_part(tva_poste,',',2) not in (se= lect pcm_val from tmp_pcmn); -update attr_def set ad_type=3D'numeric',ad_size=3D6 where ad_id=3D20; -update attr_def set ad_type=3D'poste' where ad_id=3D5; -update attr_def set ad_size=3D10 where ad_type=3D'poste'; +CREATE OR REPLACE FUNCTION comptaproc.get_menu_dependency(profile_menu_i= d int) + RETURNS SETOF int AS +$BODY$ +declare + i int; + x int; + e int; +begin + for x in select pm_id,me_code + from profile_menu + where me_code_dep in (select me_code from profile_menu where pm_id=3D= profile_menu_id) + and p_id =3D (select p_id from profile_menu where pm_id=3Dprofile_men= u_id) + loop + return next x; + + for e in select * from comptaproc.get_menu_dependency_pm(x) + loop + return next e; + end loop; + + end loop; + return; +end; +$BODY$ +LANGUAGE plpgsql; + +delete from profile_menu where p_id=3D2 and me_code_dep=3D'DIVPARM'; +delete from profile_menu where p_id=3D2 and me_code_dep=3D'MOD'; From MAILER-DAEMON Wed Dec 07 18:06:58 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYQZm-00051z-7b for mharc-phpcompta-dev@gnu.org; Wed, 07 Dec 2011 18:06:58 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 8 Dec 2011 00:11:09 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4583 - phpcompta/trunk/html/admin/sql/patch X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 23:06:56 -0000 Author: danydb Date: 2011-12-08 00:11:07 +0100 (Thu, 08 Dec 2011) New Revision: 4583 Added: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql Log: fix bug in menu, profile and security for PRINTJRN Added: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/admin/sql/patch/upgrade99.sql = (rev 0) +++ phpcompta/trunk/html/admin/sql/patch/upgrade99.sql 2011-12-07 23:11:0= 7 UTC (rev 4583) @@ -0,0 +1,32 @@ +begin; +CREATE OR REPLACE FUNCTION comptaproc.get_menu_dependency(profile_menu_i= d int) + RETURNS SETOF int AS +$BODY$ +declare + i int; + x int; + e int; +begin + for x in select pm_id,me_code + from profile_menu + where me_code_dep in (select me_code from profile_menu where pm_id=3D= profile_menu_id) + and p_id =3D (select p_id from profile_menu where pm_id=3Dprofile_men= u_id) + loop + return next x; + + for e in select * from comptaproc.get_menu_dependency_pm(x) + loop + return next e; + end loop; + + end loop; + return; +end; +$BODY$ +LANGUAGE plpgsql; + +delete from profile_menu where p_id=3D2 and me_code_dep=3D'DIVPARM'; +delete from profile_menu where p_id=3D2 and me_code_dep=3D'MOD'; +update version set val=3D100; + +commit; \ No newline at end of file From MAILER-DAEMON Thu Dec 08 06:33:56 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYcEe-0001Bq-6j for mharc-phpcompta-dev@gnu.org; Thu, 08 Dec 2011 06:33:56 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 8 Dec 2011 12:37:57 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4584 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Dec 2011 11:33:54 -0000 Author: danydb Date: 2011-12-08 12:37:55 +0100 (Thu, 08 Dec 2011) New Revision: 4584 Modified: phpcompta/trunk/include/constant.php Log: upgrade99.sql Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-07 23:11:07 UTC (rev 458= 3) +++ phpcompta/trunk/include/constant.php 2011-12-08 11:37:55 UTC (rev 458= 4) @@ -35,16 +35,16 @@ $g_succeed=3D"✓"; =20 /*set to none for production */ /* uncomment for production */ +// $version_phpcompta=3D4444; +//define ("DEBUG",false); =20 =20 $version_phpcompta=3DSVNINFO; define ("DEBUG",false); -/* - $version_phpcompta=3D4444; -define ("DEBUG",false); -*/ =20 -define ("DBVERSION",99); + + +define ("DBVERSION",100); define ("DBVERSIONREPO",14); define ('NOTFOUND','--not found--'); =20 From MAILER-DAEMON Thu Dec 08 07:46:17 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RYdMf-0004Wa-CM for mharc-phpcompta-dev@gnu.org; Thu, 08 Dec 2011 07:46:17 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 8 Dec 2011 13:50:23 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4585 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Dec 2011 12:46:15 -0000 Author: danydb Date: 2011-12-08 13:50:22 +0100 (Thu, 08 Dec 2011) New Revision: 4585 Modified: phpcompta/trunk/include/template/ledger_detail_ven.php Log: signe pour op?\195?\169ration extourn?\195?\169e Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-08 11:= 37:55 UTC (rev 4584) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-08 12:= 50:22 UTC (rev 4585) @@ -154,8 +154,9 @@ } =20 $row.=3Dtd($sym_tva,'style=3D"text-align:center"'); - + =20 $htva=3D$q['qs_price']; + if ($q['qs_quantity']<0) { $htva=3Dbcmult($htva,-1);$q['qs_vat']=3Db= cmult($q['qs_vat'],-1);} $row.=3Dtd(nbm($htva),'class=3D"num"'); $tvac=3Dbcadd($htva,$q['qs_vat']); if ($owner->MY_TVA_USE=3D=3D'Y') @@ -163,8 +164,8 @@ $row.=3Dtd(nbm($q['qs_vat']),'class=3D"num"'); $row.=3Dtd(nbm($tvac),'class=3D"num"'); } - $total_tvac+=3D$tvac; - $total_htva+=3D$htva; + $total_tvac=3Dbcadd($total_tvac,$tvac); + $total_htva=3Dbcadd($total_htva,$htva); /* Analytic accountancy */ if ( $owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'popup'){ $poste=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT); From MAILER-DAEMON Fri Dec 09 08:32:30 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ0Yw-0003g3-Ih for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 08:32:30 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 14:36:25 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4586 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 13:32:29 -0000 Author: danydb Date: 2011-12-09 14:36:23 +0100 (Fri, 09 Dec 2011) New Revision: 4586 Modified: phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: signe pour op?\195?\169ration extourn?\195?\169e Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-08 12:50:22 UTC = (rev 4585) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-09 13:36:23 UTC = (rev 4586) @@ -218,7 +218,7 @@ throw (new Exception(__FILE__.__LINE__."sql a echoue [ $sql = ]")); =20 ////////////////////////////////////////////////// - // Reverse in QUANT_* tables + // Reverse in jrnx* tables ////////////////////////////////////////////////// $a_jid=3D$this->db->get_array("select j_id,j_debit from jrnx whe= re j_grpt=3D$1",array($this->jr_grpt_id)); for ($l=3D0;$ldb->exec_sql("INSERT INTO quant_sold( qs_internal, qs_fiche, qs_quantite,= qs_price, qs_vat, qs_vat_code, qs_client, qs_valid, j= _id) - SELECT $1, qs_fiche, qs_quantite*(-= 1), qs_price, qs_vat, + SELECT $1, qs_fiche, qs_quantite*(-= 1), qs_price*(-1), qs_vat*(-1), qs_vat_code, qs_client, qs_valid, $= 2 FROM quant_sold where j_id=3D$3", array($p_internal,$j_id,$row)); @@ -260,8 +260,8 @@ qp_internal, j_id, qp_fiche, qp_qua= ntite, qp_price, qp_vat, qp_vat_code, qp_nd_amount, qp_nd_tv= a, qp_nd_tva_recup, qp_supplier, qp_valid, qp_dep_priv) - SELECT $1, $2, qp_fiche, qp_quanti= te*(-1), qp_price, qp_vat, - qp_vat_code, qp_nd_amount, qp_nd_tv= a, qp_nd_tva_recup, qp_supplier, + SELECT $1, $2, qp_fiche, qp_quanti= te*(-1), qp_price*(-1), qp_vat*(-1), + qp_vat_code, qp_nd_amount*(-1), qp_= nd_tva*(-1), qp_nd_tva_recup*(-1), qp_supplier, qp_valid, qp_dep_priv FROM quant_purchase where j_id=3D$3= ", array($p_internal,$j_id,$row)); Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-08 12:= 50:22 UTC (rev 4585) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-09 13:= 36:23 UTC (rev 4586) @@ -156,7 +156,7 @@ $row.=3Dtd($sym_tva,'style=3D"text-align:center"'); =20 $htva=3D$q['qs_price']; - if ($q['qs_quantity']<0) { $htva=3Dbcmult($htva,-1);$q['qs_vat']=3Db= cmult($q['qs_vat'],-1);} + =20 $row.=3Dtd(nbm($htva),'class=3D"num"'); $tvac=3Dbcadd($htva,$q['qs_vat']); if ($owner->MY_TVA_USE=3D=3D'Y') From MAILER-DAEMON Fri Dec 09 08:51:53 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ0rh-0002m9-ON for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 08:51:53 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 14:55:52 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4587 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 13:51:51 -0000 Author: danydb Date: 2011-12-09 14:55:50 +0100 (Fri, 09 Dec 2011) New Revision: 4587 Modified: phpcompta/trunk/include/forecast.inc.php Log: 490 affichage pr?\195?\169vision Modified: phpcompta/trunk/include/forecast.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/forecast.inc.php 2011-12-09 13:36:23 UTC (rev= 4586) +++ phpcompta/trunk/include/forecast.inc.php 2011-12-09 13:55:50 UTC (rev= 4587) @@ -26,6 +26,7 @@ */ =20 require_once 'class_anticipation.php'; +echo '
'; =20 $sa =3D (isset($_REQUEST['sa'])) ? $_REQUEST['sa'] : ''; /* * *******************************************************************= * @@ -384,3 +385,4 @@ } } ?> +
\ No newline at end of file From MAILER-DAEMON Fri Dec 09 08:58:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ0xp-0004JK-Hj for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 08:58:13 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 15:02:12 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4588 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 13:58:12 -0000 Author: danydb Date: 2011-12-09 15:02:10 +0100 (Fri, 09 Dec 2011) New Revision: 4588 Modified: phpcompta/trunk/include/class_acc_ledger.php Log: 491 Historique ODS Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-09 13:55:50 UTC = (rev 4587) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-09 14:02:10 UTC = (rev 4588) @@ -2483,8 +2483,8 @@ =20 $and=3D''; $user=3Dnew User($this->db); - $p_action=3D$ledger_type; - if ( $p_action =3D=3D '') $p_action=3D'ALL'; + $p_action=3D$ledger_type; + if ( $p_action =3D=3D '') $p_action=3D'ALL'; if ( $r_jrn =3D=3D -1 ) { =20 From MAILER-DAEMON Fri Dec 09 09:04:36 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ140-0005yc-FU for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 09:04:36 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 15:08:36 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4589 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 14:04:35 -0000 Author: danydb Date: 2011-12-09 15:08:35 +0100 (Fri, 09 Dec 2011) New Revision: 4589 Modified: phpcompta/trunk/include/ajax_get_menu_detail.php phpcompta/trunk/include/profile.inc.php Log: 489 efface menu + d?\195?\169pendances Modified: phpcompta/trunk/include/ajax_get_menu_detail.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_get_menu_detail.php 2011-12-09 14:02:10 = UTC (rev 4588) +++ phpcompta/trunk/include/ajax_get_menu_detail.php 2011-12-09 14:08:35 = UTC (rev 4589) @@ -94,13 +94,20 @@

-Cochez cette case si vous souhaitez effacer ce menu ainsi que ceux qui e= n d=C3=A9pendent +Cochez cette case si vous souhaitez effacer ce menu=20 input(); ?>

+

+Cochez cette case si vous souhaitez effacer ce menu ainsi que ceux qui e= n d=C3=A9pendent input(); +?> +

+'; =20 Modified: phpcompta/trunk/include/profile.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/profile.inc.php 2011-12-09 14:02:10 UTC (rev = 4588) +++ phpcompta/trunk/include/profile.inc.php 2011-12-09 14:08:35 UTC (rev = 4589) @@ -113,13 +113,16 @@ if (isset($_POST['mod'])) { extract($_POST); - if (isset($delete)) + if (isset($delete) || isset ($del_dep)) { try { $cn->start(); - $cn->exec_sql("delete from profile_menu where pm_id in (select * from= get_menu_dependency($1)", - array($pm_id)); + if ( isset ($del_dep)) + { + $cn->exec_sql("delete from profile_menu wher= e pm_id in (select * from get_menu_dependency($1)", + array($pm_id));=20 + } $cn->exec_sql("delete from profile_menu where pm_id=3D$1", array($pm_id)); $cn->commit(); From MAILER-DAEMON Fri Dec 09 09:05:48 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ15A-0006Vy-Bp for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 09:05:48 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 15:09:42 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4590 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 14:05:46 -0000 Author: danydb Date: 2011-12-09 15:09:41 +0100 (Fri, 09 Dec 2011) New Revision: 4590 Modified: phpcompta/trunk/include/history_operation.inc.php Log: #491 Historique ODS Modified: phpcompta/trunk/include/history_operation.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/history_operation.inc.php 2011-12-09 14:08:35= UTC (rev 4589) +++ phpcompta/trunk/include/history_operation.inc.php 2011-12-09 14:09:41= UTC (rev 4590) @@ -32,7 +32,7 @@ require_once 'class_acc_ledger_sold.php'; require_once 'class_acc_ledger.php'; global $g_user,$cn; - +$p_array =3D $_GET; if ( isset ($_GET['ledger_type'])) { $ledger_type=3D$_GET['ledger_type']; @@ -43,9 +43,14 @@ $ask_pay=3D1; break; case 'ODS': + $Ledger=3Dnew Acc_Ledger($cn,0); + $ask_pay=3D0; + $p_array['ledger_type']=3D'ODS'; + break; case 'ALL': $Ledger=3Dnew Acc_Ledger($cn,0); $ask_pay=3D0; + $p_array['ledger_type']=3D'ALL'; break; case 'VEN': $Ledger=3Dnew Acc_Ledger_Sold($cn,0); @@ -83,8 +88,8 @@ { $Ledger->update_paid($_GET); } -$p_array =3D $_GET; =20 + $msg=3D""; /* by default we should the default period */ if (!isset($p_array['date_start'])) From MAILER-DAEMON Fri Dec 09 09:09:17 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ18X-0007CB-N0 for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 09:09:17 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 15:13:19 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4591 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 14:09:16 -0000 Author: danydb Date: 2011-12-09 15:13:18 +0100 (Fri, 09 Dec 2011) New Revision: 4591 Modified: phpcompta/trunk/include/forecast.inc.php Log: #490 Affichage pr?\195?\169vision Modified: phpcompta/trunk/include/forecast.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/forecast.inc.php 2011-12-09 14:09:41 UTC (rev= 4590) +++ phpcompta/trunk/include/forecast.inc.php 2011-12-09 14:13:18 UTC (rev= 4591) @@ -240,7 +240,7 @@ $href =3D "?ac=3D" . $_REQUEST['ac'] . "&sa=3Dnew&" . $get_dossier; $menu[] =3D array($href, _("Ajout pr=C3=A9vision"), _("Ajout d'une pr=C3= =A9vision"), 0); $def =3D (isset($_REQUEST['f_id'])) ? $_REQUEST['f_id'] : -1; -echo '
'; +echo '
'; echo ShowItem($menu, 'H', 'mtitle', 'mtitle', $def); echo '
'; /* * *******************************************************************= * From MAILER-DAEMON Fri Dec 09 09:22:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ1L5-00025O-0x for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 09:22:15 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 15:26:13 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4592 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 14:22:12 -0000 Author: danydb Date: 2011-12-09 15:26:12 +0100 (Fri, 09 Dec 2011) New Revision: 4592 Modified: phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/history_operation.inc.php Log: #491 historique ODS Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-09 14:13:18 UTC = (rev 4591) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-09 14:26:12 UTC = (rev 4592) @@ -2616,7 +2616,7 @@ $r=3D''; $type=3D$this->type; =20 - if ( $type=3D=3D"" || $this->id=3D=3D0) $type=3D'ALL'; + if ( $type=3D=3D"") $type=3D'ALL'; $r.=3D'
'; $r.=3DHtmlInput::anchor_hide('Fermer','$(\'search_form\').style.display= =3D\'none\';'); $r.=3Dh2info('Recherche'); Modified: phpcompta/trunk/include/history_operation.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/history_operation.inc.php 2011-12-09 14:13:18= UTC (rev 4591) +++ phpcompta/trunk/include/history_operation.inc.php 2011-12-09 14:26:12= UTC (rev 4592) @@ -46,11 +46,13 @@ $Ledger=3Dnew Acc_Ledger($cn,0); $ask_pay=3D0; $p_array['ledger_type']=3D'ODS'; + $Ledger->type=3D'ODS'; break; case 'ALL': $Ledger=3Dnew Acc_Ledger($cn,0); $ask_pay=3D0; $p_array['ledger_type']=3D'ALL'; + $Ledger->type=3D'ALL'; break; case 'VEN': $Ledger=3Dnew Acc_Ledger_Sold($cn,0); From MAILER-DAEMON Fri Dec 09 09:50:20 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ1mG-0003Ve-1m for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 09:50:20 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 15:54:24 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4593 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 14:50:19 -0000 Author: danydb Date: 2011-12-09 15:54:22 +0100 (Fri, 09 Dec 2011) New Revision: 4593 Modified: phpcompta/trunk/include/profile.inc.php Log: #489 Efface menu + d?\195?\169pendance Modified: phpcompta/trunk/include/profile.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/profile.inc.php 2011-12-09 14:26:12 UTC (rev = 4592) +++ phpcompta/trunk/include/profile.inc.php 2011-12-09 14:54:22 UTC (rev = 4593) @@ -120,7 +120,7 @@ $cn->start(); if ( isset ($del_dep)) { - $cn->exec_sql("delete from profile_menu wher= e pm_id in (select * from get_menu_dependency($1)", + $cn->exec_sql("delete from profile_menu wher= e pm_id in (select * from get_menu_dependency($1))", array($pm_id));=20 } $cn->exec_sql("delete from profile_menu where pm_id=3D$1", From MAILER-DAEMON Fri Dec 09 10:03:47 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ1zH-0006Mz-Py for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 10:03:47 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 16:07:41 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4594 - in phpcompta/trunk: html/admin/sql/patch include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 15:03:47 -0000 Author: danydb Date: 2011-12-09 16:07:40 +0100 (Fri, 09 Dec 2011) New Revision: 4594 Modified: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql phpcompta/trunk/include/class_acc_ledger.php Log: #489 Efface menu + d?\195?\169pendance -> mise ?\195?\160 jour SQL Correction signe op?\195?\169ration extourn?\195?\169e Modified: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/admin/sql/patch/upgrade99.sql 2011-12-09 14:54:2= 2 UTC (rev 4593) +++ phpcompta/trunk/html/admin/sql/patch/upgrade99.sql 2011-12-09 15:07:4= 0 UTC (rev 4594) @@ -14,7 +14,7 @@ loop return next x; =20 - for e in select * from comptaproc.get_menu_dependency_pm(x) + for e in select * from comptaproc.get_menu_dependency(x) loop return next e; end loop; @@ -27,6 +27,16 @@ =20 delete from profile_menu where p_id=3D2 and me_code_dep=3D'DIVPARM'; delete from profile_menu where p_id=3D2 and me_code_dep=3D'MOD'; + +update quant_sold set qs_price=3D(-1)*qs_price, qs_vat=3D(-1)*qs_vat whe= re qs_quantite > 0 and qs_price > 0 and qs_vat >=3D 0; + +update quant_purchase set qp_price=3D(-1)*qp_price, qp_vat=3D(-1)*qp_va= t, + qp_nd_amount=3D(-1)*qp_nd_amount, + qp_nd_tva=3D(-1)*qp_nd_tva, + qp_nd_tva_recup=3D(-1)*qp_nd_tva_recup, + qp_dep_priv=3D(-1)*qp_dep_priv +where qp_quantite > 0 and qp_price > 0 and qp_vat >=3D 0; + update version set val=3D100; =20 commit; \ No newline at end of file Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-09 14:54:22 UTC = (rev 4593) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-09 15:07:40 UTC = (rev 4594) @@ -262,7 +262,7 @@ qp_valid, qp_dep_priv) SELECT $1, $2, qp_fiche, qp_quanti= te*(-1), qp_price*(-1), qp_vat*(-1), qp_vat_code, qp_nd_amount*(-1), qp_= nd_tva*(-1), qp_nd_tva_recup*(-1), qp_supplier, - qp_valid, qp_dep_priv + qp_valid, qp_dep_priv*(-1) FROM quant_purchase where j_id=3D$3= ", array($p_internal,$j_id,$row)); =20 From MAILER-DAEMON Fri Dec 09 17:31:47 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ8yp-0006ik-CQ for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 17:31:47 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 23:35:48 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4595 - phpcompta/trunk/html/admin/sql/patch X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 22:31:46 -0000 Author: danydb Date: 2011-12-09 23:35:45 +0100 (Fri, 09 Dec 2011) New Revision: 4595 Modified: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql Log: Bug in negativ Modified: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/admin/sql/patch/upgrade99.sql 2011-12-09 15:07:4= 0 UTC (rev 4594) +++ phpcompta/trunk/html/admin/sql/patch/upgrade99.sql 2011-12-09 22:35:4= 5 UTC (rev 4595) @@ -28,14 +28,14 @@ delete from profile_menu where p_id=3D2 and me_code_dep=3D'DIVPARM'; delete from profile_menu where p_id=3D2 and me_code_dep=3D'MOD'; =20 -update quant_sold set qs_price=3D(-1)*qs_price, qs_vat=3D(-1)*qs_vat whe= re qs_quantite > 0 and qs_price > 0 and qs_vat >=3D 0; +update quant_sold set qs_price=3D(-1)*qs_price, qs_vat=3D(-1)*qs_vat whe= re qs_quantite < 0 and qs_price > 0 and qs_vat >=3D 0; =20 update quant_purchase set qp_price=3D(-1)*qp_price, qp_vat=3D(-1)*qp_va= t, qp_nd_amount=3D(-1)*qp_nd_amount, qp_nd_tva=3D(-1)*qp_nd_tva, qp_nd_tva_recup=3D(-1)*qp_nd_tva_recup, qp_dep_priv=3D(-1)*qp_dep_priv -where qp_quantite > 0 and qp_price > 0 and qp_vat >=3D 0; +where qp_quantite < 0 and qp_price > 0 and qp_vat >=3D 0; =20 update version set val=3D100; =20 From MAILER-DAEMON Fri Dec 09 17:52:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZ9It-0000k9-D3 for mharc-phpcompta-dev@gnu.org; Fri, 09 Dec 2011 17:52:31 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 9 Dec 2011 23:56:34 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4596 - phpcompta/trunk/html/admin/sql/patch X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 22:52:30 -0000 Author: danydb Date: 2011-12-09 23:56:32 +0100 (Fri, 09 Dec 2011) New Revision: 4596 Modified: phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql Log: Update user from P to R Modified: phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql 2011-12-09 22:3= 5:45 UTC (rev 4595) +++ phpcompta/trunk/html/admin/sql/patch/ac-upgrade13.sql 2011-12-09 22:5= 6:32 UTC (rev 4596) @@ -6,5 +6,6 @@ -- run to the account_repository insert into theme values ('EPad','style-epad.css',null); update priv_user set priv_priv=3D'R' where priv_priv=3D'L'; +update priv_user set priv_priv=3D'R' where priv_priv=3D'P'; update version set val=3D14; commit; From MAILER-DAEMON Sun Dec 11 10:43:01 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZlYL-0000uW-52 for mharc-phpcompta-dev@gnu.org; Sun, 11 Dec 2011 10:43:01 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 11 Dec 2011 16:46:43 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r207 - in trunk: . coprop coprop/include coprop/include/template coprop/sql skel 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, 11 Dec 2011 15:42:59 -0000 Author: danydb Date: 2011-12-11 16:46:41 +0100 (Sun, 11 Dec 2011) New Revision: 207 Added: trunk/coprop/ trunk/coprop/README.txt trunk/coprop/ajax.php trunk/coprop/coprop-constant.php trunk/coprop/coprop-javascript.js trunk/coprop/doc/ trunk/coprop/include/ trunk/coprop/include/appel_fond.inc.php trunk/coprop/include/class_copro_parameter.php trunk/coprop/include/class_install_plugin.php trunk/coprop/include/copro-parameter.inc.php trunk/coprop/include/coprop_parameter.php trunk/coprop/include/key.inc.php trunk/coprop/include/lot.inc.php trunk/coprop/include/template/ trunk/coprop/include/template/appel_fond.php trunk/coprop/include/template/list_copro_lot.php trunk/coprop/index.php trunk/coprop/raw.php trunk/coprop/sql/ trunk/coprop/sql/trunk_dev.sql Modified: trunk/skel/index.php trunk/skel/skel_constant.php Log: First step Add screens + DB schema Added: trunk/coprop/README.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/README.txt (rev 0) +++ trunk/coprop/README.txt 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1 @@ +Extension pour les copropri=C3=A9t=C3=A9s Added: trunk/coprop/ajax.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/ajax.php (rev 0) +++ trunk/coprop/ajax.php 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,18 @@ + Added: trunk/coprop/coprop-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 --- trunk/coprop/coprop-constant.php (rev 0) +++ trunk/coprop/coprop-constant.php 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,17 @@ + \ No newline at end of file Added: trunk/coprop/coprop-javascript.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/coprop-javascript.js (rev 0) +++ trunk/coprop/coprop-javascript.js 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,60 @@ +/** + *javascript + */ + +/** + * Modifier un copropri=C3=A9taire et les lots qu'il a + */ +function mod_coprop(dossier,copro_qcode,plugin_code) +{ + try + { + alert('Modifier un copropri=C3=A9taire et ses lots'); + } + catch(e) + { + alert(e.message); + } +} +/** + * Ajout un lien entre copropri=C3=A9taire et lot + */ +function add_coprop() +{ + try + { + alert('Modifier un copropri=C3=A9taire et ses lots'); + } + catch(e) + { + alert(e.message); + } +} +/** + * Ajout clef + tanti=C3=A8me lot associ=C3=A9s + */ +function add_key() +{ + try + { + alert('Ajout clef + tanti=C3=A8me lot associ=C3=A9s'); + } + catch(e) + { + alert(e.message); + } +} +/** + * Modifie clef + tanti=C3=A8me lot associ=C3=A9s + */ +function mod_key() +{ + try + { + alert('Modifie clef + tanti=C3=A8me lot associ=C3=A9s'); + } + catch(e) + { + alert(e.message); + } +} \ No newline at end of file Added: trunk/coprop/include/appel_fond.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/appel_fond.inc.php (rev = 0) +++ trunk/coprop/include/appel_fond.inc.php 2011-12-11 15:46:41 UTC (rev = 207) @@ -0,0 +1,53 @@ +select_ledger('ODS',3); + $led_appel_fond->selected=3D$g_copro_parameter->journal_appel; + $poste_appel=3Dnew IPoste('poste_appel'); + $poste_appel->set_attribute('gDossier',Dossier::id()); + $poste_appel->set_attribute('jrn',$g_copro_parameter->journal_appel); + $poste_appel->set_attribute('account','poste_appel'); + $poste_appel->value=3D$g_copro_parameter->poste_appel; + $key=3Dnew ISelect("key"); + $key->value=3D$cn->make_array("select cr_id,cr_name from coprop.clef_re= partition"); + + require_once 'template/appel_fond.php'; +} +?> Added: trunk/coprop/include/class_copro_parameter.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/class_copro_parameter.php = (rev 0) +++ trunk/coprop/include/class_copro_parameter.php 2011-12-11 15:46:41 UT= C (rev 207) @@ -0,0 +1,73 @@ +exec_sql("select * from coprop.parameter "); + for ($i =3D 0;$i < Database::num_row($Res);$i++) + { + $row=3DDatabase::fetch_array($Res,$i); + $key=3D$row['pr_id']; + $elt=3D$row['pr_value']; + // store value here + $this->{"$key"}=3D$elt; + } + + } + /*! + ************************************************** + * \brief save the parameter into the database by inserting or upda= ting + * + * + * \param $p_attr give the attribut name + * + */ + function save($p_option,$p_value) + { + global $cn; + // check if the parameter does exist + if ( $cn->get_value('select count(*) from coprop.parameter where= pr_id=3D$1',array($p_option)) !=3D 0 ) + { + $Res=3D$cn->exec_sql("update coprop.parameter set pr_value=3D= $1 where pr_id=3D$2", + array($p_value,$p_option)); + } + else + { + + $Res=3D$cn->exec_sql("insert into coprop.parameter (pr_id,pr= _value) values( $1,$2)", + array($p_option,$p_value)); + + } + + } + +} +?> Added: trunk/coprop/include/class_install_plugin.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/class_install_plugin.php = (rev 0) +++ trunk/coprop/include/class_install_plugin.php 2011-12-11 15:46:41 UTC= (rev 207) @@ -0,0 +1,81 @@ +cn =3D $p_cn; + } + + /** + * @brief install the plugin, create all the needed schema, tables, pro= c + * in the database + * @param $p_dossier is the dossier id + */ + function install() + { + $this->cn->start(); + // create the schema + $this->create_schema(); + // create table + put default values + $this->create_table_parameter(); + $this->cn->commit(); + } + + function create_schema() + { + $this->cn->exec_sql('create schema coprop'); + } + + function create_table_parameter() + { + $sql =3D <<cn->exec_sql($sql); +// load default value + $array =3D array( + 'categorie_lot' =3D> array(''), + 'categorie_coprop' =3D> array(''), + 'poste_appel' =3D> array(''), + 'journal_appel' =3D> array('0'), + ); + + foreach ($array as $code =3D> $value) + { + $this->cn->exec_sql('insert into coprop.parameter(pr_id,pr_value) val= ues ($1,$2)', array($code, $value[0])); + } + } + +} Added: trunk/coprop/include/copro-parameter.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/copro-parameter.inc.php = (rev 0) +++ trunk/coprop/include/copro-parameter.inc.php 2011-12-11 15:46:41 UTC = (rev 207) @@ -0,0 +1,108 @@ +start(); + try { + $g_copro_parameter->save('categorie_lot',$_POST['categorie_lot']); + $g_copro_parameter->save('categorie_coprop',$_POST['categorie_coprop']= ); + $g_copro_parameter->save('poste_appel',$_POST['poste_appel']); + $g_copro_parameter->save('journal_appel',$_POST['journal_appel']); + } + catch(Exception $e) + { + $cn->rollback(); + echo $e->getTraceAsString(); + } + $cn->commit(); +} +$g_copro_parameter=3Dnew Copro_Parameter(); +/* + * Liste param=C3=A8tres + */ +$cat_lot=3Dnew ISelect('categorie_lot'); +$cat_lot->value=3D$cn->make_array("select fd_id,fd_label from fiche_def = order by fd_label"); +$cat_lot->selected=3D$g_copro_parameter->categorie_lot; + +$cat_coprop=3Dnew ISelect('categorie_coprop'); +$cat_coprop->value=3D$cn->make_array("select fd_id,fd_label from fiche_d= ef order by fd_label"); +$cat_coprop->selected=3D$g_copro_parameter->categorie_coprop; + +$journal_appel=3Dnew ISelect('journal_appel'); +$journal_appel->value=3D$cn->make_array("select jrn_def_id,jrn_def_name = from jrn_def where jrn_def_type=3D'ODS' order by 2"); +$journal_appel->selected=3D$g_copro_parameter->journal_appel; + +$poste_appel=3Dnew IPoste('poste_appel'); +$poste_appel->set_attribute('gDossier',Dossier::id()); +$poste_appel->set_attribute('jrn',0); +$poste_appel->set_attribute('account','poste_appel'); + +$poste_appel->value=3D$g_copro_parameter->poste_appel; + +?> +
+ + + + + + + + + + + + + + + + + +
+ Cat=C3=A9gorie de fiches pour les lots + + input()?> +
+ Cat=C3=A9gorie de fiches pour les copropri=C3=A9taires + + input();?> +
+ Poste comptable par d=C3=A9faut pour les appels de fond + + input();?> +
+ Journal Appel de fond + + input();?> +
+ +
\ No newline at end of file Added: trunk/coprop/include/coprop_parameter.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/coprop_parameter.php (re= v 0) +++ trunk/coprop/include/coprop_parameter.php 2011-12-11 15:46:41 UTC (re= v 207) @@ -0,0 +1,29 @@ + Added: trunk/coprop/include/key.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/key.inc.php (rev 0) +++ trunk/coprop/include/key.inc.php 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,75 @@ +get_array($sql); +?> + + + + + + + + + + + + + + + +
+ Nom + + Note + + Date d=C3=A9but + + Date Fin +
+ + + + + + + +
+ \ No newline at end of file Added: trunk/coprop/include/lot.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/lot.inc.php (rev 0) +++ trunk/coprop/include/lot.inc.php 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,66 @@ +label=3D_('Cr=C3=A9er une nouvelle fiche'); +$f_add_button->set_attribute('ipopup','ipop_newcard'); +$f_add_button->set_attribute('jrn',-1); +$filter=3D$g_copro_parameter->categorie_lot.",".$g_copro_parameter->cate= gorie_coprop; +$f_add_button->javascript=3D" this.filter=3D'$filter';this.jrn=3D-1;sele= ct_card_type(this);"; + + +/* + * Liste + */ +$sql=3D" select jcl_id, + jcl_copro, + (select ad_value from fiche_detail where f_id=3Djcl_copro and ad_id=3D1= ) as coprop_name, + (select ad_value from fiche_detail where f_id=3Djcl_copro and ad_id=3D2= 3) as coprop_qcode + from + coprop.jnt_coprop_lot + "; +/** + * @todo ajouter tri + */ +$a_copro=3D$cn->get_array($sql); + +$sql_lot=3D$cn->prepare ("lot","select jcl_lot, (select ad_value from fi= che_detail where f_id=3Djcl_lot and ad_id=3D1) as lot_name, + (select ad_value from fiche_detail where f_id=3Djcl_lot and ad_id=3D23)= as lot_qcode from coprop.jnt_coprop_lot where jcl_id=3D$1"); + +echo $f_add_button->input(); +require_once 'template/list_copro_lot.php'; +echo $f_add_button->input(); +/** + * @todo + * Bouton pour ajouter une fiche de lot ou copro (comme dans menu ach/ve= n...) + */ + +?> Added: trunk/coprop/include/template/appel_fond.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/appel_fond.php = (rev 0) +++ trunk/coprop/include/template/appel_fond.php 2011-12-11 15:46:41 UTC = (rev 207) @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Journal pour l'appel de fond + input()?> +
+ Date de l'op=C3=A9ration + + input()?> +
+ Montant =C3=A0 r=C3=A9partir + + input()?> +
+ Poste comptable pour l'appel de fond + + input()?> +
+ Clef de r=C3=A9partiton =C3=A0 utiliser + + input()?> +
\ No newline at end of file Added: trunk/coprop/include/template/list_copro_lot.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/list_copro_lot.php = (rev 0) +++ trunk/coprop/include/template/list_copro_lot.php 2011-12-11 15:46:41 = UTC (rev 207) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + +
Nom copropri=C3=A9taire + Lot(s) +
+ execute('lot',$a_copro[$i]['jcl_id']); + $max=3DDatabase::num_row($rlot); + $sp=3D""; + for ($e=3D0;$e<$max;$e++): + $row=3DDatabase::fetch_array($rlot,$e); + $js_lot=3DHtmlInput::card_detail($row['lot_qcode'],$row['lot_name'])= ; + echo $js_lot.$sp; + $sp=3D" , "; + endfor; + ?> + +
+ \ No newline at end of file Added: trunk/coprop/index.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/index.php (rev 0) +++ trunk/coprop/index.php 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,119 @@ +exist_schema('coprop') =3D=3D false) + { + require_once('include/class_install_plugin.php'); + + $iplugn=3Dnew Install_Plugin($cn); + $iplugn->install(); + echo_warning(_("L'extension est install=C3=A9e, pourriez-vous en v=C3= =A9rifier le param=C3=A8trage ?")); + // Affiche param=C3=A8tre + $def=3D4; + } +require_once('coprop-constant.php'); +// show menu +echo '
Aide'. +'vers:SVNINFO'. +'
'; + +echo ShowItem($array,'H','mtitle ','mtitle ',$def,' class=3D"topmenu"'); + +// include the right file +/* + * Lot + */ +if ($def=3D=3D1) + { + require_once('include/lot.inc.php'); + exit(); + } + +/* + * Param=C3=A8tre + */ +if ($def=3D=3D4) + { + require_once('include/copro-parameter.inc.php'); + exit(); + } +/* + * Clef + */ +if ($def=3D=3D2) + { + require_once('include/key.inc.php'); + exit(); + } +/* + * Appel de fond + */ +if ($def=3D=3D3) + { + require_once('include/appel_fond.inc.php'); + exit(); + } + +?> Added: trunk/coprop/raw.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/raw.php (rev 0) +++ trunk/coprop/raw.php 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,44 @@ +setDossierInfo(dossier::id()); + $a->AliasNbPages('{nb}'); + $a->AddPage(); + $a->export(); + exit(); + } +*/ +?> Added: trunk/coprop/sql/trunk_dev.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/sql/trunk_dev.sql (rev 0) +++ trunk/coprop/sql/trunk_dev.sql 2011-12-11 15:46:41 UTC (rev 207) @@ -0,0 +1,352 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 9.0.4 +-- Dumped by pg_dump version 9.0.4 +-- Started on 2011-12-11 16:40:35 CET + +SET statement_timeout =3D 0; +SET client_encoding =3D 'UTF8'; +SET standard_conforming_strings =3D off; +SET check_function_bodies =3D false; +SET client_min_messages =3D warning; +SET escape_string_warning =3D off; + +-- +-- TOC entry 8 (class 2615 OID 7283076) +-- Name: coprop; Type: SCHEMA; Schema: -; Owner: dany +-- + +CREATE SCHEMA coprop; + + +ALTER SCHEMA coprop OWNER TO dany; + +SET search_path =3D coprop, pg_catalog; + +SET default_tablespace =3D ''; + +SET default_with_oids =3D false; + +-- +-- TOC entry 2087 (class 1259 OID 7283087) +-- Dependencies: 8 +-- Name: clef_repartition; Type: TABLE; Schema: coprop; Owner: dany; Tab= lespace:=20 +-- + +CREATE TABLE clef_repartition ( + cr_id integer NOT NULL, + cr_name text NOT NULL, + cr_note text, + cr_start date, + cr_end date +); + + +ALTER TABLE coprop.clef_repartition OWNER TO dany; + +-- +-- TOC entry 2086 (class 1259 OID 7283085) +-- Dependencies: 2087 8 +-- Name: clef_repartition_cr_id_seq; Type: SEQUENCE; Schema: coprop; Own= er: dany +-- + +CREATE SEQUENCE clef_repartition_cr_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE coprop.clef_repartition_cr_id_seq OWNER TO dany; + +-- +-- TOC entry 2399 (class 0 OID 0) +-- Dependencies: 2086 +-- Name: clef_repartition_cr_id_seq; Type: SEQUENCE OWNED BY; Schema: co= prop; Owner: dany +-- + +ALTER SEQUENCE clef_repartition_cr_id_seq OWNED BY clef_repartition.cr_i= d; + + +-- +-- TOC entry 2400 (class 0 OID 0) +-- Dependencies: 2086 +-- Name: clef_repartition_cr_id_seq; Type: SEQUENCE SET; Schema: coprop;= Owner: dany +-- + +SELECT pg_catalog.setval('clef_repartition_cr_id_seq', 1, false); + + +-- +-- TOC entry 2089 (class 1259 OID 7283136) +-- Dependencies: 2379 8 +-- Name: clef_repartition_detail; Type: TABLE; Schema: coprop; Owner: da= ny; Tablespace:=20 +-- + +CREATE TABLE clef_repartition_detail ( + crd_id integer NOT NULL, + crd_lot bigint, + crd_amount numeric(20,4) DEFAULT 0, + cr_id bigint +); + + +ALTER TABLE coprop.clef_repartition_detail OWNER TO dany; + +-- +-- TOC entry 2088 (class 1259 OID 7283134) +-- Dependencies: 8 2089 +-- Name: clef_repartition_detail_crd_id_seq; Type: SEQUENCE; Schema: cop= rop; Owner: dany +-- + +CREATE SEQUENCE clef_repartition_detail_crd_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE coprop.clef_repartition_detail_crd_id_seq OWNER TO dany; + +-- +-- TOC entry 2401 (class 0 OID 0) +-- Dependencies: 2088 +-- Name: clef_repartition_detail_crd_id_seq; Type: SEQUENCE OWNED BY; Sc= hema: coprop; Owner: dany +-- + +ALTER SEQUENCE clef_repartition_detail_crd_id_seq OWNED BY clef_repartit= ion_detail.crd_id; + + +-- +-- TOC entry 2402 (class 0 OID 0) +-- Dependencies: 2088 +-- Name: clef_repartition_detail_crd_id_seq; Type: SEQUENCE SET; Schema:= coprop; Owner: dany +-- + +SELECT pg_catalog.setval('clef_repartition_detail_crd_id_seq', 1, false)= ; + + +-- +-- TOC entry 2091 (class 1259 OID 7283155) +-- Dependencies: 8 +-- Name: jnt_coprop_lot; Type: TABLE; Schema: coprop; Owner: dany; Table= space:=20 +-- + +CREATE TABLE jnt_coprop_lot ( + jcl_id integer NOT NULL, + jcl_copro bigint, + jcl_lot bigint +); + + +ALTER TABLE coprop.jnt_coprop_lot OWNER TO dany; + +-- +-- TOC entry 2090 (class 1259 OID 7283153) +-- Dependencies: 8 2091 +-- Name: jnt_coprop_lot_jlc_id_seq; Type: SEQUENCE; Schema: coprop; Owne= r: dany +-- + +CREATE SEQUENCE jnt_coprop_lot_jlc_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE coprop.jnt_coprop_lot_jlc_id_seq OWNER TO dany; + +-- +-- TOC entry 2403 (class 0 OID 0) +-- Dependencies: 2090 +-- Name: jnt_coprop_lot_jlc_id_seq; Type: SEQUENCE OWNED BY; Schema: cop= rop; Owner: dany +-- + +ALTER SEQUENCE jnt_coprop_lot_jlc_id_seq OWNED BY jnt_coprop_lot.jcl_id; + + +-- +-- TOC entry 2404 (class 0 OID 0) +-- Dependencies: 2090 +-- Name: jnt_coprop_lot_jlc_id_seq; Type: SEQUENCE SET; Schema: coprop; = Owner: dany +-- + +SELECT pg_catalog.setval('jnt_coprop_lot_jlc_id_seq', 1, false); + + +-- +-- TOC entry 2085 (class 1259 OID 7283077) +-- Dependencies: 8 +-- Name: parameter; Type: TABLE; Schema: coprop; Owner: dany; Tablespace= :=20 +-- + +CREATE TABLE parameter ( + pr_id text NOT NULL, + pr_value text +); + + +ALTER TABLE coprop.parameter OWNER TO dany; + +-- +-- TOC entry 2377 (class 2604 OID 7283090) +-- Dependencies: 2086 2087 2087 +-- Name: cr_id; Type: DEFAULT; Schema: coprop; Owner: dany +-- + +ALTER TABLE clef_repartition ALTER COLUMN cr_id SET DEFAULT nextval('cle= f_repartition_cr_id_seq'::regclass); + + +-- +-- TOC entry 2378 (class 2604 OID 7283139) +-- Dependencies: 2088 2089 2089 +-- Name: crd_id; Type: DEFAULT; Schema: coprop; Owner: dany +-- + +ALTER TABLE clef_repartition_detail ALTER COLUMN crd_id SET DEFAULT next= val('clef_repartition_detail_crd_id_seq'::regclass); + + +-- +-- TOC entry 2380 (class 2604 OID 7283158) +-- Dependencies: 2090 2091 2091 +-- Name: jcl_id; Type: DEFAULT; Schema: coprop; Owner: dany +-- + +ALTER TABLE jnt_coprop_lot ALTER COLUMN jcl_id SET DEFAULT nextval('jnt_= coprop_lot_jlc_id_seq'::regclass); + + +-- +-- TOC entry 2394 (class 0 OID 7283087) +-- Dependencies: 2087 +-- Data for Name: clef_repartition; Type: TABLE DATA; Schema: coprop; Ow= ner: dany +-- + +COPY clef_repartition (cr_id, cr_name, cr_note, cr_start, cr_end) FROM s= tdin; +\. + + +-- +-- TOC entry 2395 (class 0 OID 7283136) +-- Dependencies: 2089 +-- Data for Name: clef_repartition_detail; Type: TABLE DATA; Schema: cop= rop; Owner: dany +-- + +COPY clef_repartition_detail (crd_id, crd_lot, crd_amount, cr_id) FROM s= tdin; +\. + + +-- +-- TOC entry 2396 (class 0 OID 7283155) +-- Dependencies: 2091 +-- Data for Name: jnt_coprop_lot; Type: TABLE DATA; Schema: coprop; Owne= r: dany +-- + +COPY jnt_coprop_lot (jcl_id, jcl_copro, jcl_lot) FROM stdin; +\. + + +-- +-- TOC entry 2393 (class 0 OID 7283077) +-- Dependencies: 2085 +-- Data for Name: parameter; Type: TABLE DATA; Schema: coprop; Owner: da= ny +-- + +COPY parameter (pr_id, pr_value) FROM stdin; +categorie_lot 1 +categorie_coprop 2 +poste_appel 740 +journal_appel 4 +\. + + +-- +-- TOC entry 2386 (class 2606 OID 7283142) +-- Dependencies: 2089 2089 +-- Name: clef_repartition_detail_pkey; Type: CONSTRAINT; Schema: coprop;= Owner: dany; Tablespace:=20 +-- + +ALTER TABLE ONLY clef_repartition_detail + ADD CONSTRAINT clef_repartition_detail_pkey PRIMARY KEY (crd_id); + + +-- +-- TOC entry 2384 (class 2606 OID 7283095) +-- Dependencies: 2087 2087 +-- Name: clef_repartition_pkey; Type: CONSTRAINT; Schema: coprop; Owner:= dany; Tablespace:=20 +-- + +ALTER TABLE ONLY clef_repartition + ADD CONSTRAINT clef_repartition_pkey PRIMARY KEY (cr_id); + + +-- +-- TOC entry 2382 (class 2606 OID 7283084) +-- Dependencies: 2085 2085 +-- Name: copro_parameter_pkey; Type: CONSTRAINT; Schema: coprop; Owner: = dany; Tablespace:=20 +-- + +ALTER TABLE ONLY parameter + ADD CONSTRAINT copro_parameter_pkey PRIMARY KEY (pr_id); + + +-- +-- TOC entry 2388 (class 2606 OID 7283160) +-- Dependencies: 2091 2091 +-- Name: jnt_coprop_lot_pkey; Type: CONSTRAINT; Schema: coprop; Owner: d= any; Tablespace:=20 +-- + +ALTER TABLE ONLY jnt_coprop_lot + ADD CONSTRAINT jnt_coprop_lot_pkey PRIMARY KEY (jcl_id); + + +-- +-- TOC entry 2390 (class 2606 OID 7283148) +-- Dependencies: 2089 2087 2383 +-- Name: clef_repartition_detail_cr_id_fkey; Type: FK CONSTRAINT; Schema= : coprop; Owner: dany +-- + +ALTER TABLE ONLY clef_repartition_detail + ADD CONSTRAINT clef_repartition_detail_cr_id_fkey FOREIGN KEY (cr_id= ) REFERENCES clef_repartition(cr_id) ON UPDATE CASCADE ON DELETE CASCADE; + + +-- +-- TOC entry 2389 (class 2606 OID 7283143) +-- Dependencies: 2089 1947 +-- Name: clef_repartition_detail_crl_lot_fkey; Type: FK CONSTRAINT; Sche= ma: coprop; Owner: dany +-- + +ALTER TABLE ONLY clef_repartition_detail + ADD CONSTRAINT clef_repartition_detail_crl_lot_fkey FOREIGN KEY (crd= _lot) REFERENCES public.fiche(f_id) ON UPDATE CASCADE ON DELETE CASCADE; + + +-- +-- TOC entry 2391 (class 2606 OID 7283161) +-- Dependencies: 1947 2091 +-- Name: jnt_coprop_lot_jcl_copro_fkey; Type: FK CONSTRAINT; Schema: cop= rop; Owner: dany +-- + +ALTER TABLE ONLY jnt_coprop_lot + ADD CONSTRAINT jnt_coprop_lot_jcl_copro_fkey FOREIGN KEY (jcl_copro)= REFERENCES public.fiche(f_id) ON UPDATE CASCADE ON DELETE CASCADE; + + +-- +-- TOC entry 2392 (class 2606 OID 7283166) +-- Dependencies: 1947 2091 +-- Name: jnt_coprop_lot_jcl_lot_fkey; Type: FK CONSTRAINT; Schema: copro= p; Owner: dany +-- + +ALTER TABLE ONLY jnt_coprop_lot + ADD CONSTRAINT jnt_coprop_lot_jcl_lot_fkey FOREIGN KEY (jcl_lot) REF= ERENCES public.fiche(f_id) ON UPDATE CASCADE ON DELETE CASCADE; + + +-- Completed on 2011-12-11 16:40:35 CET + +-- +-- PostgreSQL database dump complete +-- + Modified: trunk/skel/index.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/skel/index.php 2011-12-04 05:36:15 UTC (rev 206) +++ trunk/skel/index.php 2011-12-11 15:46:41 UTC (rev 207) @@ -33,7 +33,8 @@ ob_clean(); echo create_script($j); =20 -$url=3D'?'.dossier::get().'&code=3Dtva'; +$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&a= c=3D'.$_REQUEST['ac']; + $array=3Darray ( array($url.'&sa=3Ddec',_('D=C3=A9claration TVA'),_('D=C3=A9clar= ation Trimestriel ou annuel de TVA'),1), array($url.'&sa=3Dli',_('Listing intracommunautaire'),_('Listin= g intracommunautaire trimestriel'),2), Modified: trunk/skel/skel_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 --- trunk/skel/skel_constant.php 2011-12-04 05:36:15 UTC (rev 206) +++ trunk/skel/skel_constant.php 2011-12-11 15:46:41 UTC (rev 207) @@ -8,7 +8,9 @@ */ =20 require_once ('class_database.php'); +require_once 'include/class_SKEL_parameter.php'); =20 -global $cn; +global $cn,$g_SKEL_parameter; $cn=3Dnew Database (dossier::id()); +$g_SKEL_parameter=3Dnew SKEL_Parameter(); ?> \ No newline at end of file From MAILER-DAEMON Sun Dec 11 10:43:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZlYZ-0000vH-Ba for mharc-phpcompta-dev@gnu.org; Sun, 11 Dec 2011 10:43:15 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 11 Dec 2011 16:47:10 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r208 - trunk/skel/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, 11 Dec 2011 15:43:13 -0000 Author: danydb Date: 2011-12-11 16:47:09 +0100 (Sun, 11 Dec 2011) New Revision: 208 Added: trunk/skel/include/class_skel_parameter.php Modified: trunk/skel/include/class_install_plugin.php Log: improve skeleton Modified: trunk/skel/include/class_install_plugin.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/skel/include/class_install_plugin.php 2011-12-11 15:46:41 UTC (= rev 207) +++ trunk/skel/include/class_install_plugin.php 2011-12-11 15:47:09 UTC (= rev 208) @@ -1,4 +1,5 @@ cn=3D$p_cn; - } + function __construct($p_cn) + { + $this->cn =3D $p_cn; + } =20 - /** - *@brief install the plugin, create all the needed schema, tables, pro= c - * in the database - *@param $p_dossier is the dossier id - */ - function install() { - $this->cn->start(); - // create the schema - $this->create_schema(); - // create table + put default values - $this->create_table_parameter(); - $this->create_table_declaration_amount(); - $this->create_table_intra(); - $this->create_table_intra_child(); - $this->create_table_assujetti(); - $this->create_table_assujetti_child(); + /** + * @brief install the plugin, create all the needed schema, tables, pro= c + * in the database + * @param $p_dossier is the dossier id + */ + function install() + { + $this->cn->start(); + // create the schema + $this->create_schema(); + // create table + put default values + $this->create_table_parameter(); + $this->cn->commit(); + } =20 - $this->cn->commit(); - } - function create_schema() { - $this->cn->exec_sql('create schema tva_belge'); - } - function create_table_assujetti() { - $sql=3D" -CREATE TABLE tva_belge.assujetti -( - a_id serial NOT NULL, - start_date date NOT NULL, - end_date date NOT NULL, - xml_oid oid, - periodicity character(1) NOT NULL, - tva_name text, - num_tva text, - adress text, - country text, - date_decl date DEFAULT now(), - periode_dec integer, - CONSTRAINT assujetti_pk PRIMARY KEY (a_id) -) -"; - $this->cn->exec_sql($sql); - } - function create_table_assujetti_child() { - $sql=3D" -CREATE TABLE tva_belge.assujetti_chld -( - ac_id serial NOT NULL, - a_id bigint, - ac_tvanum text NOT NULL, - ac_amount numeric(20,4) NOT NULL, - ac_vat numeric(20,4) NOT NULL, - ac_periode character varying(6) NOT NULL, - ac_qcode text NOT NULL, - ac_name text NOT NULL, - CONSTRAINT assujetti_chld_pk PRIMARY KEY (ac_id), - CONSTRAINT assujetti_fk FOREIGN KEY (a_id) - REFERENCES tva_belge.assujetti (a_id) MATCH SIMPLE - ON UPDATE NO ACTION ON DELETE CASCADE -) -"; - $this->cn->exec_sql($sql); - } - function create_table_intra() { - $sql=3D<<cn->exec_sql('create schema SKEL'); + } =20 -CREATE TABLE tva_belge.intracomm + function create_table_parameter() + { + $sql =3D <<cn->exec_sql($sql); - } - function create_table_intra_child() { -$sql=3D<<cn->exec_sql($sql); - } - /** - *@brief create the table tva_belge.declaration_amount - */ - function create_table_declaration_amount() { - $sql=3D<<cn->exec_sql($sql); - - } - function create_table_parameter() { -$sql=3D<<cn->exec_sql($sql); + $this->cn->exec_sql($sql); // load default value -$array=3Darray( - 'GRIL00'=3D>array('6',''), - 'GRIL01'=3D>array('3',''), - 'GRIL02'=3D>array('2',''), - 'GRIL03'=3D>array('1',''), - 'GRIL44'=3D>array('',''), - 'GRIL45'=3D>array('',''), - 'GRIL46'=3D>array('5','70%,71%'), - 'GRIL47'=3D>array('',''), - 'GRIL48'=3D>array('','7091'), - 'GRIL49'=3D>array('','7092'), - 'GRIL81'=3D>array('1,2,3','60%'), - 'GRIL82'=3D>array('1,2,3','61%'), - 'GRIL83'=3D>array('1,2,3','22%,23%,24%,25%'), - 'GRIL84'=3D>array('1,2,3,4','6091'), - 'GRIL85'=3D>array('',''), - 'GRIL86'=3D>array('5','61%,22%,23%,24%,25%,60%'), - 'GRIL87'=3D>array('',''), - 'GRIL88'=3D>array('',''), - 'GRIL54'=3D>array('1,2,3','7%'), - 'GRIL55'=3D>array('',''), - 'GRIL56'=3D>array('',''), - 'GRIL57'=3D>array('',''), - 'GRIL61'=3D>array('',''), - 'GRIL63'=3D>array('',''), - 'GRIL59'=3D>array('1,2,3','6%,22%,23%,24%,25%'), - 'GRIL62'=3D>array('',''), - 'GRIL64'=3D>array('',''), - 'ATVA'=3D>array('4117','') - ); + $array =3D array( + 'GRIL00' =3D> array('6'), + 'GRIL01' =3D> array('3'), + 'GRIL02' =3D> array('2', ''), =20 -foreach ($array as $code=3D>$value) { - $this->cn->exec_sql('insert into tva_belge.parameter(pcode,pvalue,pacc= ount) values ($1,$2,$3)', - array($code,$value[0],$value[1])); - } + ); + + foreach ($array as $code =3D> $value) + { + $this->cn->exec_sql('insert into SKEL.parameter(pr_id,pr_value,pr_oth= er) values ($1,$2)', array($code, $value[0])); + } + } + } -} + Added: trunk/skel/include/class_skel_parameter.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/skel/include/class_skel_parameter.php (= rev 0) +++ trunk/skel/include/class_skel_parameter.php 2011-12-11 15:47:09 UTC (= rev 208) @@ -0,0 +1,75 @@ +db=3D$p_cn; + $Res=3D$p_cn->exec_sql("select * from SKEL.parameter "); + for ($i =3D 0;$i < Database::num_row($Res);$i++) + { + $row=3DDatabase::fetch_array($Res,$i); + $key=3D$row['pr_id']; + $elt=3D$row['pr_value']; + =20 + // store value here + $this->{"$key"}=3D$elt; + } + + } + /*! + ************************************************** + * \brief save the parameter into the database by inserting or upda= ting + * + * + * \param $p_attr give the attribut name + * + */ + function save($p_option,$p_value) + { + global $cn; + // check if the parameter does exist + if ( $this->cn->get_value('select count(*) from SKEL.parameter w= here pr_id=3D$1',array($p_option)) !=3D 0 ) + { + $Res=3D$this->cn->exec_sql("update SKEL.parameter set pr_val= ue=3D$1 where pr_id=3D$2", + array($p_value,$p_option)); + } + else + { + + $Res=3D$this->cn->exec_sql("insert into SKEL.parameter (pr_i= d,pr_value) values( $1,$2)", + array($p_option,$p_value)); + + } + + } + +} +?> From MAILER-DAEMON Sun Dec 11 11:19:44 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZm7s-0006Ct-Fe for mharc-phpcompta-dev@gnu.org; Sun, 11 Dec 2011 11:19:44 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 11 Dec 2011 17:23:39 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4597 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Dec 2011 16:19:42 -0000 Author: danydb Date: 2011-12-11 17:23:38 +0100 (Sun, 11 Dec 2011) New Revision: 4597 Modified: phpcompta/trunk/include/class_lettering.php Log: automatic lettering Modified: phpcompta/trunk/include/class_lettering.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_lettering.php 2011-12-09 22:56:32 UTC (= rev 4596) +++ phpcompta/trunk/include/class_lettering.php 2011-12-11 16:23:38 UTC (= rev 4597) @@ -98,16 +98,55 @@ left outer join letter_cred using (jl_id) where letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1"; - + $let1=3D0;$let2=3D0; $already=3D$this->db->get_array($sql_already,array($j_id1)); - if ( count ($already ) > 0) return; + if ( count ($already ) > 0) { + if ( count($already)=3D=3D1) { + // retrieve the letter + $let1=3D$this->db->get_value("select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1",array($j_id1)= ); + }else + { + return; + } + } =20 $already=3D$this->db->get_array($sql_already,array($j_id2)); - if ( count ($already ) > 0) return; + if ( count ($already ) > 0) { + if ( count($already)=3D=3D1) { + // retrieve the letter + $let2=3D$this->db->get_value("select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1",array($j_id2)= ); + }else { + return; + } + } + $jl_id=3D0; + // already linked together + if ( $let1 !=3D 0 && $let1 =3D=3D $let2 )return; =20 - $jl_id=3D$this->db->get_next_seq("jnt_letter_jl_id_seq"); - $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', - array($jl_id)); + // already linked + if ( $let1 !=3D 0 && $let2!=3D0 && $let1 !=3D $let2 )return; + + // none is linked + if ( $let1 =3D=3D 0 && $let2=3D=3D0) + { + $jl_id=3D$this->db->get_next_seq("jnt_letter_jl_id_seq"); + $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', + array($jl_id)); + } + // one is linked but not the other + if ( $let1 =3D=3D 0 && $let2 !=3D 0 ) $jl_id=3D$let2; + if ( $let1 !=3D 0 && $let2 =3D=3D 0 ) $jl_id=3D$let1; + /* insert */ if ( $first =3D=3D 't') { From MAILER-DAEMON Sun Dec 11 15:50:19 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZqLj-0006ye-A6 for mharc-phpcompta-dev@gnu.org; Sun, 11 Dec 2011 15:50:19 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 11 Dec 2011 21:54:10 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4598 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Dec 2011 20:50:16 -0000 Author: danydb Date: 2011-12-11 21:54:08 +0100 (Sun, 11 Dec 2011) New Revision: 4598 Modified: phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/compta_ach.inc.php phpcompta/trunk/include/compta_ods.inc.php phpcompta/trunk/include/compta_ven.inc.php Log: Security ; bug can't access ODS=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 2011-12-11 16:23:38 UTC = (rev 4597) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-11 20:54:08 UTC = (rev 4598) @@ -2045,10 +2045,10 @@ *\param the type *\return the j_id */ - public function get_first($p_type) + public function get_first($p_type,$p_access=3D3) { $user=3Dnew User($this->db); - $all=3D$user->get_ledger($p_type); + $all=3D$user->get_ledger($p_type,$p_access); return $all[0]; } =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 2011-12-11 16:23:38 UTC (r= ev 4597) +++ phpcompta/trunk/include/compta_ach.inc.php 2011-12-11 20:54:08 UTC (r= ev 4598) @@ -163,7 +163,11 @@ =20 if (!isset($_REQUEST ['p_jrn'])) { - $def_ledger =3D $Ledger->get_first('ach'); + $def_ledger =3D $Ledger->get_first('ach',2); + if ( empty ($first_ledger)) + { + exit('Pas de journal disponible'); + } $Ledger->id =3D $def_ledger['jrn_def_id']; } else Modified: phpcompta/trunk/include/compta_ods.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ods.inc.php 2011-12-11 16:23:38 UTC (r= ev 4597) +++ phpcompta/trunk/include/compta_ods.inc.php 2011-12-11 20:54:08 UTC (r= ev 4598) @@ -43,6 +43,10 @@ $id =3D (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] := -1; $ledger =3D new Acc_Ledger($cn, $id); $first_ledger =3D $ledger->get_first('ODS'); +if ( empty ($first_ledger)) +{ + exit('Pas de journal disponible'); +} $ledger->id =3D ($ledger->id =3D=3D -1) ? $first_ledger['jrn_def_id'] : = $id; =20 /* !\brief show a form for quick_writing */ @@ -52,7 +56,7 @@ =20 =20 =20 -if ($g_user->check_jrn($id) =3D=3D 'X') +if ($g_user->check_jrn($ledger->id) =3D=3D 'X') { NoAccess(); exit - 1; Modified: phpcompta/trunk/include/compta_ven.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ven.inc.php 2011-12-11 16:23:38 UTC (r= ev 4597) +++ phpcompta/trunk/include/compta_ven.inc.php 2011-12-11 20:54:08 UTC (r= ev 4598) @@ -182,7 +182,11 @@ =20 if ( !isset($_REQUEST ['p_jrn']) ) { - $def_ledger=3D$Ledger->get_first('ven'); + $def_ledger=3D$Ledger->get_first('ven',2); + if (empty($first_ledger)) + { + exit('Pas de journal disponible'); + } $Ledger->id=3D$def_ledger['jrn_def_id']; } else @@ -190,7 +194,7 @@ if (isset ($_REQUEST['p_jrn_predef'])){ $Ledger->id=3D$_REQUEST['p_jrn_predef']; } -=09 + echo '
'; echo '
'; echo HtmlInput::hidden('ac',$_REQUEST['ac']); From MAILER-DAEMON Sun Dec 11 17:11:18 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RZrc6-0006uH-De for mharc-phpcompta-dev@gnu.org; Sun, 11 Dec 2011 17:11:18 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 11 Dec 2011 23:15:12 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4599 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Dec 2011 22:11:16 -0000 Author: danydb Date: 2011-12-11 23:15:10 +0100 (Sun, 11 Dec 2011) New Revision: 4599 Modified: phpcompta/trunk/include/compta_ach.inc.php phpcompta/trunk/include/compta_fin.inc.php phpcompta/trunk/include/compta_ven.inc.php Log: Security ; bug can't access VEN & ACH when global admin Modified: phpcompta/trunk/include/compta_ach.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ach.inc.php 2011-12-11 20:54:08 UTC (r= ev 4598) +++ phpcompta/trunk/include/compta_ach.inc.php 2011-12-11 22:15:10 UTC (r= ev 4599) @@ -164,7 +164,7 @@ if (!isset($_REQUEST ['p_jrn'])) { $def_ledger =3D $Ledger->get_first('ach',2); - if ( empty ($first_ledger)) + if ( empty ($def_ledger)) { exit('Pas de journal disponible'); } Modified: phpcompta/trunk/include/compta_fin.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin.inc.php 2011-12-11 20:54:08 UTC (r= ev 4598) +++ phpcompta/trunk/include/compta_fin.inc.php 2011-12-11 22:15:10 UTC (r= ev 4599) @@ -44,6 +44,10 @@ else { $def_ledger=3D$Ledger->get_first('fin'); + if ( empty ($def_ledger)) + { + exit('Pas de journal disponible'); + } $Ledger->id=3D$def_ledger['jrn_def_id']; } $jrn_priv=3D$g_user->get_ledger_access($Ledger->id); Modified: phpcompta/trunk/include/compta_ven.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ven.inc.php 2011-12-11 20:54:08 UTC (r= ev 4598) +++ phpcompta/trunk/include/compta_ven.inc.php 2011-12-11 22:15:10 UTC (r= ev 4599) @@ -183,7 +183,7 @@ if ( !isset($_REQUEST ['p_jrn']) ) { $def_ledger=3D$Ledger->get_first('ven',2); - if (empty($first_ledger)) + if (empty($def_ledger)) { exit('Pas de journal disponible'); } From MAILER-DAEMON Mon Dec 12 14:35:05 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RaBeT-0007B0-Eo for mharc-phpcompta-dev@gnu.org; Mon, 12 Dec 2011 14:35:05 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 12 Dec 2011 20:38:45 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4600 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 19:35:03 -0000 Author: danydb Date: 2011-12-12 20:38:42 +0100 (Mon, 12 Dec 2011) New Revision: 4600 Modified: phpcompta/trunk/doc/manuel-fr.odt phpcompta/trunk/doc/manuel-fr.pdf Log: update documentation Modified: phpcompta/trunk/doc/manuel-fr.odt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/doc/manuel-fr.pdf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) From MAILER-DAEMON Mon Dec 12 14:36:41 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RaBg1-0008QK-1H for mharc-phpcompta-dev@gnu.org; Mon, 12 Dec 2011 14:36:41 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 12 Dec 2011 20:40:33 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4601 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 19:36:39 -0000 Author: danydb Date: 2011-12-12 20:40:31 +0100 (Mon, 12 Dec 2011) New Revision: 4601 Modified: phpcompta/trunk/doc/manuel-fr.odt phpcompta/trunk/doc/manuel-fr.pdf Log: update index Modified: phpcompta/trunk/doc/manuel-fr.odt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/doc/manuel-fr.pdf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) From MAILER-DAEMON Mon Dec 12 14:39:20 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RaBia-0008Uv-8l for mharc-phpcompta-dev@gnu.org; Mon, 12 Dec 2011 14:39:20 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 12 Dec 2011 20:43:10 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4602 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 19:39:18 -0000 Author: danydb Date: 2011-12-12 20:43:10 +0100 (Mon, 12 Dec 2011) New Revision: 4602 Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php Log: souligne le n?\194?\176 interne dans rapprochement Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 19:40:31 UTC (rev 4601) +++ phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 19:43:10 UTC (rev 4602) @@ -29,7 +29,7 @@ $remove=3D$rmReconciliation->input(); else $remove=3D''; - echo tr (td(''.= $internal.'').td($amount).td($array_jr[0]['jr_comment']).td($remove))= ; + echo tr (td(''.$internal.'').td($amount).td($array_jr[0]['jr_comment']= ).td($remove)); } echo ''; } From MAILER-DAEMON Mon Dec 12 14:49:51 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RaBsl-0001Yc-IS for mharc-phpcompta-dev@gnu.org; Mon, 12 Dec 2011 14:49:51 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 12 Dec 2011 20:53:42 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4603 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 19:49:49 -0000 Author: danydb Date: 2011-12-12 20:53:41 +0100 (Mon, 12 Dec 2011) New Revision: 4603 Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php Log: Montant avec 2 d?\195?\169cimales dans rapprochement Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 19:43:10 UTC (rev 4602) +++ phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 19:53:41 UTC (rev 4603) @@ -29,7 +29,7 @@ $remove=3D$rmReconciliation->input(); else $remove=3D''; - echo tr (td(''.$internal.'').td($amount).td($array_jr[0]['jr_comment']= ).td($remove)); + echo tr (td(''.$internal.'').td(nbm($amount)).td($array_jr[0]['jr_comm= ent']).td($remove)); } echo ''; } From MAILER-DAEMON Mon Dec 12 14:53:17 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RaBw5-00028r-Ro for mharc-phpcompta-dev@gnu.org; Mon, 12 Dec 2011 14:53:17 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 12 Dec 2011 20:57:09 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4604 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 19:53:15 -0000 Author: danydb Date: 2011-12-12 20:57:07 +0100 (Mon, 12 Dec 2011) New Revision: 4604 Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php Log: prot?\195?\168ge texte Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 19:53:41 UTC (rev 4603) +++ phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 19:57:07 UTC (rev 4604) @@ -29,7 +29,7 @@ $remove=3D$rmReconciliation->input(); else $remove=3D''; - echo tr (td(''.$internal.'').td(nbm($amount)).td($array_jr[0]['jr_comm= ent']).td($remove)); + echo tr (td(''.$internal.'').td(nbm($amount)).td(h($array_jr[0]['jr_co= mment'])).td($remove)); } echo ''; } From MAILER-DAEMON Mon Dec 12 15:15:33 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RaCHd-0007PR-2d for mharc-phpcompta-dev@gnu.org; Mon, 12 Dec 2011 15:15:33 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 12 Dec 2011 21:19:22 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4605 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 20:15:31 -0000 Author: danydb Date: 2011-12-12 21:19:20 +0100 (Mon, 12 Dec 2011) New Revision: 4605 Modified: phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_bottom.php phpcompta/trunk/include/template/ledger_detail_fin.php phpcompta/trunk/include/template/ledger_detail_misc.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: Security ; bug javascript attack in detail operations Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-12 19:= 57:07 UTC (rev 4604) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-12 20:= 19:20 UTC (rev 4605) @@ -47,7 +47,7 @@ value=3D$obj->det->jr_pj_number; + $itext->value=3Dstrip_tags($obj->det->jr_pj_number); echo td(_('Pi=C3=A8ce')).td($itext->input()); ?> @@ -55,7 +55,7 @@ value=3D$obj->det->jr_comment; + $itext->value=3Dstrip_tags($obj->det->jr_comment); $itext->size=3D40; echo td(_('Libell=C3=A9')).td($itext->input(),' colspan=3D"2" '); =20 @@ -87,7 +87,7 @@ $inote=3Dnew ITextarea('jrn_note'); $inote->width=3D25; $inote->heigh=3D5; - $inote->value=3D$obj->det->note; + $inote->value=3Dstrip_tags($obj->det->note); echo $inote->input(); ?> =20 Modified: phpcompta/trunk/include/template/ledger_detail_bottom.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 19:57:07 UTC (rev 4604) +++ phpcompta/trunk/include/template/ledger_detail_bottom.php 2011-12-12 = 20:19:20 UTC (rev 4605) @@ -29,7 +29,8 @@ $remove=3D$rmReconciliation->input(); else $remove=3D''; - echo tr (td(''.$internal.'').td(nbm($amount)).td(h($array_jr[0]['jr_co= mment'])).td($remove)); + $comment=3Dstrip_tags($array_jr[0]['jr_comment']); + echo tr (td(''.$internal.'').td(nbm($amount)).td($comment).td($remove)= ); } echo ''; } 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 2011-12-12 19:= 57:07 UTC (rev 4604) +++ phpcompta/trunk/include/template/ledger_detail_fin.php 2011-12-12 20:= 19:20 UTC (rev 4605) @@ -19,7 +19,7 @@ $date=3Dnew IDate('p_date'); $date->value=3Dformat_date($obj->det->jr_date); echo td('Date').td($date->input()); -=20 + ?> =20 @@ -35,7 +35,7 @@ det->array[0]['qf_other']); $view_history=3D sprintf('%s', $bk->id, $gDossier, $bk->get_quick_code()); @@ -45,9 +45,9 @@ =20 -value=3D$obj->det->jr_comment; + $itext->value=3Dstrip_tags($obj->det->jr_comment); $itext->size=3D40; echo td(_('Libell=C3=A9')).td($itext->input()); =20 @@ -55,12 +55,12 @@ ?> -det->array[0]['qf_amount'],' class=3D"inu= m"');?> +det->array[0]['qf_amount']),' class=3D= "inum"');?> -value=3D$obj->det->jr_pj_number; +$itext->value=3Dstrip_tags($obj->det->jr_pj_number); echo td(_('Pi=C3=A8ce')).td($itext->input()); ?> =20 @@ -78,7 +78,7 @@ $inote=3Dnew ITextarea('jrn_note'); $inote->width=3D25; $inote->heigh=3D5; -$inote->value=3D$obj->det->note; +$inote->value=3Dstrip_tags($obj->det->note); echo $inote->input(); ?> =20 @@ -93,7 +93,7 @@
-jr_id); $detail->get(); ?> @@ -133,7 +133,7 @@ $view_history=3D''; $row.=3Dtd($view_history); if ( $q[$e]['j_qcode'] !=3D'') { - // nom de la fiche=20 + // nom de la fiche $ff=3Dnew Fiche($cn); $ff->get_by_qcode( $q[$e]['j_qcode']); $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME))); @@ -149,13 +149,13 @@ if ( $owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'popup') { $poste=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT); - if ( preg_match('/^(6|7)/',$q[$e]['j_poste']))=20 + if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) { $anc_op=3Dnew Anc_Operation($cn); $anc_op->j_id=3D$q[$e]['j_id']; $row.=3D HtmlInput::hidden('op[]',$anc_op->j_id); $row.=3D$anc_op->display_table(1,$q[$e]['j_montant'],$div); -=09 + } else { $row.=3Dtd(''); } Modified: phpcompta/trunk/include/template/ledger_detail_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-12 19= :57:07 UTC (rev 4604) +++ phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-12 20= :19:20 UTC (rev 4605) @@ -30,7 +30,7 @@ value=3D$obj->det->jr_comment; + $itext->value=3Dstrip_tags($obj->det->jr_comment); $itext->size=3D40; echo td(_('Libell=C3=A9')).td($itext->input()); =20 @@ -43,7 +43,7 @@ value=3D$obj->det->jr_pj_number; + $itext->value=3Dstrip_tags($obj->det->jr_pj_number); echo td(_('Pi=C3=A8ce')).td($itext->input()); ?> =20 @@ -61,7 +61,7 @@ $inote=3Dnew ITextarea('jrn_note'); $inote->width=3D25; $inote->heigh=3D5; - $inote->value=3D$obj->det->note; + $inote->value=3Dstrip_tags($obj->det->note); echo $inote->input(); ?> =20 Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-12 19:= 57:07 UTC (rev 4604) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-12 20:= 19:20 UTC (rev 4605) @@ -47,7 +47,7 @@ value=3D$obj->det->jr_pj_number; + $itext->value=3Dstrip_tags($obj->det->jr_pj_number); echo td(_('Pi=C3=A8ce')).td($itext->input()); ?> @@ -55,7 +55,7 @@ value=3D$obj->det->jr_comment; + $itext->value=3Dstrip_tags($obj->det->jr_comment); $itext->size=3D40; echo td(_('Libell=C3=A9')).td($itext->input(),' colspan=3D"2" '); =20 @@ -88,7 +88,7 @@ $inote=3Dnew ITextarea('jrn_note'); $inote->width=3D25; $inote->heigh=3D5; - $inote->value=3D$obj->det->note; + $inote->value=3Dstrip_tags($obj->det->note); echo $inote->input(); ?> =20 @@ -154,9 +154,9 @@ } =20 $row.=3Dtd($sym_tva,'style=3D"text-align:center"'); - =20 + $htva=3D$q['qs_price']; - =20 + $row.=3Dtd(nbm($htva),'class=3D"num"'); $tvac=3Dbcadd($htva,$q['qs_vat']); if ($owner->MY_TVA_USE=3D=3D'Y') From MAILER-DAEMON Wed Dec 14 21:54:49 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rb1T7-0007V1-Hk for mharc-phpcompta-dev@gnu.org; Wed, 14 Dec 2011 21:54:49 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 03:58:25 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4606 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 02:54:48 -0000 Author: danydb Date: 2011-12-15 03:58:23 +0100 (Thu, 15 Dec 2011) New Revision: 4606 Modified: phpcompta/trunk/include/class_acc_reconciliation.php Log: small bug : let duplicate reconciliation Modified: phpcompta/trunk/include/class_acc_reconciliation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_reconciliation.php 2011-12-12 20:19= :20 UTC (rev 4605) +++ phpcompta/trunk/include/class_acc_reconciliation.php 2011-12-15 02:58= :23 UTC (rev 4606) @@ -113,7 +113,7 @@ "select jra_id from jrn_rapt where jra_concerned=3D"= .$this->jr_id. " and jr_id=3D$jr_id2 union - select jra_id from jrn_rapt where jra_id=3D".$this->= jr_id. + select jra_id from jrn_rapt where jr_id=3D".$this->j= r_id. " and jra_concerned=3D$jr_id2 ") =3D=3D0) { From MAILER-DAEMON Thu Dec 15 08:05:53 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbB0T-0004Yu-L0 for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 08:05:53 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 14:09:20 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4607 - in phpcompta/trunk: html/js include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 13:05:51 -0000 Author: danydb Date: 2011-12-15 14:09:18 +0100 (Thu, 15 Dec 2011) New Revision: 4607 Modified: phpcompta/trunk/html/js/scripts.js phpcompta/trunk/include/constant.php phpcompta/trunk/include/search.inc.php Log: IE8 Bug with form submit Modified: phpcompta/trunk/html/js/scripts.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/scripts.js 2011-12-15 02:58:23 UTC (rev 4606) +++ phpcompta/trunk/html/js/scripts.js 2011-12-15 13:09:18 UTC (rev 4607) @@ -1080,8 +1080,7 @@ var dossier=3Dg('gDossier').value; waiting_box(); var target=3D"search_op"; - - var qs=3Dobj.serialize()+"&op=3Dsearch_op&ctl=3Dsearch_op"; + var qs=3DForm.serialize('search_form_ajx')+"&op=3Dsearch_op&ctl=3D= search_op"; var action=3Dnew Ajax.Request ( 'ajax_misc.php', { method:'get', Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-15 02:58:23 UTC (rev 460= 6) +++ phpcompta/trunk/include/constant.php 2011-12-15 13:09:18 UTC (rev 460= 7) @@ -35,12 +35,12 @@ $g_succeed=3D"✓"; =20 /*set to none for production */ /* uncomment for production */ -// $version_phpcompta=3D4444; -//define ("DEBUG",false); + $version_phpcompta=3D4444; +define ("DEBUG",false); =20 =20 -$version_phpcompta=3DSVNINFO; -define ("DEBUG",false); +//$version_phpcompta=3DSVNINFO; +//define ("DEBUG",false); =20 =20 =20 Modified: phpcompta/trunk/include/search.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/search.inc.php 2011-12-15 02:58:23 UTC (rev 4= 606) +++ phpcompta/trunk/include/search.inc.php 2011-12-15 13:09:18 UTC (rev 4= 607) @@ -64,7 +64,7 @@ $action=3D""; $callback=3D""; require 'template/search_top.php'; - echo ''; + echo ''; echo HtmlInput::get_to_hidden(array('ctlc','ledger')); $inside=3Dtrue; } From MAILER-DAEMON Thu Dec 15 08:23:01 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbBH3-00014z-AE for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 08:23:01 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 14:26:34 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4608 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 13:23:00 -0000 Author: danydb Date: 2011-12-15 14:26:33 +0100 (Thu, 15 Dec 2011) New Revision: 4608 Modified: phpcompta/trunk/include/constant.php Log: remove DEBUG=20 Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-12-15 13:09:18 UTC (rev 460= 7) +++ phpcompta/trunk/include/constant.php 2011-12-15 13:26:33 UTC (rev 460= 8) @@ -35,12 +35,12 @@ $g_succeed=3D"✓"; =20 /*set to none for production */ /* uncomment for production */ - $version_phpcompta=3D4444; -define ("DEBUG",false); +// $version_phpcompta=3D4444; +//define ("DEBUG",false); =20 =20 -//$version_phpcompta=3DSVNINFO; -//define ("DEBUG",false); +$version_phpcompta=3DSVNINFO; +define ("DEBUG",false); =20 =20 =20 From MAILER-DAEMON Thu Dec 15 08:29:35 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbBNP-00038J-9X for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 08:29:35 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 14:33:06 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4609 - 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: Thu, 15 Dec 2011 13:29:33 -0000 Author: danydb Date: 2011-12-15 14:33:05 +0100 (Thu, 15 Dec 2011) New Revision: 4609 Modified: phpcompta/trunk/html/ajax_card.php phpcompta/trunk/html/js/anc_script.js phpcompta/trunk/html/js/card.js phpcompta/trunk/include/ajax_anc_search.php Log: IE8 Bug with form submit 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-12-15 13:26:33 UTC (rev 4608) +++ phpcompta/trunk/html/ajax_card.php 2011-12-15 13:33:05 UTC (rev 4609) @@ -147,7 +147,7 @@ =20 if ($can_modify=3D=3D1) { - $html.=3D''; + $html.=3D''; $html.=3Ddossier::hidden(); $html.=3DHtmlInput::hidden('f_id',$f->id); $html.=3DHtmlInput::hidden('ctl',$ctl); Modified: phpcompta/trunk/html/js/anc_script.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/anc_script.js 2011-12-15 13:26:33 UTC (rev 46= 08) +++ phpcompta/trunk/html/js/anc_script.js 2011-12-15 13:33:05 UTC (rev 46= 09) @@ -214,7 +214,8 @@ function search_anc_form(obj) { var qs=3D"op=3Dresultancsearch&ctl=3Dsearchanc&"; - qs+=3Dobj.serialize(false); + var name=3Dobj.id; + qs+=3D$(name).serialize(false); waiting_box(); var action=3Dnew Ajax.Request ( 'ajax_misc.php', { @@ -354,4 +355,4 @@ var pa_id=3Dobj.plan_ctl; queryString=3DqueryString+"&pa_id=3D"+pa_id; return queryString; -} \ No newline at end of file +} 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-12-15 13:26:33 UTC (rev 4608) +++ phpcompta/trunk/html/js/card.js 2011-12-15 13:33:05 UTC (rev 4609) @@ -634,7 +634,8 @@ function update_card(obj) { try { - var qs=3Dobj.serialize()+'&op=3Dupc'; + var name=3Dobj.id; + var qs=3DForm.serialize(name)+'&op=3Dupc'; var action=3Dnew Ajax.Request ( 'ajax_card.php', { method:'get', Modified: phpcompta/trunk/include/ajax_anc_search.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ajax_anc_search.php 2011-12-15 13:26:33 UTC (= rev 4608) +++ phpcompta/trunk/include/ajax_anc_search.php 2011-12-15 13:33:05 UTC (= rev 4609) @@ -41,7 +41,7 @@ echo HtmlInput::title_box("Recherche activit=C3=A9", $ctl); =20 //------------- FORM ---------------------------------- -echo ''; +echo ''; echo ''._('Recherche').':'; =20 $texte=3Dnew IText('plabel'); From MAILER-DAEMON Thu Dec 15 10:04:38 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbCrO-0002GT-Pd for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 10:04:38 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 16:08:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r209 - trunk/modop 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: Thu, 15 Dec 2011 15:04:37 -0000 Author: danydb Date: 2011-12-15 16:08:14 +0100 (Thu, 15 Dec 2011) New Revision: 209 Modified: trunk/modop/class_modop_operation.php Log: fix bug : duplicate values when adding rows Modified: trunk/modop/class_modop_operation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modop/class_modop_operation.php 2011-12-11 15:47:09 UTC (rev 20= 8) +++ trunk/modop/class_modop_operation.php 2011-12-15 15:08:14 UTC (rev 20= 9) @@ -94,7 +94,7 @@ =20 =20 } // for each item - $this->array['nb_item']=3D(count($qp)<9)?9:count($qp); + $this->array['nb_item']=3D(count($qp)array['nb_item']=3D(count($qp)<9)?9:count($qp); + $this->array['nb_item']=3D(count($qp)array['amount'.$e]=3D$ods[$e]['j_montant']; $this->array['ld'.$e]=3D$ods[$e]['j_text']; } - $this->array['nb_item']=3D(count($ods)<9)?9:count($ods); + $this->array['nb_item']=3D(count($ods) From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4610 - phpcompta/trunk/html/js X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 19:39:11 -0000 Author: danydb Date: 2011-12-15 20:42:49 +0100 (Thu, 15 Dec 2011) New Revision: 4610 Modified: phpcompta/trunk/html/js/acc_ledger.js Log: small bug : let duplicate reconciliation in FIN Modified: phpcompta/trunk/html/js/acc_ledger.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/acc_ledger.js 2011-12-15 13:33:05 UTC (rev 46= 09) +++ phpcompta/trunk/html/js/acc_ledger.js 2011-12-15 19:42:49 UTC (rev 46= 10) @@ -257,6 +257,7 @@ g("e_other"+nb.value).value=3D""; g("e_other"+nb.value+'_amount').value=3D"0"; g("e_other"+nb.value+'_comment').value=3D""; + g("e_concerned"+nb.value).value=3D""; nb.value++; } /** From MAILER-DAEMON Thu Dec 15 14:47:39 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbHHH-0004dK-PF for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 14:47:39 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 20:51:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4611 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 19:47:37 -0000 Author: danydb Date: 2011-12-15 20:51:15 +0100 (Thu, 15 Dec 2011) New Revision: 4611 Modified: phpcompta/trunk/include/class_extension.php Log: plugin_code in uppercase=20 Modified: phpcompta/trunk/include/class_extension.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_extension.php 2011-12-15 19:42:49 UTC (= rev 4610) +++ phpcompta/trunk/include/class_extension.php 2011-12-15 19:51:15 UTC (= rev 4611) @@ -52,7 +52,7 @@ /*!@brief search a extension, the what is the column (extends_code *= / function search($p_what) { - $this->me_code=3D$p_what; + $this->me_code=3Dstrtoupper($p_what); if ( $this->load() =3D=3D -1) return null; return 1; } From MAILER-DAEMON Thu Dec 15 14:48:02 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbHHe-0004eA-RW for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 14:48:02 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 20:51:42 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4612 - phpcompta/trunk/html/js X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 19:48:01 -0000 Author: danydb Date: 2011-12-15 20:51:40 +0100 (Thu, 15 Dec 2011) New Revision: 4612 Modified: phpcompta/trunk/html/js/acc_ledger.js Log: duplicate value in row=20 Modified: phpcompta/trunk/html/js/acc_ledger.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/acc_ledger.js 2011-12-15 19:51:15 UTC (rev 46= 11) +++ phpcompta/trunk/html/js/acc_ledger.js 2011-12-15 19:51:40 UTC (rev 46= 12) @@ -289,6 +289,7 @@ g("e_march"+nb.value+"_price").value=3D'0'; g("e_march"+nb.value).value=3D""; g("e_quant"+nb.value).value=3D"1"; + g("e_march"+nb.value+"_tva_amount").value=3D0; =20 nb.value++; =20 From MAILER-DAEMON Thu Dec 15 15:17:46 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbHkQ-00085r-Td for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 15:17:46 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 15 Dec 2011 21:21:24 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4613 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2011 20:17:45 -0000 Author: danydb Date: 2011-12-15 21:21:23 +0100 (Thu, 15 Dec 2011) New Revision: 4613 Modified: phpcompta/trunk/include/class_acc_reconciliation.php Log: auto_letter improve, let letter more operations Modified: phpcompta/trunk/include/class_acc_reconciliation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_reconciliation.php 2011-12-15 19:51= :40 UTC (rev 4612) +++ phpcompta/trunk/include/class_acc_reconciliation.php 2011-12-15 20:21= :23 UTC (rev 4613) @@ -146,17 +146,18 @@ if ( count($result) =3D=3D 0) { return; - } elseif (count($result)=3D=3D1) + } + for ($i=3D0;$idb); - $letter->insert_couple($result[0]['jrnx_id1'],$result[0]['jrnx_id2']= ); + $letter->insert_couple($result[$i]['jrnx_id1'],$result[$i]['jrnx_id2= ']); } else { $letter =3D new Lettering_Account($this->db); - $letter->insert_couple($result[0]['jrnx_id1'],$result[0]['jrnx_id2']= ); + $letter->insert_couple($result[$i]['jrnx_id1'],$result[$i]['jrnx_id2= ']); } } =20 From MAILER-DAEMON Thu Dec 15 20:52:32 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbMyO-0008JE-ON for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 20:52:32 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 16 Dec 2011 02:56:03 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4614 - phpcompta/branches/rel560/include/template 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: Fri, 16 Dec 2011 01:52:31 -0000 Author: danydb Date: 2011-12-16 02:56:02 +0100 (Fri, 16 Dec 2011) New Revision: 4614 Modified: phpcompta/branches/rel560/include/template/ledger_detail_fin.php phpcompta/branches/rel560/include/template/ledger_detail_misc.php Log: Show j_text in detailled operation Modified: phpcompta/branches/rel560/include/template/ledger_detail_fin.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/include/template/ledger_detail_fin.php 2011= -12-15 20:21:23 UTC (rev 4613) +++ phpcompta/branches/rel560/include/template/ledger_detail_fin.php 2011= -12-16 01:56:02 UTC (rev 4614) @@ -19,7 +19,7 @@ $date=3Dnew IDate('p_date'); $date->value=3Dformat_date($obj->det->jr_date); echo td('Date').td($date->input()); -=20 + ?> =20 @@ -35,7 +35,7 @@ det->array[0]['qf_other']); $view_history=3D sprintf('%s', $bk->id, $gDossier, $bk->get_quick_code()); @@ -45,7 +45,7 @@ =20 -value=3D$obj->det->jr_comment; $itext->size=3D40; @@ -58,7 +58,7 @@ det->array[0]['qf_amount'],' class=3D"inu= m"');?> -value=3D$obj->det->jr_pj_number; echo td(_('Pi=C3=A8ce')).td($itext->input()); @@ -93,7 +93,7 @@
-jr_id); $detail->get(); ?> @@ -132,8 +132,11 @@ else $view_history=3D''; $row.=3Dtd($view_history); - if ( $q[$e]['j_qcode'] !=3D'') { - // nom de la fiche=20 + if ( $q[$e]['j_text']!=3D'') + { + $row.=3Dtd(h($q[$e]['j_text'])); + }else if ( $q[$e]['j_qcode'] !=3D'') { + // nom de la fiche $ff=3Dnew Fiche($cn); $ff->get_by_qcode( $q[$e]['j_qcode']); $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME))); @@ -149,13 +152,13 @@ if ( $owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'popup') { $poste=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT); - if ( preg_match('/^(6|7)/',$q[$e]['j_poste']))=20 + if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) { $anc_op=3Dnew Anc_Operation($cn); $anc_op->j_id=3D$q[$e]['j_id']; $row.=3D HtmlInput::hidden('op[]',$anc_op->j_id); $row.=3D$anc_op->display_table(1,$q[$e]['j_montant'],$div); -=09 + } else { $row.=3Dtd(''); } Modified: phpcompta/branches/rel560/include/template/ledger_detail_misc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/include/template/ledger_detail_misc.php 201= 1-12-15 20:21:23 UTC (rev 4613) +++ phpcompta/branches/rel560/include/template/ledger_detail_misc.php 201= 1-12-16 01:56:02 UTC (rev 4614) @@ -1,11 +1,11 @@ - -
@@ -22,31 +22,31 @@ $date=3Dnew IDate('p_date'); $date->value=3Dformat_date($obj->det->jr_date); echo td('Date').td($date->input()); - =20 + ?> - =09 + - value=3D$obj->det->jr_comment; $itext->size=3D40; echo td(_('Libell=C3=A9')).td($itext->input()); - =09 - =09 + + ?> det->jr_montant),' class=3D"i= num"');?> - value=3D$obj->det->jr_pj_number; echo td(_('Pi=C3=A8ce')).td($itext->input()); ?> - =09 + @@ -64,7 +64,7 @@ $inote->value=3D$obj->det->note; echo $inote->input(); ?> - =09 + @@ -98,7 +98,7 @@ /* add hidden variables pa[] to hold the value of pa_id */ echo Anc_Plan::hidden($a_anc); } -echo ''; =20 +echo ''; for ($e=3D0;$edet->array);$e++) { $row=3D''; $q=3D$obj->det->array; $view_history=3D sprintf('%s= ', @@ -114,9 +114,12 @@ else $view_history=3D''; $row.=3Dtd($view_history); - + if ( $q[$e]['j_text']!=3D'') + { + $row.=3Dtd(h($q[$e]['j_text'])); + }else if ( $q[$e]['j_qcode'] !=3D'') { - // nom de la fiche=20 + // nom de la fiche $ff=3Dnew Fiche($cn); $ff->get_by_qcode( $q[$e]['j_qcode']); $row.=3Dtd(h($ff->strAttribut(ATTR_DEF_NAME))); @@ -131,13 +134,13 @@ /* Analytic accountancy */ if ( $owner->MY_ANALYTIC !=3D "nu" && $div=3D=3D'popup'){ if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) { -=09 =20 + $anc_op=3Dnew Anc_Operation($cn); $anc_op->j_id=3D$q[$e]['j_id']; echo HtmlInput::hidden('op[]',$anc_op->j_id); $row.=3D$anc_op->display_table(1,$q[$e]['j_montant'],$div); -=09 + } else { $row.=3Dtd(''); } From MAILER-DAEMON Thu Dec 15 20:53:04 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbMyu-0008MY-R1 for mharc-phpcompta-dev@gnu.org; Thu, 15 Dec 2011 20:53:04 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 16 Dec 2011 02:56:41 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4615 - 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: Fri, 16 Dec 2011 01:53:04 -0000 Author: danydb Date: 2011-12-16 02:56:39 +0100 (Fri, 16 Dec 2011) New Revision: 4615 Modified: phpcompta/branches/rel560/include/class_acc_reconciliation.php phpcompta/branches/rel560/include/class_lettering.php Log: >From 6.0 add auto lettering when reconciling=20 Modified: phpcompta/branches/rel560/include/class_acc_reconciliation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_acc_reconciliation.php 2011-1= 2-16 01:56:02 UTC (rev 4614) +++ phpcompta/branches/rel560/include/class_acc_reconciliation.php 2011-1= 2-16 01:56:39 UTC (rev 4615) @@ -23,11 +23,12 @@ /*!\file * \brief class acc_reconciliation, this class is new and the code * must use it - * =20 + * */ require_once("class_iconcerned.php"); require_once ('class_database.php'); require_once ('class_dossier.php'); +require_once 'class_lettering.php'; =20 /*! \brief new class for managing the reconciliation it must be used * instead of the function InsertRapt, ... @@ -60,7 +61,7 @@ } /*! *\brief Insert into jrn_rapt the concerned operations - * =20 + * * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned or a strin= g * like "jr_id2,jr_id3,jr_id4..." * @@ -90,9 +91,9 @@ } =20 /*! - *\brief Insert into jrn_rapt the concerned operations=20 + *\brief Insert into jrn_rapt the concerned operations * should not be called directly, use insert instead - * =20 + * * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned * * \return none @@ -112,22 +113,61 @@ "select jra_id from jrn_rapt where jra_concerned=3D"= .$this->jr_id. " and jr_id=3D$jr_id2 union - select jra_id from jrn_rapt where jra_id=3D".$this->= jr_id. + select jra_id from jrn_rapt where jr_id=3D".$this->j= r_id. " and jra_concerned=3D$jr_id2 ") =3D=3D0) { // Ok we can insert $Res=3D$this->db->exec_sql("insert into jrn_rapt(jr_id,jra_c= oncerned) values ". - "(".$this->jr_id.",$jr_id2)"); + "(".$this->jr_id.",$jr_id2)"); + // try to letter automatically same account from both operation + $this->auto_letter($jr_id2); } return true; } - /*! + /** + * @brief try to letter same card between $p_jrid and $this->jr_id + * @param jrn.jr_id $p_jrid the operation to reconcile + */ + function auto_letter($p_jrid) + { + // Try to find same card from both operation + $sql=3D"select j1.f_id as fiche ,coalesce(j1.j_id,-1) as jrnx_id1,coal= esce(j2.j_id,-1) as jrnx_id2, +j1.j_poste as poste + from jrnx as j1 + join jrn as jr1 on (j1.j_grpt=3Djr1.jr_grpt_id) + join jrnx as j2 on (coalesce(j1.f_id,-1)=3Dcoalesce(j2.f_id,-1) and= j1.j_poste=3Dj2.j_poste) + join jrn as jr2 on (j2.j_grpt=3Djr2.jr_grpt_id) + where + jr1.jr_id=3D$1 + and + jr2.jr_id=3D $2"; + $result=3D$this->db->get_array($sql,array($this->jr_id,$p_jrid)); + if ( count($result) =3D=3D 0) + { + return; + } + for ($i=3D0;$idb); + $letter->insert_couple($result[$i]['jrnx_id1'],$result[$i]['jrnx_id2= ']); + } + else + { + $letter =3D new Lettering_Account($this->db); + $letter->insert_couple($result[$i]['jrnx_id1'],$result[$i]['jrnx_id2= ']); + } + } + } + + /*! *\brief Insert into jrn_rapt the concerned operations - * =20 + * * \param $this->jr_id (jrn.jr_id) =3D> jrn_rapt.jr_id * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned - *=20 + * * \return none */ function remove($jr_id2) @@ -144,8 +184,29 @@ select jra_id from jrn_rapt where jra_= concerned=3D$jr_id2 ". " and jr_id=3D".$this->jr_id) !=3D0) { - // Ok we can delete - $Res=3D$this->db->exec_sql("delete from jrn_rapt where ". + /** + * remove also lettering between both operation + */ + $sql =3D " delete from + jnt_letter + where jl_id in ( select jl_id from jnt_letter + join letter_cred as lc using(jl_id) + join letter_deb as ld using (jl_id) + where + lc.j_id in (select j_id + from jrnx join jrn on (j_grpt=3Djr_grpt_id) + where jr_id in ($1,$2)) + or + ld.j_id in (select j_id + from jrnx join jrn on (j_grpt=3Djr_grpt_id) + where jr_id in ($1,$2)) + + + + )"; + $this->db->exec_sql($sql, array($jr_id2, $this->jr_id)); + // Ok we can delete + $Res=3D$this->db->exec_sql("delete from jrn_rapt where ". "(jra_concerned=3D$jr_id2 and jr_id= =3D".$this->jr_id.") or (jra_concerned=3D".$this->jr_id." a= nd jr_id=3D$jr_id2) "); } @@ -153,8 +214,8 @@ =20 /*! *\brief Return an array of the concerned operation - * =20 - * =20 + * + * *\param database connection * \return array if something is found or null */ @@ -188,7 +249,7 @@ } /** *@brief return array of not-reconciled operation -=20 + */ function get_not_reconciled() { @@ -207,7 +268,7 @@ return $ret; } /** - *Create a sql condition to filter by security and by asked ledger=20 + *Create a sql condition to filter by security and by asked ledger * based on $this->a_jrn *@return a valid sql stmt to include *@see get_not_reconciled get_reconciled @@ -309,7 +370,7 @@ $user=3Dnew User($this->db); list($start,$end)=3D$user->get_limit_current_exercice(); =20 - if (isDate($this->start_day) =3D=3Dnull)=20 + if (isDate($this->start_day) =3D=3Dnull) { $this->start_day=3D$start; } Modified: phpcompta/branches/rel560/include/class_lettering.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/include/class_lettering.php 2011-12-16 01:5= 6:02 UTC (rev 4614) +++ phpcompta/branches/rel560/include/class_lettering.php 2011-12-16 01:5= 6:39 UTC (rev 4615) @@ -28,11 +28,11 @@ /** *@brief mother class for the lettering by account and by card * use the tables jnt_letter, letter_deb and letter_cred - * - "account"=3D>"account", =3D> the accounting of the j_id (use = by Lettering_Account)=20 - * - "quick_code"=3D>"quick_code", =3D> the quick_code of the j_id (used= by Lettering_Card)=20 - * - "start"=3D>"start", =3D> date of the first day=20 - * - "end"=3D>"end", =3D> date of the last day=20 - * - "sql_ledger"=3D>"sql_ledger" =3D> the sql clause to filter on the = available ledgers=20 + * - "account"=3D>"account", =3D> the accounting of the j_id (use = by Lettering_Account) + * - "quick_code"=3D>"quick_code", =3D> the quick_code of the j_id (used= by Lettering_Card) + * - "start"=3D>"start", =3D> date of the first day + * - "end"=3D>"end", =3D> date of the last day + * - "sql_ledger"=3D>"sql_ledger" =3D> the sql clause to filter on the = available ledgers */ class Lettering { @@ -83,38 +83,102 @@ /** *Use to just insert a couple of lettered operation */ - function insert_couple($j_id1,$j_id2) - { - $jl_id=3D$this->db->get_next_seq("jnt_letter_jl_id_seq"); - $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', - array($jl_id)); - /* take needed data */ - $first=3D$this->db->get_value('select j_debit from jrnx where j_= id=3D$1',array($j_id1)); - if ( $this->db->count() =3D=3D 0 ) throw new Exception ('Op=C3=A9= ration non existante'); + function insert_couple($j_id1, $j_id2) + { + /* take needed data */ + $first =3D $this->db->get_value('select j_debit from jrnx where j_id=3D= $1', array($j_id1)); + if ($this->db->count() =3D=3D 0) + throw new Exception('Op=C3=A9ration non existante'); =20 - $second=3D$this->db->get_value('select j_debit from jrnx where j= _id=3D$1',array($j_id2)); - if ( $this->db->count() =3D=3D 0 ) throw new Exception ('Op=C3=A9= ration non existante'); - /* insert */ - if ( $first =3D=3D 't') - { - // save into letter_deb - $ld_id=3D$this->db->get_value('insert into letter_deb(j_id,j= l_id) values($1,$2) returning ld_id',array($j_id1,$jl_id)); - } - else - { - $lc_id=3D$this->db->get_value('insert into letter_cred(j_id,= jl_id) values($1,$2) returning lc_id',array($j_id1,$jl_id)); - } - if ( $second =3D=3D 't') - { - // save into letter_deb - $ld_id=3D$this->db->get_value('insert into letter_deb(j_id,j= l_id) values($1,$2) returning ld_id',array($j_id2,$jl_id)); - } - else - { - $lc_id=3D$this->db->get_value('insert into letter_cred(j_id,= jl_id) values($1,$2) returning lc_id',array($j_id2,$jl_id)); - } + $second =3D $this->db->get_value('select j_debit from jrnx where j_id=3D= $1', array($j_id2)); + if ($this->db->count() =3D=3D 0) + throw new Exception('Op=C3=A9ration non existante'); + $sql_already =3D "select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1"; + $let1 =3D 0; + $let2 =3D 0; + $already =3D $this->db->get_array($sql_already, array($j_id1)); + if (count($already) > 0) + { + if (count($already) =3D=3D 1) + { + // retrieve the letter + $let1 =3D $this->db->get_value("select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1", array($j_id1= )); + } + else + { + return; + } + } =20 - } + $already =3D $this->db->get_array($sql_already, array($j_id2)); + if (count($already) > 0) + { + if (count($already) =3D=3D 1) + { + // retrieve the letter + $let2 =3D $this->db->get_value("select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1", array($j_id2= )); + } + else + { + return; + } + } + $jl_id =3D 0; + // already linked together + if ($let1 !=3D 0 && $let1 =3D=3D $let2) + return; + + // already linked + if ($let1 !=3D 0 && $let2 !=3D 0 && $let1 !=3D $let2) + return; + + // none is linked + if ($let1 =3D=3D 0 && $let2 =3D=3D 0) + { + $jl_id =3D $this->db->get_next_seq("jnt_letter_jl_id_seq"); + $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', array= ($jl_id)); + } + // one is linked but not the other + if ($let1 =3D=3D 0 && $let2 !=3D 0) + $jl_id =3D $let2; + if ($let1 !=3D 0 && $let2 =3D=3D 0) + $jl_id =3D $let1; + + /* insert */ + if ($first =3D=3D 't') + { + // save into letter_deb + $ld_id =3D $this->db->get_value('insert into letter_deb(j_id,jl_id) v= alues($1,$2) returning ld_id', array($j_id1, $jl_id)); + } + else + { + $lc_id =3D $this->db->get_value('insert into letter_cred(j_id,jl_id) = values($1,$2) returning lc_id', array($j_id1, $jl_id)); + } + if ($second =3D=3D 't') + { + // save into letter_deb + $ld_id =3D $this->db->get_value('insert into letter_deb(j_id,jl_id) v= alues($1,$2) returning ld_id', array($j_id2, $jl_id)); + } + else + { + $lc_id =3D $this->db->get_value('insert into letter_cred(j_id,jl_id) = values($1,$2) returning lc_id', array($j_id2, $jl_id)); + } + } public function get_info() { return var_export(self::$variable,true); @@ -128,7 +192,7 @@ *@param $p_array @code 'gDossier' =3D> string '13' (length=3D2) - 'letter_j_id' =3D>=20 + 'letter_j_id' =3D> array 0 =3D> string '5' (length=3D1) 1 =3D> string '23' (length=3D2) @@ -229,7 +293,7 @@ return $r; } /** - *show only the lettered records from jrnx=20 + *show only the lettered records from jrnx *it fills the array $this->content */ protected function show_lettered() @@ -243,7 +307,7 @@ return $r; } /** - *show only the not lettered records from jrnx=20 + *show only the not lettered records from jrnx *it fills the array $this->content */ protected function show_not_lettered() From MAILER-DAEMON Fri Dec 16 22:05:44 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rbkam-0007B7-EI for mharc-phpcompta-dev@gnu.org; Fri, 16 Dec 2011 22:05:44 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 17 Dec 2011 04:09:13 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4616 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Dec 2011 03:05:43 -0000 Author: danydb Date: 2011-12-17 04:09:11 +0100 (Sat, 17 Dec 2011) New Revision: 4616 Modified: phpcompta/trunk/doc/manuel-fr.odt Log: maj manuel Modified: phpcompta/trunk/doc/manuel-fr.odt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) From MAILER-DAEMON Sat Dec 17 18:56:10 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rc46s-0004MO-Do for mharc-phpcompta-dev@gnu.org; Sat, 17 Dec 2011 18:56:10 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 00:59:35 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4617 - in phpcompta/tags: . rel560_syndic/html rel560_syndic/html/admin/sql/patch rel560_syndic/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, 17 Dec 2011 23:56:09 -0000 Author: danydb Date: 2011-12-18 00:59:32 +0100 (Sun, 18 Dec 2011) New Revision: 4617 Added: phpcompta/tags/rel560_syndic/ Modified: phpcompta/tags/rel560_syndic/html/admin/sql/patch/upgrade89.sql phpcompta/tags/rel560_syndic/html/ajax_card.php phpcompta/tags/rel560_syndic/html/index.php phpcompta/tags/rel560_syndic/include/class_html_input.php phpcompta/tags/rel560_syndic/include/constant.php Log: Syndicat=20 Copied: phpcompta/tags/rel560_syndic (from rev 4203, phpcompta/branches/r= el560) Modified: phpcompta/tags/rel560_syndic/html/admin/sql/patch/upgrade89.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/branches/rel560/html/admin/sql/patch/upgrade89.sql 2011-09-= 16 22:01:19 UTC (rev 4203) +++ phpcompta/tags/rel560_syndic/html/admin/sql/patch/upgrade89.sql 2011-= 12-17 23:59:32 UTC (rev 4617) @@ -28,7 +28,6 @@ $BODY$ LANGUAGE plpgsql; =20 -insert into attr_Def values (32,'Pr=C3=A9nom','text',22); update attr_def set ad_text=3D'D=C3=A9pense charge du grant (partie pri= v=C3=A9) ' where ad_id=3D31; =20 =20 Modified: phpcompta/tags/rel560_syndic/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-09-16 22:01:19 UTC = (rev 4203) +++ phpcompta/tags/rel560_syndic/html/ajax_card.php 2011-12-17 23:59:32 U= TC (rev 4617) @@ -336,8 +336,8 @@ /* Build the SQL and show result */ $sql=3D$fiche->build_sql($sql_array); =20 - /* We limit the search to 20 records */ - $sql=3D$sql.' order by vw_name limit 20'; + /* We limit the search to 50 records */ + $sql=3D$sql.' order by vw_name limit 50'; $a=3D$cn->get_array($sql); =20 for($i=3D0;$i -version 5.6.SVNINFO - '.$my_domain.' +version 5.6.4201 - '.$my_domain.'

Modified: phpcompta/tags/rel560_syndic/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-09-16 22:= 01:19 UTC (rev 4203) +++ phpcompta/tags/rel560_syndic/include/class_html_input.php 2011-12-17 = 23:59:32 UTC (rev 4617) @@ -521,11 +521,12 @@ $and=3D"";=20 foreach ($array as $a) { - if (isset($global_array [$a])) - $r.=3D$and."&$a=3D".$global_array [$a]; - $and=3D""; + if (isset($global_array [$a])){ + $r.=3D$and."$a=3D".$global_array [$a]; + } + $and=3D"&"; } - =20 + return $r; } /** Modified: phpcompta/tags/rel560_syndic/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/include/constant.php 2011-09-16 22:01:19 UT= C (rev 4203) +++ phpcompta/tags/rel560_syndic/include/constant.php 2011-12-17 23:59:32= UTC (rev 4617) @@ -35,7 +35,7 @@ /*set to none for production */ /* uncomment for production */ =20 -$version_phpcompta=3DSVNINFO;=20 +$version_phpcompta=3D4201; define ("DEBUG",false); =20 define ("DBVERSION",97); From MAILER-DAEMON Sat Dec 17 19:19:08 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rc4T6-0006Xs-8o for mharc-phpcompta-dev@gnu.org; Sat, 17 Dec 2011 19:19:08 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 01:22:31 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4618 - in phpcompta/tags/rel560_syndic: . html html/admin/sql/patch include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 00:19:04 -0000 Author: danydb Date: 2011-12-18 01:22:29 +0100 (Sun, 18 Dec 2011) New Revision: 4618 Modified: phpcompta/tags/rel560_syndic/html/admin/sql/patch/upgrade89.sql phpcompta/tags/rel560_syndic/html/ajax_card.php phpcompta/tags/rel560_syndic/html/index.php phpcompta/tags/rel560_syndic/html/style-print.css phpcompta/tags/rel560_syndic/include/class_acc_reconciliation.php phpcompta/tags/rel560_syndic/include/class_html_input.php phpcompta/tags/rel560_syndic/include/class_lettering.php phpcompta/tags/rel560_syndic/include/template/ledger_detail_fin.php phpcompta/tags/rel560_syndic/include/template/ledger_detail_misc.php phpcompta/tags/rel560_syndic/release-note Log: ---------------------------------------------------------------------- r4615 | danydb | 2011-12-16 02:56:39 +0100 (Fri, 16 Dec 2011) | 3 lines Changed paths: M /phpcompta/branches/rel560/include/class_acc_reconciliation.php M /phpcompta/branches/rel560/include/class_lettering.php >From 6.0 add auto lettering when reconciling=20 ------------------------------------------------------------------------ r4614 | danydb | 2011-12-16 02:56:02 +0100 (Fri, 16 Dec 2011) | 3 lines Changed paths: M /phpcompta/branches/rel560/include/template/ledger_detail_fin.php M /phpcompta/branches/rel560/include/template/ledger_detail_misc.php Show j_text in detailled operation ------------------------------------------------------------------------ r4220 | danydb | 2011-10-19 21:49:33 +0200 (Wed, 19 Oct 2011) | 1 line Changed paths: M /phpcompta/branches/rel560/include/class_html_input.php bug : & in interpreted as HTML entities ------------------------------------------------------------------------ r4211 | danydb | 2011-10-13 23:43:40 +0200 (Thu, 13 Oct 2011) | 1 line Changed paths: M /phpcompta/branches/rel560/release-note remove release ------------------------------------------------------------------------ r4203 | danydb | 2011-09-17 00:01:19 +0200 (Sat, 17 Sep 2011) | 1 line Changed paths: M /phpcompta/branches/rel560/include/class_iradio.php new fct set_checked ------------------------------------------------------------------------ r4202 | danydb | 2011-09-16 23:58:49 +0200 (Fri, 16 Sep 2011) | 1 line Changed paths: M /phpcompta/branches/rel560/include/class_icheckbox.php new fct set_checked ------------------------------------------------------------------------ Modified: phpcompta/tags/rel560_syndic/html/admin/sql/patch/upgrade89.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/tags/rel560_syndic/html/admin/sql/patch/upgrade89.sql 2011-= 12-17 23:59:32 UTC (rev 4617) +++ phpcompta/tags/rel560_syndic/html/admin/sql/patch/upgrade89.sql 2011-= 12-18 00:22:29 UTC (rev 4618) @@ -28,6 +28,7 @@ $BODY$ LANGUAGE plpgsql; =20 +-- insert into attr_Def values (32,'Pr=C3=A9nom','text',22); update attr_def set ad_text=3D'D=C3=A9pense charge du grant (partie pri= v=C3=A9) ' where ad_id=3D31; =20 =20 Modified: phpcompta/tags/rel560_syndic/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/rel560_syndic/html/ajax_card.php 2011-12-17 23:59:32 U= TC (rev 4617) +++ phpcompta/tags/rel560_syndic/html/ajax_card.php 2011-12-18 00:22:29 U= TC (rev 4618) @@ -336,7 +336,7 @@ /* Build the SQL and show result */ $sql=3D$fiche->build_sql($sql_array); =20 - /* We limit the search to 50 records */ + /* We limit the search to 20 records */ $sql=3D$sql.' order by vw_name limit 50'; $a=3D$cn->get_array($sql); =20 Modified: phpcompta/tags/rel560_syndic/html/index.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/tags/rel560_syndic/html/index.php 2011-12-17 23:59:32 UTC (= rev 4617) +++ phpcompta/tags/rel560_syndic/html/index.php 2011-12-18 00:22:29 UTC (= rev 4618) @@ -186,7 +186,7 @@ =20 echo ' -version 5.6.4201 - '.$my_domain.' +version 5.6.SVNINFO - '.$my_domain.'

Modified: phpcompta/tags/rel560_syndic/html/style-print.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/tags/rel560_syndic/html/style-print.css 2011-12-17 23:59:32= UTC (rev 4617) +++ phpcompta/tags/rel560_syndic/html/style-print.css 2011-12-18 00:22:29= UTC (rev 4618) @@ -243,5 +243,12 @@ .num { text-align:right; } +thead { + display:table-header-group; + } =09 =20 +tbody { + display:table-row-group; + } + /* */ Modified: phpcompta/tags/rel560_syndic/include/class_acc_reconciliation.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/tags/rel560_syndic/include/class_acc_reconciliation.php 201= 1-12-17 23:59:32 UTC (rev 4617) +++ phpcompta/tags/rel560_syndic/include/class_acc_reconciliation.php 201= 1-12-18 00:22:29 UTC (rev 4618) @@ -23,11 +23,12 @@ /*!\file * \brief class acc_reconciliation, this class is new and the code * must use it - * =20 + * */ require_once("class_iconcerned.php"); require_once ('class_database.php'); require_once ('class_dossier.php'); +require_once 'class_lettering.php'; =20 /*! \brief new class for managing the reconciliation it must be used * instead of the function InsertRapt, ... @@ -60,7 +61,7 @@ } /*! *\brief Insert into jrn_rapt the concerned operations - * =20 + * * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned or a strin= g * like "jr_id2,jr_id3,jr_id4..." * @@ -90,9 +91,9 @@ } =20 /*! - *\brief Insert into jrn_rapt the concerned operations=20 + *\brief Insert into jrn_rapt the concerned operations * should not be called directly, use insert instead - * =20 + * * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned * * \return none @@ -112,22 +113,61 @@ "select jra_id from jrn_rapt where jra_concerned=3D"= .$this->jr_id. " and jr_id=3D$jr_id2 union - select jra_id from jrn_rapt where jra_id=3D".$this->= jr_id. + select jra_id from jrn_rapt where jr_id=3D".$this->j= r_id. " and jra_concerned=3D$jr_id2 ") =3D=3D0) { // Ok we can insert $Res=3D$this->db->exec_sql("insert into jrn_rapt(jr_id,jra_c= oncerned) values ". - "(".$this->jr_id.",$jr_id2)"); + "(".$this->jr_id.",$jr_id2)"); + // try to letter automatically same account from both operation + $this->auto_letter($jr_id2); } return true; } - /*! + /** + * @brief try to letter same card between $p_jrid and $this->jr_id + * @param jrn.jr_id $p_jrid the operation to reconcile + */ + function auto_letter($p_jrid) + { + // Try to find same card from both operation + $sql=3D"select j1.f_id as fiche ,coalesce(j1.j_id,-1) as jrnx_id1,coal= esce(j2.j_id,-1) as jrnx_id2, +j1.j_poste as poste + from jrnx as j1 + join jrn as jr1 on (j1.j_grpt=3Djr1.jr_grpt_id) + join jrnx as j2 on (coalesce(j1.f_id,-1)=3Dcoalesce(j2.f_id,-1) and= j1.j_poste=3Dj2.j_poste) + join jrn as jr2 on (j2.j_grpt=3Djr2.jr_grpt_id) + where + jr1.jr_id=3D$1 + and + jr2.jr_id=3D $2"; + $result=3D$this->db->get_array($sql,array($this->jr_id,$p_jrid)); + if ( count($result) =3D=3D 0) + { + return; + } + for ($i=3D0;$idb); + $letter->insert_couple($result[$i]['jrnx_id1'],$result[$i]['jrnx_id2= ']); + } + else + { + $letter =3D new Lettering_Account($this->db); + $letter->insert_couple($result[$i]['jrnx_id1'],$result[$i]['jrnx_id2= ']); + } + } + } + + /*! *\brief Insert into jrn_rapt the concerned operations - * =20 + * * \param $this->jr_id (jrn.jr_id) =3D> jrn_rapt.jr_id * \param $jr_id2 (jrn.jr_id) =3D> jrn_rapt.jra_concerned - *=20 + * * \return none */ function remove($jr_id2) @@ -144,8 +184,29 @@ select jra_id from jrn_rapt where jra_= concerned=3D$jr_id2 ". " and jr_id=3D".$this->jr_id) !=3D0) { - // Ok we can delete - $Res=3D$this->db->exec_sql("delete from jrn_rapt where ". + /** + * remove also lettering between both operation + */ + $sql =3D " delete from + jnt_letter + where jl_id in ( select jl_id from jnt_letter + join letter_cred as lc using(jl_id) + join letter_deb as ld using (jl_id) + where + lc.j_id in (select j_id + from jrnx join jrn on (j_grpt=3Djr_grpt_id) + where jr_id in ($1,$2)) + or + ld.j_id in (select j_id + from jrnx join jrn on (j_grpt=3Djr_grpt_id) + where jr_id in ($1,$2)) + + + + )"; + $this->db->exec_sql($sql, array($jr_id2, $this->jr_id)); + // Ok we can delete + $Res=3D$this->db->exec_sql("delete from jrn_rapt where ". "(jra_concerned=3D$jr_id2 and jr_id= =3D".$this->jr_id.") or (jra_concerned=3D".$this->jr_id." a= nd jr_id=3D$jr_id2) "); } @@ -153,8 +214,8 @@ =20 /*! *\brief Return an array of the concerned operation - * =20 - * =20 + * + * *\param database connection * \return array if something is found or null */ @@ -188,7 +249,7 @@ } /** *@brief return array of not-reconciled operation -=20 + */ function get_not_reconciled() { @@ -207,7 +268,7 @@ return $ret; } /** - *Create a sql condition to filter by security and by asked ledger=20 + *Create a sql condition to filter by security and by asked ledger * based on $this->a_jrn *@return a valid sql stmt to include *@see get_not_reconciled get_reconciled @@ -309,7 +370,7 @@ $user=3Dnew User($this->db); list($start,$end)=3D$user->get_limit_current_exercice(); =20 - if (isDate($this->start_day) =3D=3Dnull)=20 + if (isDate($this->start_day) =3D=3Dnull) { $this->start_day=3D$start; } Modified: phpcompta/tags/rel560_syndic/include/class_html_input.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/tags/rel560_syndic/include/class_html_input.php 2011-12-17 = 23:59:32 UTC (rev 4617) +++ phpcompta/tags/rel560_syndic/include/class_html_input.php 2011-12-18 = 00:22:29 UTC (rev 4618) @@ -127,8 +127,8 @@ /** * Make a JSON object, this method create a javascript object * with the attribute set, it returns a javascript string with the o= bject - * @param $p_name : name of the object, can be null. If the name is = not null, return=20 - * $p_name=3D{} otherwise only the object {}=20 + * @param $p_name : name of the object, can be null. If the name is = not null, return + * $p_name=3D{} otherwise only the object {} * @return javascript string with the object * @note: there is not check on the key->value, so you could need to= escape * special char as quote, single-quote... @@ -201,7 +201,7 @@ =20 /*!\brief create a button with a ref *\param $p_label the text - *\param $p_value the location of the window,=20 + *\param $p_value the location of the window, *\param $p_name the id of the span *\param $p_javascript javascript for this button *\return string with htmlcode @@ -286,7 +286,7 @@ /** * return the html code to create an hidden div and a button * to show this DIV. This contains all the available ledgers - * for the user in READ or RW=20 + * for the user in READ or RW *@param $p_array is an array obtains thanks User::get_ledger *@param $selected is an array of checkbox *@note the choosen ledger are stored in the array r_jrn (_GET) @@ -376,7 +376,7 @@ return $r; } /** - *close button for the HTML popup=20 + *close button for the HTML popup *@see add_div modify_operation *@param $div_name is the name of the div to remove */ @@ -418,7 +418,7 @@ /** * Return a html string with an anchor looking like anchor_button in= the right corner *@param $action action action to perform (message) - *@param $javascript javascript=20 + *@param $javascript javascript *@note not protected against html *@see Acc_Ledger::display_search_form */ @@ -453,8 +453,8 @@ } /** *transform request data to hidden - *@param $array is an of indices=20 - *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault)=20 + *@param $array is an of indices + *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault) *@return html string with the hidden data */ static function array_to_hidden($array,$global_array ) @@ -467,12 +467,12 @@ { if (isset($global_array [$a])) $r.=3DHtmlInput::hidden($a,$global_arr= ay [$a]); } - =20 + return $r; } /** *transform $_GET data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -484,7 +484,7 @@ =20 /** *transform $_POST data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -496,7 +496,7 @@ =20 /** *transform $_REQUEST data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -508,8 +508,8 @@ =20 /** *transform request data to string - *@param $array is an of indices=20 - *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault)=20 + *@param $array is an of indices + *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault) *@return html string with the string data */ static function array_to_string($array,$global_array ) @@ -518,12 +518,11 @@ $r=3D"?"; =20 if ( count($global_array )=3D=3D0) return ''; - $and=3D"";=20 + $and=3D""; foreach ($array as $a) { - if (isset($global_array [$a])){ + if (isset($global_array [$a])) $r.=3D$and."$a=3D".$global_array [$a]; - } $and=3D"&"; } =20 @@ -531,7 +530,7 @@ } /** *transform $_GET data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -543,7 +542,7 @@ =20 /** *transform $_POST data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -555,7 +554,7 @@ =20 /** *transform $_REQUEST data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -566,7 +565,7 @@ } =20 /** - * generate an unique id for a widget,=20 + * generate an unique id for a widget, *@param $p_prefix prefix *@see HtmlInput::IDate *@return string with a unique id @@ -579,7 +578,7 @@ /** * return default if the value if the array doesn't exist *@param $ind the index to check - *@param $default the value to return=20 + *@param $default the value to return *@param $array the array */ static function default_value($ind,$default,$array) Modified: phpcompta/tags/rel560_syndic/include/class_lettering.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/tags/rel560_syndic/include/class_lettering.php 2011-12-17 2= 3:59:32 UTC (rev 4617) +++ phpcompta/tags/rel560_syndic/include/class_lettering.php 2011-12-18 0= 0:22:29 UTC (rev 4618) @@ -28,11 +28,11 @@ /** *@brief mother class for the lettering by account and by card * use the tables jnt_letter, letter_deb and letter_cred - * - "account"=3D>"account", =3D> the accounting of the j_id (use = by Lettering_Account)=20 - * - "quick_code"=3D>"quick_code", =3D> the quick_code of the j_id (used= by Lettering_Card)=20 - * - "start"=3D>"start", =3D> date of the first day=20 - * - "end"=3D>"end", =3D> date of the last day=20 - * - "sql_ledger"=3D>"sql_ledger" =3D> the sql clause to filter on the = available ledgers=20 + * - "account"=3D>"account", =3D> the accounting of the j_id (use = by Lettering_Account) + * - "quick_code"=3D>"quick_code", =3D> the quick_code of the j_id (used= by Lettering_Card) + * - "start"=3D>"start", =3D> date of the first day + * - "end"=3D>"end", =3D> date of the last day + * - "sql_ledger"=3D>"sql_ledger" =3D> the sql clause to filter on the = available ledgers */ class Lettering { @@ -83,38 +83,102 @@ /** *Use to just insert a couple of lettered operation */ - function insert_couple($j_id1,$j_id2) - { - $jl_id=3D$this->db->get_next_seq("jnt_letter_jl_id_seq"); - $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', - array($jl_id)); - /* take needed data */ - $first=3D$this->db->get_value('select j_debit from jrnx where j_= id=3D$1',array($j_id1)); - if ( $this->db->count() =3D=3D 0 ) throw new Exception ('Op=C3=A9= ration non existante'); + function insert_couple($j_id1, $j_id2) + { + /* take needed data */ + $first =3D $this->db->get_value('select j_debit from jrnx where j_id=3D= $1', array($j_id1)); + if ($this->db->count() =3D=3D 0) + throw new Exception('Op=C3=A9ration non existante'); =20 - $second=3D$this->db->get_value('select j_debit from jrnx where j= _id=3D$1',array($j_id2)); - if ( $this->db->count() =3D=3D 0 ) throw new Exception ('Op=C3=A9= ration non existante'); - /* insert */ - if ( $first =3D=3D 't') - { - // save into letter_deb - $ld_id=3D$this->db->get_value('insert into letter_deb(j_id,j= l_id) values($1,$2) returning ld_id',array($j_id1,$jl_id)); - } - else - { - $lc_id=3D$this->db->get_value('insert into letter_cred(j_id,= jl_id) values($1,$2) returning lc_id',array($j_id1,$jl_id)); - } - if ( $second =3D=3D 't') - { - // save into letter_deb - $ld_id=3D$this->db->get_value('insert into letter_deb(j_id,j= l_id) values($1,$2) returning ld_id',array($j_id2,$jl_id)); - } - else - { - $lc_id=3D$this->db->get_value('insert into letter_cred(j_id,= jl_id) values($1,$2) returning lc_id',array($j_id2,$jl_id)); - } + $second =3D $this->db->get_value('select j_debit from jrnx where j_id=3D= $1', array($j_id2)); + if ($this->db->count() =3D=3D 0) + throw new Exception('Op=C3=A9ration non existante'); + $sql_already =3D "select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1"; + $let1 =3D 0; + $let2 =3D 0; + $already =3D $this->db->get_array($sql_already, array($j_id1)); + if (count($already) > 0) + { + if (count($already) =3D=3D 1) + { + // retrieve the letter + $let1 =3D $this->db->get_value("select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1", array($j_id1= )); + } + else + { + return; + } + } =20 - } + $already =3D $this->db->get_array($sql_already, array($j_id2)); + if (count($already) > 0) + { + if (count($already) =3D=3D 1) + { + // retrieve the letter + $let2 =3D $this->db->get_value("select distinct(jl_id) + from jnt_letter + left outer join letter_deb using (jl_id) + left outer join letter_cred using (jl_id) + where + letter_deb.j_id =3D $1 or letter_cred.j_id=3D$1", array($j_id2= )); + } + else + { + return; + } + } + $jl_id =3D 0; + // already linked together + if ($let1 !=3D 0 && $let1 =3D=3D $let2) + return; + + // already linked + if ($let1 !=3D 0 && $let2 !=3D 0 && $let1 !=3D $let2) + return; + + // none is linked + if ($let1 =3D=3D 0 && $let2 =3D=3D 0) + { + $jl_id =3D $this->db->get_next_seq("jnt_letter_jl_id_seq"); + $this->db->exec_sql('insert into jnt_letter(jl_id) values($1)', array= ($jl_id)); + } + // one is linked but not the other + if ($let1 =3D=3D 0 && $let2 !=3D 0) + $jl_id =3D $let2; + if ($let1 !=3D 0 && $let2 =3D=3D 0) + $jl_id =3D $let1; + + /* insert */ + if ($first =3D=3D 't') + { + // save into letter_deb + $ld_id =3D $this->db->get_value('insert into letter_deb(j_id,jl_id) v= alues($1,$2) returning ld_id', array($j_id1, $jl_id)); + } + else + { + $lc_id =3D $this->db->get_value('insert into letter_cred(j_id,jl_id) = values($1,$2) returning lc_id', array($j_id1, $jl_id)); + } + if ($second =3D=3D 't') + { + // save into letter_deb + $ld_id =3D $this->db->get_value('insert into letter_deb(j_id,jl_id) v= alues($1,$2) returning ld_id', array($j_id2, $jl_id)); + } + else + { + $lc_id =3D $this->db->get_value('insert into letter_cred(j_id,jl_id) = values($1,$2) returning lc_id', array($j_id2, $jl_id)); + } + } public function get_info() { return var_export(self::$variable,true); @@ -128,7 +192,7 @@ *@param $p_array @code 'gDossier' =3D> string '13' (length=3D2) - 'letter_j_id' =3D>=20 + 'letter_j_id' =3D> array 0 =3D> string '5' (length=3D1) 1 =3D> string '23' (length=3D2) @@ -229,7 +293,7 @@ return $r; } /** - *show only the lettered records from jrnx=20 + *show only the lettered records from jrnx *it fills the array $this->content */ protected function show_lettered() @@ -243,7 +307,7 @@ return $r; } /** - *show only the not lettered records from jrnx=20 + *show only the not lettered records from jrnx *it fills the array $this->content */ protected function show_not_lettered() Modified: phpcompta/tags/rel560_syndic/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/tags/rel560_syndic/include/template/ledger_detail_fin.php 2= 011-12-17 23:59:32 UTC (rev 4617) +++ phpcompta/tags/rel560_syndic/include/template/ledger_detail_fin.php 2= 011-12-18 00:22:29 UTC (rev 4618) @@ -19,7 +19,7 @@ $date=3Dnew IDate('p_date'); $date->value=3Dformat_date($obj->det->jr_date); echo td('Date').td($date->input()); -=20 + ?> =20 @@ -35,7 +35,7 @@ det->array[0]['qf_other']); $view_history=3D sprintf('%s', $bk->id, $gDossier, $bk->get_quick_code()); @@ -45,7 +45,7 @@ =20 -value=3D$obj->det->jr_comment; $itext->size=3D40; @@ -58,7 +58,7 @@ det->array[0]['qf_amount'],' class=3D"inu= m"');?> -value=3D$obj->det->jr_pj_number; echo td(_('Pi=C3=A8ce')).td($itext->input()); @@ -93,7 +93,7 @@
-jr_id); $detail->get(); ?> @@ -132,8 +132,11 @@ else $view_history=3D''; $row.=3Dtd($view_history); - if ( $q[$e]['j_qcode'] !=3D'') { - // nom de la fiche=20 + if ( $q[$e]['j_text']!=3D'') + { + $row.=3Dtd(h($q[$e]['j_text'])); + }else if ( $q[$e]['j_qcode'] !=3D'') { + // nom de la fiche $ff=3Dnew Fiche($cn); $ff->get_by_qcode( $q[$e]['j_qcode']); $row.=3Dtd($ff->strAttribut(h(ATTR_DEF_NAME))); @@ -149,13 +152,13 @@ if ( $owner->MY_ANALYTIC !=3D "nu" && $div =3D=3D 'popup') { $poste=3D$fiche->strAttribut(ATTR_DEF_ACCOUNT); - if ( preg_match('/^(6|7)/',$q[$e]['j_poste']))=20 + if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) { $anc_op=3Dnew Anc_Operation($cn); $anc_op->j_id=3D$q[$e]['j_id']; $row.=3D HtmlInput::hidden('op[]',$anc_op->j_id); $row.=3D$anc_op->display_table(1,$q[$e]['j_montant'],$div); -=09 + } else { $row.=3Dtd(''); } Modified: phpcompta/tags/rel560_syndic/include/template/ledger_detail_mis= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/rel560_syndic/include/template/ledger_detail_misc.php = 2011-12-17 23:59:32 UTC (rev 4617) +++ phpcompta/tags/rel560_syndic/include/template/ledger_detail_misc.php = 2011-12-18 00:22:29 UTC (rev 4618) @@ -1,11 +1,11 @@ - -
@@ -22,31 +22,31 @@ $date=3Dnew IDate('p_date'); $date->value=3Dformat_date($obj->det->jr_date); echo td('Date').td($date->input()); - =20 + ?> - =09 + - value=3D$obj->det->jr_comment; $itext->size=3D40; echo td(_('Libell=C3=A9')).td($itext->input()); - =09 - =09 + + ?> det->jr_montant),' class=3D"i= num"');?> - value=3D$obj->det->jr_pj_number; echo td(_('Pi=C3=A8ce')).td($itext->input()); ?> - =09 + @@ -64,7 +64,7 @@ $inote->value=3D$obj->det->note; echo $inote->input(); ?> - =09 + @@ -98,7 +98,7 @@ /* add hidden variables pa[] to hold the value of pa_id */ echo Anc_Plan::hidden($a_anc); } -echo ''; =20 +echo ''; for ($e=3D0;$edet->array);$e++) { $row=3D''; $q=3D$obj->det->array; $view_history=3D sprintf('%s= ', @@ -114,9 +114,12 @@ else $view_history=3D''; $row.=3Dtd($view_history); - + if ( $q[$e]['j_text']!=3D'') + { + $row.=3Dtd(h($q[$e]['j_text'])); + }else if ( $q[$e]['j_qcode'] !=3D'') { - // nom de la fiche=20 + // nom de la fiche $ff=3Dnew Fiche($cn); $ff->get_by_qcode( $q[$e]['j_qcode']); $row.=3Dtd(h($ff->strAttribut(ATTR_DEF_NAME))); @@ -131,13 +134,13 @@ /* Analytic accountancy */ if ( $owner->MY_ANALYTIC !=3D "nu" && $div=3D=3D'popup'){ if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) { -=09 =20 + $anc_op=3Dnew Anc_Operation($cn); $anc_op->j_id=3D$q[$e]['j_id']; echo HtmlInput::hidden('op[]',$anc_op->j_id); $row.=3D$anc_op->display_table(1,$q[$e]['j_montant'],$div); -=09 + } else { $row.=3Dtd(''); } Modified: phpcompta/tags/rel560_syndic/release-note =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/rel560_syndic/release-note 2011-12-17 23:59:32 UTC (re= v 4617) +++ phpcompta/tags/rel560_syndic/release-note 2011-12-18 00:22:29 UTC (re= v 4618) @@ -1,40 +1 @@ -1. Ajout balance par cat=C3=A9gorie de fiche -2. DONE3. changer le code pour ajouter de la CA ou la modifier dans un D= IV HTML, le fichier jrn.php devient inutile (deprecated) -3. DONE16 D=C3=A9tail op=C3=A9ration dans DIV HTML -4. Dans les d=C3=A9tails d'op=C3=A9rations, on a aussi des liens vers le= s historiques par fiche ou par poste comptable -5. Depuis les impressions -> balances et impression -> poste, on a les d= =C3=A9tails des op=C3=A9rations=20 - TODO15 Ajoutez les d=C3=A9tails pour l'impression en PDF pour impress= ion poste / fiche -6. TODO5 bug IE : les DIV HTML n'ont pas la bonne taille -7. DONE4 Ajout d'un lien sur les postes et client pour acc=C3=A8der avec= un DIV contenant l'historique (au moins une partie / pr=C3=A9sentation p= ar slice)/ bouton suivant-pr=C3=A9c=C3=A9dent ) -8. TODO18 Acc_Account_Ledger::HtmlTable et Fiche::HtmlTable, il manque l= a s=C3=A9curit=C3=A9 pour filtrer les journaux -9. Ajout d'une FK TODO1 r=C3=A9ecriture de quant_* la liaison avec la j= rn se fait =C3=A0 travers jr_id et non pas jr_internal qui n'est pas inde= x=C3=A9.=20 -Cons=C3=A9quence : r=C3=A9=C3=A9criture de code, correction modop, ... -10. TODO2 Object pour extourner proprement une operation, le fichier ann= ulation.php devient inutile (deprecated) depend de TODO1 TODO10 -11. TODO17 extourne depuis DIV HTML d=C3=A9pend de TODO16 -12. TODO10 Enlever le bouton enlever dans les listes d'op=C3=A9ration et= le mettre dans le DIV HTML qui pr=C3=A9sente les d=C3=A9tails de l'op=20 -13. Pour les balances, on peut choisir les journaux : adapt=C3=A9 =C3=A0= ceux en ayant vraiment beaucoup -14. Depuis les lettrages, on peut aussi acc=C3=A8der aux d=C3=A9tails d'= une op=C3=A9ration -15. TODO9 - d=C3=A9pend de TODO4 TODO2 - dans impressions, on peut avoir= les d=C3=A9tails de toutes les op=C3=A9rations -16. TODO19 Le menu Grand Livre devient recherche -17. TODO20 Ajouter d'attribut avec type : text, nombre ou date; ajouter = le javascript =C3=A9quivalent pour la saisie, le num=C3=A9ro de s=C3=A9qu= ence -commence =C3=A0 10000, afin de ne pas m=C3=A9langer les attributs que je= cr=C3=A9=C3=A9 avec ceux des utilisateurs. A ajouter dans la doc comme e= xemple pour la gestion d'abonn=C3=A9s dont on peut tirer un CSV par impre= ssion -> cat=C3=A9gorie -> r=C3=A9sume -18. Impression - Rapprochement=20 -19. TODO21 Dans DIV HTML donner le code de la TVA dans les d=C3=A9tails = VEN et ACH -20. TODO20 DIV HTML dans le tableau de bord -21. TODO14 confirmation quand effacement d'un PA (comptabilit=C3=A9 anal= ytique -> Plan Analytique) -22. TODO19 Pour les fiches,suivant le type d'attributs, on peut utiliser= le javascript pour les dates=20 -23. On peut ajouter aux mod=C3=A8les de fiches, des d=C3=A9tails qui son= t soit du texte soit des nombres soit une date, soit une zone. La longueu= r peut-=C3=AAtre d=C3=A9finie mais limit=C3=A9e =C3=A0 22 caract=C3=A8res= , sauf les dates et les zones dont les tailles sont fixes -24. TODO27 : D=C3=A9placement de fiche : les attributs manquant sont ajo= ut=C3=A9s ! -25 TODO24 : Dans impression -> poste , il faut avoir l'impression des d=C3= =A9tails des op=C3=A9rations=20 -26. TODO28 : dans jrnx ajouter les f_id, le qcode n'est l=C3=A0 que pou= r acc=C3=A8l=C3=A8rer; constraint fk on update cascade on delete restrict -27. TODO25 : dans recherche de liste, utilisez des tableaux ! -28. Dans les balances, on peut choisir plusieurs journaux ou plusieurs c= at. de journal. Les donn=C3=A9es sont filtr=C3=A9es en plus d'apr=C3=A8s = la s=C3=A9curit=C3=A9 -29. Dans impression -> poste, on peut filtrer les op=C3=A9rations suivan= t qu'elles sont lettr=C3=A9es ou non. -30. Apr=C3=A8s avoir sauv=C3=A9 une op=C3=A9ration, vous pouvez avoir le= d=C3=A9tail de l'op=C3=A9ration en cliquant sur le num=C3=A9ro interne q= ui s'affiche -31. Les journaux FIN doivent =C3=AAtre attach=C3=A9s =C3=A0 un compte en= banque et uniquement un A propos du mode de paiement : on ne change rien= mais il faut que dans la doc, il est pr=C3=A9cis=C3=A9 qu'il faut param=C3= =A8trer le mdp comme le journal FIN -32. Rapprochement doivent avoir les journaux + s=C3=A9curit=C3=A9 -33. ajout bouton "ajoutez ligne" pour les OD en CA -34. ajout bouton "ajoutez ligne" pour les pr=C3=A9visions -35. Ajout l'impression pour les lettrages par poste comptables -36. Les historiques des fiches et postes comptables (impression->poste) = ont un solde progressif =20 From MAILER-DAEMON Sun Dec 18 13:49:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcLnf-00081K-Cw for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 13:49:31 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 19:52:51 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r210 - trunk/amortis/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, 18 Dec 2011 18:49:29 -0000 Author: danydb Date: 2011-12-18 19:52:50 +0100 (Sun, 18 Dec 2011) New Revision: 210 Modified: trunk/amortis/include/am_histo.inc.php Log: Bug : cannot remove in history, cause a FK to jrn.jr_internal Modified: trunk/amortis/include/am_histo.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/am_histo.inc.php 2011-12-15 15:08:14 UTC (rev 2= 09) +++ trunk/amortis/include/am_histo.inc.php 2011-12-18 18:52:50 UTC (rev 2= 10) @@ -49,7 +49,7 @@ { if ( isset($_POST['p_sel'][$i])) { - $cn->exec_sql("update amortissement.amortissement_histo set h_amoun= t=3D0,h_pj=3D'',jr_internal=3D'' where ha_id=3D$1", + $cn->exec_sql("update amortissement.amortissement_histo set h_amoun= t=3D0,h_pj=3D'',jr_internal=3Dnull where ha_id=3D$1", array($_POST['h'][$i])); } } From MAILER-DAEMON Sun Dec 18 13:54:40 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcLse-0000Iu-VN for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 13:54:40 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 19:58:07 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4619 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 18:54:39 -0000 Author: danydb Date: 2011-12-18 19:58:06 +0100 (Sun, 18 Dec 2011) New Revision: 4619 Modified: phpcompta/trunk/include/class_fiche.php Log: Bug print detail card in CSV gives a PDF Modified: phpcompta/trunk/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-12-18 00:22:29 UTC (rev = 4618) +++ phpcompta/trunk/include/class_fiche.php 2011-12-18 18:58:06 UTC (rev = 4619) @@ -1402,7 +1402,7 @@ =20 echo ''. HtmlInput::submit('bt_csv',"Export CSV"). - HtmlInput::hidden('act','PDF:fichedetail'). + HtmlInput::hidden('act','CSV:fichedetail'). dossier::hidden().$str_ople. $hid->input("type","poste"). $hid->input('p_action','impress'). From MAILER-DAEMON Sun Dec 18 13:59:21 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcLxB-0001Jn-Sn for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 13:59:21 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 20:02:48 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4620 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 18:59:20 -0000 Author: danydb Date: 2011-12-18 20:02:47 +0100 (Sun, 18 Dec 2011) New Revision: 4620 Modified: phpcompta/trunk/include/compta_fin.inc.php Log: Bug quand corrige dans journal financier, la date et les soldes sont rec= alcul?\195?\169s Modified: phpcompta/trunk/include/compta_fin.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin.inc.php 2011-12-18 18:58:06 UTC (r= ev 4619) +++ phpcompta/trunk/include/compta_fin.inc.php 2011-12-18 19:02:47 UTC (r= ev 4620) @@ -142,8 +142,9 @@ echo HtmlInput::submit('save',_('Sauve')); echo HtmlInput::reset(_('Effacer')); =20 -echo create_script(" get_last_date();ajax_saldo('first_sold');"); -exit(); +if ( ! isset ($_POST['e_date']) ) +{ + echo create_script(" get_last_date();ajax_saldo('first_sold');"); +} =20 - exit(); \ No newline at end of file From MAILER-DAEMON Sun Dec 18 14:04:30 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcM2A-0001iH-Cn for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 14:04:30 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 20:07:56 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4621 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 19:04:28 -0000 Author: danydb Date: 2011-12-18 20:07:56 +0100 (Sun, 18 Dec 2011) New Revision: 4621 Modified: phpcompta/trunk/include/compta_ven.inc.php Log: Bug : quand corrige, perd les valeurs donn?\195?\169es pour la date et la= pj Modified: phpcompta/trunk/include/compta_ven.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ven.inc.php 2011-12-18 19:02:47 UTC (r= ev 4620) +++ phpcompta/trunk/include/compta_ven.inc.php 2011-12-18 19:07:56 UTC (r= ev 4621) @@ -251,7 +251,7 @@ /* if we suggest the pj n# the run the script */ if ( $g_parameter->MY_PJ_SUGGEST=3D=3D'Y') { - echo ''; + if ( ! isset($_POST['e_date'])) echo ''; } exit(); =20 From MAILER-DAEMON Sun Dec 18 14:25:21 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcMML-0004wc-2o for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 14:25:21 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 20:28:47 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4622 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 19:25:19 -0000 Author: danydb Date: 2011-12-18 20:28:46 +0100 (Sun, 18 Dec 2011) New Revision: 4622 Modified: phpcompta/trunk/include/class_profile_menu.php Log: show also menu without module Modified: phpcompta/trunk/include/class_profile_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_profile_menu.php 2011-12-18 19:07:56 UT= C (rev 4621) +++ phpcompta/trunk/include/class_profile_menu.php 2011-12-18 19:28:46 UT= C (rev 4622) @@ -173,11 +173,14 @@ join profile_menu_type on (p_type_display=3Dpm_type) join menu_ref as mr on (mr.me_code=3Dpm.me_code) where - p_id=3D$1 and p_type_display=3D'E' and me_code_dep is null + p_id=3D$1 and p_type_display not in ('M','P') and me_code_dep is n= ull order by p_order asc ", array($p_id)); - - $this->sub_menu($ret, $p_id); + if (Database::num_row($ret)) + { + echo "

Menu sans module

"; + $this->sub_menu($ret, $p_id); + } } } =20 From MAILER-DAEMON Sun Dec 18 15:05:09 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcMyr-0001Cy-9G for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 15:05:09 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 21:08:34 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4623 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 20:05:08 -0000 Author: danydb Date: 2011-12-18 21:08:33 +0100 (Sun, 18 Dec 2011) New Revision: 4623 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_fin.php phpcompta/trunk/include/template/ledger_detail_misc.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: Cosmetic : align column VAT + display j_text Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-18 19:2= 8:46 UTC (rev 4622) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-18 20:0= 8:33 UTC (rev 4623) @@ -765,7 +765,7 @@ $acc_pay->poste=3D$poste_val; $acc_pay->qcode=3D$fqcode; $acc_pay->amount=3Dabs(round($cust_amount,2)); - $acc_pay->desc=3D$e_comm; + $acc_pay->desc=3D''; $acc_pay->grpt=3D$acseq; $acc_pay->jrn=3D$mp->get_parameter('ledger_target'); $acc_pay->periode=3D$tperiode; @@ -778,15 +778,16 @@ $acc_pay->poste=3D$poste; $acc_pay->qcode=3D$e_client; $acc_pay->amount=3Dabs(round($cust_amount,2)); - $acc_pay->desc=3D$e_comm; + $acc_pay->desc=3D''; $acc_pay->grpt=3D$acseq; $acc_pay->jrn=3D$mp->get_parameter('ledger_target'); $acc_pay->periode=3D$tperiode; - $acc_pay->type=3D($cust_amount>=3D0)?'d':'c'; + $acc_pay->type=3D($cust_amount>=3D0)?'d':'c'; $let_other=3D$acc_pay->insert_jrnx(); =20 /* insert into jrn */ $acc_pay->mt=3D$mt; + $acc_pay->desc=3D$e_comm; $mp_jr_id=3D$acc_pay->insert_jrn(); $acjrn->grpt_id=3D$acseq; $acjrn->update_internal_code($acinternal); Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-18 19:28:46= UTC (rev 4622) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-18 20:08:33= UTC (rev 4623) @@ -445,8 +445,8 @@ $acc_operation->jrn=3D$p_jrn; $acc_operation->type=3D'd'; $acc_operation->periode=3D$tperiode; - $acc_operation->insert_jrnx(); - $tot_debit=3Dbcadd($tot_debit,$value); + $acc_operation->insert_jrnx(); + $tot_debit=3Dbcadd($tot_debit,$value); $n_both=3D$value; } =20 @@ -535,7 +535,8 @@ $acc_pay->poste=3D$poste_val; $acc_pay->qcode=3D$fqcode; $acc_pay->amount=3Dabs(round($cust_amount,2)); - $acc_pay->desc=3D$e_comm; + $acc_pay->desc=3Dnull; + $acc_pay->grpt=3D$acseq; $acc_pay->jrn=3D$mp->get_parameter('ledger_target'); $acc_pay->periode=3D$tperiode; @@ -548,16 +549,17 @@ $acc_pay->poste=3D$poste; $acc_pay->qcode=3D$e_client; $acc_pay->amount=3Dabs(round($cust_amount,2)); - $acc_pay->desc=3D$e_comm; + $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($cust_amount>=3D0)?'c':'d'; + $acc_pay->type=3D($cust_amount>=3D0)?'c':'d'; $let_other=3D$acc_pay->insert_jrnx(); =20 /* insert into jrn */ + $acjrn->desc=3D$e_comm; + $acjrn->grpt_id=3D$acseq; $mp_jr_id=3D$acc_pay->insert_jrn(); - $acjrn->grpt_id=3D$acseq; $acjrn->update_internal_code($acinternal); =20 $r1=3D$this->get_id($internal); Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-18 19:= 28:46 UTC (rev 4622) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-18 20:= 08:33 UTC (rev 4623) @@ -194,10 +194,13 @@ echo tr($row); =20 } -$row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;font= -weight: bolder;" colspan=3D"5"'); + if ($owner->MY_TVA_USE=3D=3D'Y') + $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f= ont-weight: bolder;widtg:auto" colspan=3D"6"'); + else + $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;f= ont-weight: bolder;widtg:auto" colspan=3D"6"'); $row.=3Dtd(nbm($total_htva),'class=3D"num" style=3D"font-style:italic;fo= nt-weight: bolder;"'); if ($owner->MY_TVA_USE=3D=3D'Y') - $row.=3Dtd(nbm($total_tvac),'class=3D"num" style=3D"font-style:italic;= font-weight: bolder;"'); + $row.=3Dtd("").td(nbm($total_tvac),'class=3D"num" style=3D"font-style:= italic;font-weight: bolder;"'); echo tr($row); ?> 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 2011-12-18 19:= 28:46 UTC (rev 4622) +++ phpcompta/trunk/include/template/ledger_detail_fin.php 2011-12-18 20:= 08:33 UTC (rev 4623) @@ -123,6 +123,7 @@ $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']); =20 $row.=3Dtd($view_history); + if ( $q[$e]['j_qcode'] !=3D''){ $fiche=3Dnew Fiche($cn); $fiche->get_by_qcode($q[$e]['j_qcode']); @@ -132,6 +133,10 @@ else $view_history=3D''; $row.=3Dtd($view_history); + if ( $q[$e]['j_text']!=3D'') + { + $row.=3Dtd(h(strip_tags($q[$e]['j_text']))); + }else if ( $q[$e]['j_qcode'] !=3D'') { // nom de la fiche $ff=3Dnew Fiche($cn); Modified: phpcompta/trunk/include/template/ledger_detail_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-18 19= :28:46 UTC (rev 4622) +++ phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-18 20= :08:33 UTC (rev 4623) @@ -105,6 +105,7 @@ $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']); =20 $row.=3Dtd($view_history); + if ( $q[$e]['j_qcode'] !=3D'') { $fiche=3Dnew Fiche($cn); $fiche->get_by_qcode($q[$e]['j_qcode']); @@ -114,7 +115,10 @@ else $view_history=3D''; $row.=3Dtd($view_history); - + if ( $q[$e]['j_text']!=3D'') + { + $row.=3Dtd(h(strip_tags($q[$e]['j_text']))); + }else if ( $q[$e]['j_qcode'] !=3D'') { // nom de la fiche $ff=3Dnew Fiche($cn); Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-18 19:= 28:46 UTC (rev 4622) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-18 20:= 08:33 UTC (rev 4623) @@ -185,10 +185,13 @@ echo tr($row); =20 } -$row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;font= -weight: bolder;" colspan=3D"5"'); + if ($owner->MY_TVA_USE=3D=3D'Y') + $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;fon= t-weight: bolder;" colspan=3D"5"'); + else + $row=3D td(_('Total'),' style=3D"font-style:italic;text-align:right;fon= t-weight: bolder;" colspan=3D"5"'); $row.=3Dtd(nbm($total_htva),'class=3D"num" style=3D"font-style:italic;fo= nt-weight: bolder;"'); if ($owner->MY_TVA_USE=3D=3D'Y') - $row.=3Dtd(nbm($total_tvac),'class=3D"num" style=3D"font-style:italic;= font-weight: bolder;"'); + $row.=3Dtd("").td(nbm($total_tvac),'class=3D"num" style=3D"font-style:= italic;font-weight: bolder;"'); echo tr($row); ?> From MAILER-DAEMON Sun Dec 18 15:16:06 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcN9S-0002TL-D7 for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 15:16:06 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 21:19:33 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r211 - trunk/importbank/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 20:16:04 -0000 Author: danydb Date: 2011-12-18 21:19:31 +0100 (Sun, 18 Dec 2011) New Revision: 211 Modified: trunk/importbank/include/class_import_bank.php Log: cosmetic Modified: trunk/importbank/include/class_import_bank.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/importbank/include/class_import_bank.php 2011-12-18 18:52:50 UT= C (rev 210) +++ trunk/importbank/include/class_import_bank.php 2011-12-18 20:19:31 UT= C (rev 211) @@ -297,7 +297,7 @@ =20 $acc_op=3Dnew Acc_Operation($cn); $acc_op->amount=3D$row->amount; - $acc_op->desc=3D$bank_name; + $acc_op->desc=3D""; $acc_op->type=3D"d"; $acc_op->date=3D$row->tp_date; $acc_op->user=3D$p_user; @@ -312,13 +312,14 @@ =20 =20 $acc_op->type=3D"c"; - $acc_op->poste=3D$poste_comptable; + $acc_op->poste=3D""; $acc_op->desc=3D$row->tp_third." ".$row->libelle." ".$row->t= p_extra; $acc_op->amount=3D$row->amount; $acc_op->f_id=3D$row->f_id; $acc_op->qcode=3D$quick_code; $r=3D$acc_op->insert_jrnx(); =20 + $acc_op->desc=3D$row->tp_third." ".$row->libelle." ".$row->t= p_extra; $jr_id=3D$acc_op->insert_jrn(); =20 $internal=3D$fin_ledger->compute_internal_code($seq); From MAILER-DAEMON Sun Dec 18 15:23:46 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcNGs-0003VC-Jm for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 15:23:46 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 21:27:13 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r212 - trunk/importbank/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 20:23:44 -0000 Author: danydb Date: 2011-12-18 21:27:11 +0100 (Sun, 18 Dec 2011) New Revision: 212 Modified: trunk/importbank/include/class_import_bank.php Log: cosmetic Modified: trunk/importbank/include/class_import_bank.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/importbank/include/class_import_bank.php 2011-12-18 20:19:31 UT= C (rev 211) +++ trunk/importbank/include/class_import_bank.php 2011-12-18 20:27:11 UT= C (rev 212) @@ -312,8 +312,7 @@ =20 =20 $acc_op->type=3D"c"; - $acc_op->poste=3D""; - $acc_op->desc=3D$row->tp_third." ".$row->libelle." ".$row->t= p_extra; + $acc_op->poste=3D$poste_comptable; $acc_op->amount=3D$row->amount; $acc_op->f_id=3D$row->f_id; $acc_op->qcode=3D$quick_code; From MAILER-DAEMON Sun Dec 18 15:58:27 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcNoR-0006qN-8z for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 15:58:27 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 22:01:51 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4624 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 20:58:25 -0000 Author: danydb Date: 2011-12-18 22:01:50 +0100 (Sun, 18 Dec 2011) New Revision: 4624 Modified: phpcompta/trunk/include/class_todo_list.php Log: order in todo list Modified: phpcompta/trunk/include/class_todo_list.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_todo_list.php 2011-12-18 20:08:33 UTC (= rev 4623) +++ phpcompta/trunk/include/class_todo_list.php 2011-12-18 21:01:50 UTC (= rev 4624) @@ -185,7 +185,7 @@ */ public function load_all() { - $sql=3D"select tl_id, tl_title,tl_desc,to_char( tl_date,'DD.MM.Y= YYY') as tl_date + $sql=3D"select tl_id, tl_title,tl_desc,to_char( tl_date,'DD.MM.Y= YYY') as str_tl_date from todo_list where use_login=3D$1". " order by tl_date::date asc"; $res=3D$this->cn->exec_sql( From MAILER-DAEMON Sun Dec 18 16:02:26 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcNsI-00088m-Mm for mharc-phpcompta-dev@gnu.org; Sun, 18 Dec 2011 16:02:26 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 18 Dec 2011 22:05:49 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4625 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Dec 2011 21:02:25 -0000 Author: danydb Date: 2011-12-18 22:05:48 +0100 (Sun, 18 Dec 2011) New Revision: 4625 Modified: phpcompta/trunk/include/template/dashboard.php Log: order in todo list Modified: phpcompta/trunk/include/template/dashboard.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/dashboard.php 2011-12-18 21:01:50 UT= C (rev 4624) +++ phpcompta/trunk/include/template/dashboard.php 2011-12-18 21:05:48 UT= C (rev 4625) @@ -36,11 +36,11 @@ =20 foreach ($array as $row) { if ( $nb % 2 =3D=3D 0 ) $odd=3D'class=3D"odd" '; else $odd=3D'class=3D= "even" '; - if ( strcmp($today,$row['tl_date'])=3D=3D0) { $odd.=3D' style=3D"bac= kground-color:#FFEA00"';} + if ( strcmp($today,$row['str_tl_date'])=3D=3D0) { $odd.=3D' style=3D= "background-color:#FFEA00"';} $nb++; echo ''. ''. - $row['tl_date']. + $row['str_tl_date']. ''. ''. ''. From MAILER-DAEMON Mon Dec 19 04:52:34 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RcZta-0000iY-8W for mharc-phpcompta-dev@gnu.org; Mon, 19 Dec 2011 04:52:34 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 19 Dec 2011 10:55:44 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4626 - phpcompta/trunk/html/js X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Dec 2011 09:52:29 -0000 Author: danydb Date: 2011-12-19 10:55:42 +0100 (Mon, 19 Dec 2011) New Revision: 4626 Modified: phpcompta/trunk/html/js/calc.js Log: Bug cosmetic : in calculator if the formula is too long, the formula gets= out the frame Modified: phpcompta/trunk/html/js/calc.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/calc.js 2011-12-18 21:05:48 UTC (rev 4625) +++ phpcompta/trunk/html/js/calc.js 2011-12-19 09:55:42 UTC (rev 4626) @@ -38,6 +38,11 @@ try { Compute(); + p_variable=3Dp_variable.replace(/ /g,""); + p_variable=3Dp_variable.replace(/\+/g,"+ "); + p_variable=3Dp_variable.replace(/-/g,"- "); + p_variable=3Dp_variable.replace(/\//g,"/ "); + sub=3Deval(p_variable); var result=3DparseFloat(sub); result=3DMath.round(result*100)/100; @@ -49,7 +54,7 @@ } p_history=3Dp_history+'
'+p_variable; p_history+=3D"=3D"+result.toString(); - var str_sub=3D"
Total :"+p_variable+" =3D "+result.toStrin= g()+""; + var str_sub=3D"

Total :"+p_variable+" =3D "+result.toString()= +"

"; this.document.getElementById("sub_total").innerHTML=3Dstr_sub; this.document.getElementById("listing").innerHTML=3Dp_history; this.document.getElementById('inp').value=3D""; From MAILER-DAEMON Mon Dec 19 05:00:48 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rca1Y-0002Qz-5m for mharc-phpcompta-dev@gnu.org; Mon, 19 Dec 2011 05:00:48 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 19 Dec 2011 11:04:00 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4627 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Dec 2011 10:00:46 -0000 Author: danydb Date: 2011-12-19 11:03:59 +0100 (Mon, 19 Dec 2011) New Revision: 4627 Modified: phpcompta/trunk/sql/upgrade.sql Log: Update jrnx: remove comment if it is the comment in jrn table=20 Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-12-19 09:55:42 UTC (rev 4626) +++ phpcompta/trunk/sql/upgrade.sql 2011-12-19 10:03:59 UTC (rev 4627) @@ -1,28 +1 @@ -CREATE OR REPLACE FUNCTION comptaproc.get_menu_dependency(profile_menu_i= d int) - RETURNS SETOF int AS -$BODY$ -declare - i int; - x int; - e int; -begin - for x in select pm_id,me_code - from profile_menu - where me_code_dep in (select me_code from profile_menu where pm_id=3D= profile_menu_id) - and p_id =3D (select p_id from profile_menu where pm_id=3Dprofile_men= u_id) - loop - return next x; - - for e in select * from comptaproc.get_menu_dependency_pm(x) - loop - return next e; - end loop; - - end loop; - return; -end; -$BODY$ -LANGUAGE plpgsql; - -delete from profile_menu where p_id=3D2 and me_code_dep=3D'DIVPARM'; -delete from profile_menu where p_id=3D2 and me_code_dep=3D'MOD'; +update jrnx set j_text =3D null from jrn where jr_grpt_id=3Dj_grpt and j= _text=3Djr_comment; From MAILER-DAEMON Mon Dec 19 09:11:57 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rcdwb-00025w-0R for mharc-phpcompta-dev@gnu.org; Mon, 19 Dec 2011 09:11:57 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 19 Dec 2011 15:15:14 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4628 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Dec 2011 14:11:55 -0000 Author: danydb Date: 2011-12-19 15:15:12 +0100 (Mon, 19 Dec 2011) New Revision: 4628 Modified: phpcompta/trunk/include/class_acc_ledger.php Log: remove useless j_text Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-19 10:03:59 UTC = (rev 4627) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-19 14:15:12 UTC = (rev 4628) @@ -1927,7 +1927,7 @@ $acc_op->date=3D$e_date; // compute the periode is do not check it if ($check_periode =3D=3D false ) $acc_op->periode=3D$oP= eriode->p_id; - $acc_op->desc=3D$desc; + $acc_op->desc=3Dnull; if ( strlen(trim(${'ld'.$i})) !=3D 0 ) $acc_op->desc=3D${'ld'.$i}; $acc_op->amount=3Dround(${'amount'.$i},2); From MAILER-DAEMON Mon Dec 19 18:56:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rcn3o-0007su-If for mharc-phpcompta-dev@gnu.org; Mon, 19 Dec 2011 18:56:00 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 00:59:16 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4629 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Dec 2011 23:55:59 -0000 Author: danydb Date: 2011-12-20 00:59:14 +0100 (Tue, 20 Dec 2011) New Revision: 4629 Modified: phpcompta/trunk/html/style-color.css phpcompta/trunk/html/style-light.css phpcompta/trunk/html/style.css phpcompta/trunk/html/user_login.php Log: cosmetic : display 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-12-19 14:15:12 UTC (rev 462= 8) +++ phpcompta/trunk/html/style-color.css 2011-12-19 23:59:14 UTC (rev 462= 9) @@ -4,7 +4,7 @@ background-color:#EDF3FF; font-size:12px; font-family:verdana,helvetica,sans-serif; - padding: 0px 10px 0px 10px ; + padding: 0px 0px 0px 0px ; margin:0; color:blue; } @@ -805,7 +805,7 @@ =20 a#anchorbutton, .button, a.button,div.content a.button { font-size:10; - color:darkblue; + color:white; font-weight: bold; background-image: url("image/bg-submit2.gif"); text-decoration:none; @@ -1104,4 +1104,10 @@ float:left; width:40em; top:0px; -} \ No newline at end of file +=09 +} + +div.foldercontent { + width:80%; + margin-left:10%; + } \ No newline at end of file Modified: phpcompta/trunk/html/style-light.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-light.css 2011-12-19 14:15:12 UTC (rev 462= 8) +++ phpcompta/trunk/html/style-light.css 2011-12-19 23:59:14 UTC (rev 462= 9) @@ -4,7 +4,7 @@ background-color:#EDF3FF; font-size:12px; font-family:verdana,helvetica,sans-serif; - padding: 0px 10px 0px 10px ; + padding: 0px 0px 0px 0px ; margin:0; color:blue; } @@ -1099,4 +1099,7 @@ float:left; width:40em; top:0px; -} \ No newline at end of file +} +div.foldercontent { + padding:20px 30px 0px 40px; + } \ No newline at end of file Modified: phpcompta/trunk/html/style.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style.css 2011-12-19 14:15:12 UTC (rev 4628) +++ phpcompta/trunk/html/style.css 2011-12-19 23:59:14 UTC (rev 4629) @@ -4,7 +4,7 @@ background-color:#EDF3FF; font-size:12px; font-family:verdana,helvetica,sans-serif; - padding: 0px 10px 0px 10px ; + padding: 0px 0px 0px 0px ; margin:0; color:blue; } @@ -1093,4 +1093,7 @@ float:left; width:40em; top:0px; -} \ No newline at end of file +} +div.foldercontent { + padding:20px 30px 0px 40px; + } \ No newline at end of file Modified: phpcompta/trunk/html/user_login.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/user_login.php 2011-12-19 14:15:12 UTC (rev 4628= ) +++ phpcompta/trunk/html/user_login.php 2011-12-19 23:59:14 UTC (rev 4629= ) @@ -108,7 +108,9 @@ } =20 } -$result=3D""; + +$result=3D""; +$result.=3D"
"; $result.=3D''; if ( $User->Admin() =3D=3D 1 ) { @@ -120,10 +122,11 @@ $result.=3D"
"; =20 echo '

'._('Bienvenue ').$User->first_name.' '.$Us= er->name.' '._("dans PhpCompta")."

"; -echo '
'._('Choississez votre dossier'); echo '
'.$result.'
'; echo '
'; ?> +
+'._('Choississez votre dossier').'';?> "> From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4630 - phpcompta/trunk/html/tmp 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, 20 Dec 2011 12:54:19 -0000 Author: danydb Date: 2011-12-20 13:57:27 +0100 (Tue, 20 Dec 2011) New Revision: 4630 Added: phpcompta/trunk/html/tmp/.htaccess Log: Protect tmp folder Added: phpcompta/trunk/html/tmp/.htaccess =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/tmp/.htaccess (rev 0) +++ phpcompta/trunk/html/tmp/.htaccess 2011-12-20 12:57:27 UTC (rev 4630) @@ -0,0 +1,2 @@ +order deny,allow +deny from all From MAILER-DAEMON Tue Dec 20 09:13:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd0Rt-0007s1-Q4 for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 09:13:45 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 15:16:54 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4631 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 14:13:43 -0000 Author: danydb Date: 2011-12-20 15:16:52 +0100 (Tue, 20 Dec 2011) New Revision: 4631 Modified: phpcompta/trunk/html/ajax_ledger.php phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/class_document.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: #315 D?\195?\169tail article=20 Pour journaux VEN et ach on peut changer le libell?\195?\169 de la ligne,= par d?\195?\169faut, nom de la fiche. En cas de g?\195?\169n?\195?\169ra= tion de document, ce libell?\195?\169 sera utilis?\195?\169 Modified: phpcompta/trunk/html/ajax_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_ledger.php 2011-12-20 12:57:27 UTC (rev 463= 0) +++ phpcompta/trunk/html/ajax_ledger.php 2011-12-20 14:16:52 UTC (rev 463= 1) @@ -362,6 +362,12 @@ $cn->exec_sql("select comptaproc.jrn_add_note($1,$2)", array($jr_id,$_POST['jrn_note'])); $rapt=3D$_POST['rapt']; + $a_rowid=3D$_POST["j_id"]; + for ($e=3D0;$eexec_sql('update jrnx set j_text=3D$1 where j_id=3D= $2', array(strip_tags($_POST[$id]),$a_rowid[$e])); + } if (trim($rapt) !=3D '') { $rec=3Dnew Acc_Reconciliation ($cn); Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 12:5= 7:27 UTC (rev 4630) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 14:1= 6:52 UTC (rev 4631) @@ -390,6 +390,7 @@ $acc_operation->type=3D'd'; $acc_operation->periode=3D$tperiode; $acc_operation->qcode=3D""; + $acc_operation->desc=3Dstrip_tags(${"e_march".$i."_label= "}); =20 =20 =20 @@ -1068,8 +1069,7 @@ { // Code id, price & vat code //-- - $march=3D(isset(${"e_march$i"}))?${"e_march$i"}:"" - ; + $march=3D(isset(${"e_march$i"}))?${"e_march$i"}:"" = ; $march_price=3D(isset(${"e_march".$i."_price"}))?${"e_march"= .$i."_price"}:"" ; /* use vat */ @@ -1083,7 +1083,7 @@ =20 =20 =20 - $march_label=3D" "; + $march_label=3D(isset(${"e_march".$i."_label"}))?${"e_march"= .$i."_label"}:""; // retrieve the tva label and name //-- if ( strlen(trim($march))!=3D0 ) @@ -1146,7 +1146,8 @@ $htva->value=3D0; $array[$i]['htva']=3D$htva->input(); =20 - $Span=3Dnew ISpan(); + $Span=3Dnew IText("e_march".$i."_label"); + $Span->value=3D$march_label; $Span->setReadOnly(false); // card's name, price //-- @@ -1317,7 +1318,7 @@ /* retrieve information for card */ $fiche=3Dnew Fiche($this->db); $fiche->get_by_qcode(${"e_march".$i}); - $fiche_name=3Dh($fiche->getName()); + $fiche_name=3Dh(${"e_march".$i."_label"}); =20 if ( $g_parameter->MY_TVA_USE=3D=3D'Y') { Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 12:57:27= UTC (rev 4630) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 14:16:52= UTC (rev 4631) @@ -307,6 +307,7 @@ $acc_operation->jrn=3D$p_jrn; $acc_operation->type=3D'c'; $acc_operation->periode=3D$tperiode; + $acc_operation->desc=3Dstrip_tags(${"e_march".$i."_label= "}); $acc_operation->qcode=3D${"e_march".$i}; if ( $amount < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($am= ount)); =20 @@ -715,7 +716,7 @@ /* retrieve information for card */ $fiche=3Dnew Fiche($this->db); $fiche->get_by_qcode(${"e_march".$i}); - $fiche_name=3Dh($fiche->getName()); + $fiche_name=3Dh(${"e_march".$i."_label"}); if ( $g_parameter->MY_TVA_USE=3D=3D'Y') { $oTva=3Dnew Acc_Tva($this->db); @@ -1187,7 +1188,7 @@ $march_tva_amount=3D(isset(${"e_march$i"."_tva_amount"})= )?${"e_march$i"."_tva_amount"}:"" ; } - $march_label=3D' '; + $march_label=3D(isset(${"e_march".$i."_label"}))?${"e_march"= .$i."_label"}:""; =20 // retrieve the tva label and name //-- @@ -1248,7 +1249,7 @@ $array[$i]['tvac']=3D$tvac->input(); =20 =20 - $Span=3Dnew ISpan(); + $Span=3Dnew IText("e_march".$i."_label"); $Span->setReadOnly(false); // card's name, price //-- Modified: phpcompta/trunk/include/class_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document.php 2011-12-20 12:57:27 UTC (r= ev 4630) +++ phpcompta/trunk/include/class_document.php 2011-12-20 14:16:52 UTC (r= ev 4631) @@ -800,6 +800,13 @@ } else $r =3D ""; break; + case 'VEN_ART_LABEL': + extract ($_POST); + $id=3D'e_march'.$counter."_label"; + // check if the march exists + if ( ! isset (${$id})) return ""; + $r=3D${'e_march'.$counter.'_label'}; + break; =20 case 'VEN_ART_PRICE': extract ($_POST); Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 12:= 57:27 UTC (rev 4630) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 14:= 16:52 UTC (rev 4631) @@ -149,7 +149,10 @@ $tva->load(); $sym_tva=3Dh($tva->get_parameter('label')); } - $row.=3Dtd($fiche->strAttribut(ATTR_DEF_NAME)); + $l_lib=3D($q[$e]['j_text']=3D=3D'')?$fiche->strAttribut(ATTR_DEF_NAM= E):$q[$e]['j_text']; + $hidden=3DHtmlInput::hidden("j_id[]",$q[$e]['j_id']); + $input=3Dnew IText("e_march".$q[$e]['j_id']."_label",$l_lib); + $row.=3Dtd($input->input().$hidden); $row.=3Dtd($sym_tva,'style=3D"text-align:center"'); $pu=3Dbcdiv($q['qp_price'],$q['qp_quantite']); $row.=3Dtd(nbm($pu),'class=3D"num"'); Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 12:= 57:27 UTC (rev 4630) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 14:= 16:52 UTC (rev 4631) @@ -139,7 +139,10 @@ $fiche->id, $gDossier, $fiche->strAttribut(ATTR_DEF_QUICKCODE)); =20 $row=3Dtd($view_history); - $row.=3Dtd($fiche->strAttribut(ATTR_DEF_NAME)); + $l_lib=3D($q[$e]['j_text']=3D=3D'')?$fiche->strAttribut(ATTR_DEF_NAM= E):$q[$e]['j_text']; + $hidden=3DHtmlInput::hidden("j_id[]",$q[$e]['j_id']); + $input=3Dnew IText("e_march".$q[$e]['j_id']."_label",$l_lib); + $row.=3Dtd($input->input().$hidden); $sym_tva=3D''; $pu=3Dbcdiv($q['qs_price'],$q['qs_quantite']); $row.=3Dtd(nbm($pu),'class=3D"num"'); From MAILER-DAEMON Tue Dec 20 09:36:27 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd0nr-0005SR-6R for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 09:36:27 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 15:39:33 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4632 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 14:36:25 -0000 Author: danydb Date: 2011-12-20 15:39:32 +0100 (Tue, 20 Dec 2011) New Revision: 4632 Modified: phpcompta/trunk/include/class_document.php Log: #315 D?\195?\169tail article=20 VENT_ART_LABEL si vide on renvoie VEN_ART_NAME Modified: phpcompta/trunk/include/class_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document.php 2011-12-20 14:16:52 UTC (r= ev 4631) +++ phpcompta/trunk/include/class_document.php 2011-12-20 14:39:32 UTC (r= ev 4632) @@ -806,6 +806,20 @@ // check if the march exists if ( ! isset (${$id})) return ""; $r=3D${'e_march'.$counter.'_label'}; + if (strlen(trim($r)) =3D=3D 0) + { + $id =3D 'e_march' . $counter; + // check if the march exists + if (!isset(${$id})) + return ""; + // check that something is sold + if (${'e_march' . $counter . '_price'} !=3D 0 && ${'= e_quant' . $counter} !=3D 0) + { + $f =3D new Fiche($this->db); + $f->get_by_qcode(${$id}, false); + $r =3D $f->strAttribut(ATTR_DEF_NAME); + } + } break; =20 case 'VEN_ART_PRICE': From MAILER-DAEMON Tue Dec 20 09:36:56 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd0oK-0005Ta-8u for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 09:36:56 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 15:40:06 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4633 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 14:36:55 -0000 Author: danydb Date: 2011-12-20 15:40:05 +0100 (Tue, 20 Dec 2011) New Revision: 4633 Modified: phpcompta/trunk/include/class_document.php Log: #315 D?\195?\169tail article=20 VENT_ART_LABEL si vide on renvoie VEN_ART_NAME Bug : ne retourne rien=20 Modified: phpcompta/trunk/include/class_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document.php 2011-12-20 14:39:32 UTC (r= ev 4632) +++ phpcompta/trunk/include/class_document.php 2011-12-20 14:40:05 UTC (r= ev 4633) @@ -820,6 +820,7 @@ $r =3D $f->strAttribut(ATTR_DEF_NAME); } } + return $r; break; =20 case 'VEN_ART_PRICE': From MAILER-DAEMON Tue Dec 20 09:41:55 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd0t9-0005wL-79 for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 09:41:55 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 15:45:03 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4634 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 14:41:54 -0000 Author: danydb Date: 2011-12-20 15:45:01 +0100 (Tue, 20 Dec 2011) New Revision: 4634 Modified: phpcompta/trunk/include/class_document.php Log: #315 D?\195?\169tail article=20 typo Modified: phpcompta/trunk/include/class_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document.php 2011-12-20 14:40:05 UTC (r= ev 4633) +++ phpcompta/trunk/include/class_document.php 2011-12-20 14:45:01 UTC (r= ev 4634) @@ -804,9 +804,8 @@ extract ($_POST); $id=3D'e_march'.$counter."_label"; // check if the march exists - if ( ! isset (${$id})) return ""; - $r=3D${'e_march'.$counter.'_label'}; - if (strlen(trim($r)) =3D=3D 0) + =20 + if (! isset (${$id}) || (isset (${$id}) && strlen(trim(${$id= })) =3D=3D 0)) { $id =3D 'e_march' . $counter; // check if the march exists @@ -820,6 +819,8 @@ $r =3D $f->strAttribut(ATTR_DEF_NAME); } } + else + $r=3D${'e_march'.$counter.'_label'}; return $r; break; =20 From MAILER-DAEMON Tue Dec 20 09:47:23 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd0yR-0006Si-B6 for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 09:47:23 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 15:50:42 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4635 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 14:47:22 -0000 Author: danydb Date: 2011-12-20 15:50:40 +0100 (Tue, 20 Dec 2011) New Revision: 4635 Modified: phpcompta/trunk/include/class_own.php phpcompta/trunk/include/company.inc.php phpcompta/trunk/sql/upgrade.sql Log: #315 D?\195?\169tail article=20 Param?\195?\168trable dans COMPANY Modified: phpcompta/trunk/include/class_own.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_own.php 2011-12-20 14:45:01 UTC (rev 46= 34) +++ phpcompta/trunk/include/class_own.php 2011-12-20 14:50:40 UTC (rev 46= 35) @@ -104,6 +104,7 @@ $this->save('MY_CHECK_PERIODE'); $this->save('MY_DATE_SUGGEST'); $this->save('MY_ALPHANUM'); + $this->save('MY_UPDLAB'); =20 =20 } Modified: phpcompta/trunk/include/company.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/company.inc.php 2011-12-20 14:45:01 UTC (rev = 4634) +++ phpcompta/trunk/include/company.inc.php 2011-12-20 14:50:40 UTC (rev = 4635) @@ -22,6 +22,7 @@ $m->MY_TVA_USE=3D$p_tva_use; $m->MY_PJ_SUGGEST=3D$p_pj; $m->MY_ALPHANUM=3D$p_alphanum; + $m->MY_UPDLAB=3D$p_updlab; =20 $m->Update(); } @@ -40,6 +41,9 @@ =20 $alpha_num_array[0]=3Darray('value'=3D>'N','label'=3D>_('Non')); $alpha_num_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); + =20 + $updlab_array[0]=3Darray('value'=3D>'N','label'=3D>_('Non')); + $updlab_num_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); =20 $compta=3Dnew ISelect(); $compta->table=3D1; @@ -69,6 +73,10 @@ $alpha_num->value=3D$alpha_num_array; $alpha_num->selected=3D$my->MY_ALPHANUM; =20 + $updlab=3Dnew ISelect(); + $updlab->table=3D1; + $updlab->value=3D$updlab_array; + $updlab->selected=3D$my->MY_ALPHANUM; =20 // other parameters $all=3Dnew IText(); @@ -101,6 +109,7 @@ echo "".td(_("Sugg=C3=A9rer la date"),'style=3D"text-align:right= "').$date_suggest->input("p_date_suggest",$strict_array).""; echo ''.td(_('Afficher la p=C3=A9riode comptable pour =C3=A9vite= r les erreurs de date'),'style=3D"text-align:right"').$check_periode->inp= ut('p_check_periode',$strict_array).''; echo ''.td(_('Utilisez des postes comptables alphanum=C3=A9rique= '),'style=3D"text-align:right"').$alpha_num->input('p_alphanum').''; + echo ''.td(_('Changer le libell=C3=A9 des d=C3=A9tails en VEN ou= ACH'),'style=3D"text-align:right"').$updlab->input('p_updlab').''; =20 echo ""; echo HtmlInput::submit("record_company",_("Sauve")); Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-12-20 14:45:01 UTC (rev 4634) +++ phpcompta/trunk/sql/upgrade.sql 2011-12-20 14:50:40 UTC (rev 4635) @@ -1 +1,2 @@ update jrnx set j_text =3D null from jrn where jr_grpt_id=3Dj_grpt and j= _text=3Djr_comment; +insert into parameter (pr_option,pr_value) values ('MY_UPDLAB','N'); From MAILER-DAEMON Tue Dec 20 09:56:02 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd16o-0007GF-OL for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 09:56:02 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 15:59:12 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4636 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 14:56:01 -0000 Author: danydb Date: 2011-12-20 15:59:11 +0100 (Tue, 20 Dec 2011) New Revision: 4636 Modified: phpcompta/trunk/html/ajax_ledger.php phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: #315 D?\195?\169tail article=20 Param?\195?\168trable dans COMPANY, affichage diff?\195?\169rent si N ou = Y, mise ?\195?\160 jour impossible si N Modified: phpcompta/trunk/html/ajax_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_ledger.php 2011-12-20 14:50:40 UTC (rev 463= 5) +++ phpcompta/trunk/html/ajax_ledger.php 2011-12-20 14:59:11 UTC (rev 463= 6) @@ -45,6 +45,7 @@ { exit(); } + global $g_parameter; $action=3D$_REQUEST['act']; $jr_id=3D$_REQUEST['jr_id']; $div=3D$_REQUEST['div']; /* the div source and target for javascript */ @@ -362,11 +363,14 @@ $cn->exec_sql("select comptaproc.jrn_add_note($1,$2)", array($jr_id,$_POST['jrn_note'])); $rapt=3D$_POST['rapt']; - $a_rowid=3D$_POST["j_id"]; - for ($e=3D0;$eMYUPDLAB=3D=3D'Y') { - $id=3D"e_march".$a_rowid[$e]."_label"; - $cn->exec_sql('update jrnx set j_text=3D$1 where j_id=3D= $2', array(strip_tags($_POST[$id]),$a_rowid[$e])); + $a_rowid=3D$_POST["j_id"]; + for ($e=3D0;$eexec_sql('update jrnx set j_text=3D$1 where j_i= d=3D$2', array(strip_tags($_POST[$id]),$a_rowid[$e])); + } } if (trim($rapt) !=3D '') { Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 14:5= 0:40 UTC (rev 4635) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 14:5= 9:11 UTC (rev 4636) @@ -390,7 +390,10 @@ $acc_operation->type=3D'd'; $acc_operation->periode=3D$tperiode; $acc_operation->qcode=3D""; - $acc_operation->desc=3Dstrip_tags(${"e_march".$i."_label= "}); + if ( $g_parameter->MY_UPDLAB=3D=3D'Y') + $acc_operation->desc=3Dstrip_tags(${"e_march".$i."_l= abel"}); + else + $acc_operation->desc=3Dnull; =20 =20 =20 Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 14:50:40= UTC (rev 4635) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 14:59:11= UTC (rev 4636) @@ -307,7 +307,11 @@ $acc_operation->jrn=3D$p_jrn; $acc_operation->type=3D'c'; $acc_operation->periode=3D$tperiode; - $acc_operation->desc=3Dstrip_tags(${"e_march".$i."_label= "}); + if ( $g_parameter->MY_UPDLAB=3D=3D'Y') + $acc_operation->desc=3Dstrip_tags(${"e_march".$i."_l= abel"}); + else + $acc_operation->desc=3Dnull; + $acc_operation->qcode=3D${"e_march".$i}; if ( $amount < 0 ) $tot_debit=3Dbcadd($tot_debit,abs($am= ount)); =20 Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 14:= 50:40 UTC (rev 4635) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 14:= 59:11 UTC (rev 4636) @@ -149,9 +149,18 @@ $tva->load(); $sym_tva=3Dh($tva->get_parameter('label')); } - $l_lib=3D($q[$e]['j_text']=3D=3D'')?$fiche->strAttribut(ATTR_DEF_NAM= E):$q[$e]['j_text']; - $hidden=3DHtmlInput::hidden("j_id[]",$q[$e]['j_id']); - $input=3Dnew IText("e_march".$q[$e]['j_id']."_label",$l_lib); + if ($owner->MYUPDLAB =3D=3D 'Y') + { + $l_lib =3D ($q[$e]['j_text'] =3D=3D '') ? $fiche->strAttribut(AT= TR_DEF_NAME) : $q[$e]['j_text']; + $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $input =3D new IText("e_march" . $q[$e]['j_id'] . "_label", $l_l= ib); + } + else + { + $input =3D new ISpan("e_march" . $q[$e]['j_id'] . "_label"); + $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME); + } $row.=3Dtd($input->input().$hidden); $row.=3Dtd($sym_tva,'style=3D"text-align:center"'); $pu=3Dbcdiv($q['qp_price'],$q['qp_quantite']); Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 14:= 50:40 UTC (rev 4635) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 14:= 59:11 UTC (rev 4636) @@ -138,10 +138,20 @@ $view_history=3D sprintf('%s', $fiche->id, $gDossier, $fiche->strAttribut(ATTR_DEF_QUICKCODE)); =20 - $row=3Dtd($view_history); - $l_lib=3D($q[$e]['j_text']=3D=3D'')?$fiche->strAttribut(ATTR_DEF_NAM= E):$q[$e]['j_text']; - $hidden=3DHtmlInput::hidden("j_id[]",$q[$e]['j_id']); - $input=3Dnew IText("e_march".$q[$e]['j_id']."_label",$l_lib); + $row =3D td($view_history); + if ($owner->MYUPDLAB =3D=3D 'Y') + { + $l_lib =3D ($q[$e]['j_text'] =3D=3D '') ? $fiche->strAttribut(AT= TR_DEF_NAME) : $q[$e]['j_text']; + $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $input =3D new IText("e_march" . $q[$e]['j_id'] . "_label", $l_l= ib); + } + else + { + $input =3D new ISpan("e_march" . $q[$e]['j_id'] . "_label"); + $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME); + } + $row.=3Dtd($input->input().$hidden); $sym_tva=3D''; $pu=3Dbcdiv($q['qs_price'],$q['qs_quantite']); From MAILER-DAEMON Tue Dec 20 10:53:11 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd207-0001kP-EJ for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 10:53:11 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 16:56:26 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4637 - in phpcompta/trunk: include include/template sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 15:53:09 -0000 Author: danydb Date: 2011-12-20 16:56:25 +0100 (Tue, 20 Dec 2011) New Revision: 4637 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_ven.php phpcompta/trunk/sql/upgrade.sql Log: #315 D?\195?\169tail article=20 Erreur dans script SQL=20 Change MYUPDLAB par MY_UPDLAB Si MY_UPDLAB =3D=3D Y alors input sinon span Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 14:5= 9:11 UTC (rev 4636) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 15:5= 6:25 UTC (rev 4637) @@ -1149,7 +1149,14 @@ $htva->value=3D0; $array[$i]['htva']=3D$htva->input(); =20 - $Span=3Dnew IText("e_march".$i."_label"); + if ( $g_parameter->MY_UPDLAB =3D=3D 'Y') + { + $Span=3Dnew IText("e_march".$i."_label"); + $Span->size=3D45; + } else + { + $Span=3Dnew ISpan("e_march".$i."_label"); + } $Span->value=3D$march_label; $Span->setReadOnly(false); // card's name, price Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 14:59:11= UTC (rev 4636) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 15:56:25= UTC (rev 4637) @@ -1187,10 +1187,8 @@ ; 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_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_label=3D(isset(${"e_march".$i."_label"}))?${"e_march"= .$i."_label"}:""; =20 @@ -1252,8 +1250,15 @@ $tvac->value=3D0; $array[$i]['tvac']=3D$tvac->input(); =20 - - $Span=3Dnew IText("e_march".$i."_label"); + if ( $g_parameter->MY_UPDLAB =3D=3D 'Y') + { + $Span=3Dnew IText("e_march".$i."_label"); + $Span->size=3D45; + } else + { + $Span=3Dnew ISpan("e_march".$i."_label"); + } + $Span->value=3D$march_label; $Span->setReadOnly(false); // card's name, price //-- Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 14:= 59:11 UTC (rev 4636) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 15:= 56:25 UTC (rev 4637) @@ -149,7 +149,7 @@ $tva->load(); $sym_tva=3Dh($tva->get_parameter('label')); } - if ($owner->MYUPDLAB =3D=3D 'Y') + if ($owner->MY_UPDLAB =3D=3D 'Y') { $l_lib =3D ($q[$e]['j_text'] =3D=3D '') ? $fiche->strAttribut(AT= TR_DEF_NAME) : $q[$e]['j_text']; $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 14:= 59:11 UTC (rev 4636) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 15:= 56:25 UTC (rev 4637) @@ -139,7 +139,7 @@ $fiche->id, $gDossier, $fiche->strAttribut(ATTR_DEF_QUICKCODE)); =20 $row =3D td($view_history); - if ($owner->MYUPDLAB =3D=3D 'Y') + if ($owner->MY_UPDLAB =3D=3D 'Y') { $l_lib =3D ($q[$e]['j_text'] =3D=3D '') ? $fiche->strAttribut(AT= TR_DEF_NAME) : $q[$e]['j_text']; $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-12-20 14:59:11 UTC (rev 4636) +++ phpcompta/trunk/sql/upgrade.sql 2011-12-20 15:56:25 UTC (rev 4637) @@ -1,2 +1,2 @@ update jrnx set j_text =3D null from jrn where jr_grpt_id=3Dj_grpt and j= _text=3Djr_comment; -insert into parameter (pr_option,pr_value) values ('MY_UPDLAB','N'); +insert into parameter (pr_id,pr_value) values ('MY_UPDLAB','N'); From MAILER-DAEMON Tue Dec 20 11:21:57 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2Rx-0002Gl-R9 for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:21:57 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:25:04 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4638 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:21:56 -0000 Author: danydb Date: 2011-12-20 17:25:02 +0100 (Tue, 20 Dec 2011) New Revision: 4638 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/class_acc_operation.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_ven.php Log: #315 D?\195?\169tail article=20 MY_UPDLAB =3D=3D N Fix bug with j_text Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 15:5= 6:25 UTC (rev 4637) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 16:2= 5:02 UTC (rev 4638) @@ -1328,7 +1328,10 @@ /* retrieve information for card */ $fiche=3Dnew Fiche($this->db); $fiche->get_by_qcode(${"e_march".$i}); - $fiche_name=3Dh(${"e_march".$i."_label"}); + if ( $g_parameter->MY_UPDLAB=3D=3D'Y') + $fiche_name=3Dh(${"e_march".$i."_label"}); + else + $fiche_name=3D$fiche->strAttribut (ATTR_DEF_NAME); =20 if ( $g_parameter->MY_TVA_USE=3D=3D'Y') { Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 15:56:25= UTC (rev 4637) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 16:25:02= UTC (rev 4638) @@ -720,7 +720,10 @@ /* retrieve information for card */ $fiche=3Dnew Fiche($this->db); $fiche->get_by_qcode(${"e_march".$i}); - $fiche_name=3Dh(${"e_march".$i."_label"}); + if ( $g_parameter->MY_UPDLAB=3D=3D'Y') + $fiche_name=3Dh(${"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); Modified: phpcompta/trunk/include/class_acc_operation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_operation.php 2011-12-20 15:56:25 U= TC (rev 4637) +++ phpcompta/trunk/include/class_acc_operation.php 2011-12-20 16:25:02 U= TC (rev 4638) @@ -555,7 +555,7 @@ } $sql=3D"select n_text from jrn_note where jr_id=3D$1"; $this->det->note=3D$this->db->get_value($sql,array($this->jr_id)); - $this->det->note=3Dpreg_replace('/< *script/i','[script',$this->det->no= te); + $this->det->note=3Dstrip_tags($this->det->note); } } ////////////////////////////////////////////////////////////////////////= ///// @@ -602,8 +602,8 @@ { parent::get(); $sql=3D"SELECT qs_id, qs_internal, qs_fiche, qs_quantite, qs_pri= ce, qs_vat, - qs_vat_code, qs_client, qs_valid, j_id - FROM quant_sold where j_id in (select j_id from jrnx where = j_grpt=3D$1)"; + qs_vat_code, qs_client, qs_valid, j_id,j_text + FROM quant_sold join jrnx using(j_id) where j_grpt=3D$1"; $this->det->array=3D$this->db->get_array($sql,array($this->det->= jr_grpt_id)); } } @@ -627,8 +627,8 @@ parent::get(); $sql=3D"SELECT qp_id, 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_s= upplier, - qp_valid, qp_dep_priv - FROM quant_purchase where j_id in (select j_id from jrnx w= here j_grpt=3D$1)"; + qp_valid, qp_dep_priv,j_text + FROM quant_purchase join jrnx using(j_id) where j_grpt=3D$= 1"; $this->det->array=3D$this->db->get_array($sql,array($this->det->= jr_grpt_id)); } } Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 15:= 56:25 UTC (rev 4637) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 16:= 25:02 UTC (rev 4638) @@ -151,13 +151,13 @@ } if ($owner->MY_UPDLAB =3D=3D 'Y') { - $l_lib =3D ($q[$e]['j_text'] =3D=3D '') ? $fiche->strAttribut(AT= TR_DEF_NAME) : $q[$e]['j_text']; - $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $l_lib =3D ($q['j_text'] =3D=3D '') ? $fiche->strAttribut(ATTR_D= EF_NAME) : $q['j_text']; + $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']); $input =3D new IText("e_march" . $q[$e]['j_id'] . "_label", $l_l= ib); } else { - $input =3D new ISpan("e_march" . $q[$e]['j_id'] . "_label"); + $input =3D new ISpan("e_march" . $q['j_id'] . "_label"); $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME); } Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 15:= 56:25 UTC (rev 4637) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 16:= 25:02 UTC (rev 4638) @@ -141,13 +141,13 @@ $row =3D td($view_history); if ($owner->MY_UPDLAB =3D=3D 'Y') { - $l_lib =3D ($q[$e]['j_text'] =3D=3D '') ? $fiche->strAttribut(AT= TR_DEF_NAME) : $q[$e]['j_text']; - $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); - $input =3D new IText("e_march" . $q[$e]['j_id'] . "_label", $l_l= ib); + $l_lib =3D ($q['j_text'] =3D=3D '') ? $fiche->strAttribut(ATTR_D= EF_NAME) : $q['j_text']; + $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']); + $input =3D new IText("e_march" . $q['j_id'] . "_label", $l_lib); } else { - $input =3D new ISpan("e_march" . $q[$e]['j_id'] . "_label"); + $input =3D new ISpan("e_march" . $q['j_id'] . "_label"); $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME); } From MAILER-DAEMON Tue Dec 20 11:25:12 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2V6-0002jn-UJ for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:25:12 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:28:23 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4639 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:25:12 -0000 Author: danydb Date: 2011-12-20 17:28:22 +0100 (Tue, 20 Dec 2011) New Revision: 4639 Modified: phpcompta/trunk/include/template/ledger_detail_ach.php Log: #315 D?\195?\169tail article=20 MY_UPDLAB =3D=3D N Fix bug with j_text Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 16:= 25:02 UTC (rev 4638) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 16:= 28:22 UTC (rev 4639) @@ -158,7 +158,7 @@ else { $input =3D new ISpan("e_march" . $q['j_id'] . "_label"); - $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']); $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME); } $row.=3Dtd($input->input().$hidden); From MAILER-DAEMON Tue Dec 20 11:25:50 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2Vi-0002kZ-0z for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:25:50 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:29:04 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4640 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:25:49 -0000 Author: danydb Date: 2011-12-20 17:29:03 +0100 (Tue, 20 Dec 2011) New Revision: 4640 Modified: phpcompta/trunk/include/template/ledger_detail_ven.php Log: #315 D?\195?\169tail article=20 MY_UPDLAB =3D=3D N Fix bug with j_text Modified: phpcompta/trunk/include/template/ledger_detail_ven.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 16:= 28:22 UTC (rev 4639) +++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-20 16:= 29:03 UTC (rev 4640) @@ -148,7 +148,7 @@ else { $input =3D new ISpan("e_march" . $q['j_id'] . "_label"); - $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']); $input->value =3D $fiche->strAttribut(ATTR_DEF_NAME); } =20 From MAILER-DAEMON Tue Dec 20 11:29:37 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2ZN-0005t4-T8 for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:29:37 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:32:46 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4641 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:29:36 -0000 Author: danydb Date: 2011-12-20 17:32:45 +0100 (Tue, 20 Dec 2011) New Revision: 4641 Modified: phpcompta/trunk/include/company.inc.php Log: #315 D?\195?\169tail article=20 Changement Y / N Modified: phpcompta/trunk/include/company.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/company.inc.php 2011-12-20 16:29:03 UTC (rev = 4640) +++ phpcompta/trunk/include/company.inc.php 2011-12-20 16:32:45 UTC (rev = 4641) @@ -43,7 +43,7 @@ $alpha_num_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); =20 $updlab_array[0]=3Darray('value'=3D>'N','label'=3D>_('Non')); - $updlab_num_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); + $updlab_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); =20 $compta=3Dnew ISelect(); $compta->table=3D1; From MAILER-DAEMON Tue Dec 20 11:30:22 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2a6-0006uD-HS for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:30:22 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:33:27 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4642 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:30:21 -0000 Author: danydb Date: 2011-12-20 17:33:26 +0100 (Tue, 20 Dec 2011) New Revision: 4642 Modified: phpcompta/trunk/include/company.inc.php Log: #315 D?\195?\169tail article=20 Changement Y / N Modified: phpcompta/trunk/include/company.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/company.inc.php 2011-12-20 16:32:45 UTC (rev = 4641) +++ phpcompta/trunk/include/company.inc.php 2011-12-20 16:33:26 UTC (rev = 4642) @@ -76,7 +76,7 @@ $updlab=3Dnew ISelect(); $updlab->table=3D1; $updlab->value=3D$updlab_array; - $updlab->selected=3D$my->MY_ALPHANUM; + $updlab->selected=3D$my->MY_UPDLAB; =20 // other parameters $all=3Dnew IText(); From MAILER-DAEMON Tue Dec 20 11:32:44 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2cO-0007F9-Rv for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:32:44 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:35:56 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4643 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:32:43 -0000 Author: danydb Date: 2011-12-20 17:35:55 +0100 (Tue, 20 Dec 2011) New Revision: 4643 Modified: phpcompta/trunk/html/ajax_ledger.php Log: #315 D?\195?\169tail article=20 MY_UPDLAB =3D=3D Y Ajax save Modified: phpcompta/trunk/html/ajax_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_ledger.php 2011-12-20 16:33:26 UTC (rev 464= 2) +++ phpcompta/trunk/html/ajax_ledger.php 2011-12-20 16:35:55 UTC (rev 464= 3) @@ -37,6 +37,7 @@ require_once('class_acc_reconciliation.php'); require_once('class_anc_operation.php'); require_once('class_idate.php'); +require_once 'class_own.php'; /** * Check if we receive the needed data (jr_id...) */ @@ -46,6 +47,8 @@ exit(); } global $g_parameter; +=20 + $g_parameter=3Dnew Own($cn); $action=3D$_REQUEST['act']; $jr_id=3D$_REQUEST['jr_id']; $div=3D$_REQUEST['div']; /* the div source and target for javascript */ From MAILER-DAEMON Tue Dec 20 11:33:46 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2dN-0007Hr-Vn for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:33:45 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:36:57 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4644 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:33:44 -0000 Author: danydb Date: 2011-12-20 17:36:57 +0100 (Tue, 20 Dec 2011) New Revision: 4644 Modified: phpcompta/trunk/html/ajax_ledger.php Log: #315 D?\195?\169tail article=20 MY_UPDLAB =3D=3D Y Ajax save : undefined g_parameter Modified: phpcompta/trunk/html/ajax_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_ledger.php 2011-12-20 16:35:55 UTC (rev 464= 3) +++ phpcompta/trunk/html/ajax_ledger.php 2011-12-20 16:36:57 UTC (rev 464= 4) @@ -48,7 +48,7 @@ } global $g_parameter; =20 - $g_parameter=3Dnew Own($cn); +=20 $action=3D$_REQUEST['act']; $jr_id=3D$_REQUEST['jr_id']; $div=3D$_REQUEST['div']; /* the div source and target for javascript */ @@ -59,6 +59,7 @@ ajax_disconnected($div); =20 $cn=3Dnew Database(dossier::id()); +$g_parameter=3Dnew Own($cn); =20 // check if the user is valid and can access this folder $User=3Dnew User($cn); From MAILER-DAEMON Tue Dec 20 11:34:14 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd2dq-0007yP-PM for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 11:34:14 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 17:37:30 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4645 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 16:34:13 -0000 Author: danydb Date: 2011-12-20 17:37:29 +0100 (Tue, 20 Dec 2011) New Revision: 4645 Modified: phpcompta/trunk/html/ajax_ledger.php Log: #315 D?\195?\169tail article=20 MY_UPDLAB =3D=3D Y MYUPDLAB -> MY_UPDLAB Modified: phpcompta/trunk/html/ajax_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_ledger.php 2011-12-20 16:36:57 UTC (rev 464= 4) +++ phpcompta/trunk/html/ajax_ledger.php 2011-12-20 16:37:29 UTC (rev 464= 5) @@ -367,7 +367,7 @@ $cn->exec_sql("select comptaproc.jrn_add_note($1,$2)", array($jr_id,$_POST['jrn_note'])); $rapt=3D$_POST['rapt']; - if ( $g_parameter->MYUPDLAB=3D=3D'Y') + if ( $g_parameter->MY_UPDLAB=3D=3D'Y') { $a_rowid=3D$_POST["j_id"]; for ($e=3D0;$e From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4646 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 21:47:26 -0000 Author: danydb Date: 2011-12-20 22:50:40 +0100 (Tue, 20 Dec 2011) New Revision: 4646 Modified: phpcompta/trunk/html/js/acc_ledger.js 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 phpcompta/trunk/include/template/ledger_detail_ach.php Log: #350 : bug for the possibility to change label for each item in ACH and = VEN Modified: phpcompta/trunk/html/js/acc_ledger.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/acc_ledger.js 2011-12-20 16:37:29 UTC (rev 46= 45) +++ phpcompta/trunk/html/js/acc_ledger.js 2011-12-20 21:50:40 UTC (rev 46= 46) @@ -286,6 +286,7 @@ } =20 g("e_march"+nb.value+"_label").innerHTML=3D' '; + g("e_march"+nb.value+"_label").value=3D''; g("e_march"+nb.value+"_price").value=3D'0'; g("e_march"+nb.value).value=3D""; g("e_quant"+nb.value).value=3D"1"; Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-12-20 16:37:29 UTC = (rev 4645) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-12-20 21:50:40 UTC = (rev 4646) @@ -354,7 +354,7 @@ case j_debit when 't' then j_montan= t::text else ' ' end as deb_montant, case j_debit when 'f' then j_montan= t::text else ' ' end as cred_montant, j_debit as debit,j_poste as poste,j= r_montant , ". - "coalesce(j_text,pcm_lib) as descri= ption,j_grpt as grp, + "case when j_text=3D'' or j_text is= null then pcm_lib else j_text end as description,j_grpt as grp, jr_comment||' ('||jr_internal||')' = as jr_comment, jr_pj_number, j_qcode, @@ -374,7 +374,7 @@ case j_debit when 't' then j_montan= t::text else ' ' end as deb_montant, case j_debit when 'f' then j_montan= t::text else ' ' end as cred_montant, j_debit as debit,j_poste as poste,"= . - "coalesce(j_text,pcm_lib) as descri= ption,j_grpt as grp, + "case when j_text=3D'' or j_text is= null then pcm_lib else j_text end as description,j_grpt as grp, jr_comment||' ('||jr_internal||')' = as jr_comment, jr_pj_number, jr_montant, @@ -409,7 +409,7 @@ $tot_op=3D$line['jr_montant']; =20 /* Check first if there is a quickcode */ - if ( strlen(trim($line['j_qcode'])) !=3D 0 ) + if (strlen(trim($line['description']))=3D=3D0 && strlen(tri= m($line['j_qcode'])) !=3D 0 ) { if ( $fiche->get_by_qcode($line['j_qcode'],false) =3D=3D= 0 ) { Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 16:3= 7:29 UTC (rev 4645) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-20 21:5= 0:40 UTC (rev 4646) @@ -1490,6 +1490,7 @@ 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' ) { Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 16:37:29= UTC (rev 4645) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-20 21:50:40= UTC (rev 4646) @@ -902,6 +902,7 @@ 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') { Modified: phpcompta/trunk/include/compta_ach.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ach.inc.php 2011-12-20 16:37:29 UTC (r= ev 4645) +++ phpcompta/trunk/include/compta_ach.inc.php 2011-12-20 21:50:40 UTC (r= ev 4646) @@ -141,7 +141,7 @@ /* Save the additional information into jrn_info */ $obj =3D new Acc_Ledger_Info($cn); $obj->save_extra($Ledger->jr_id, $_POST); - printf('%s
', $jr_id, dossier::id(), $internal); + printf('%s
', $jr_id, dossier::id(), $internal); // Feedback echo $Ledger->confirm($_POST, true); echo '
'; Modified: phpcompta/trunk/include/compta_ven.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ven.inc.php 2011-12-20 16:37:29 UTC (r= ev 4645) +++ phpcompta/trunk/include/compta_ven.inc.php 2011-12-20 21:50:40 UTC (r= ev 4646) @@ -149,7 +149,7 @@ echo '

'._('Attention num=C3=A9ro p= i=C3=A8ce existante, elle a du =C3=AAtre adapt=C3=A9e').'

'; } =20 - printf ('%s
', + printf ('%s
', $jr_id,dossier::id(),$internal); echo $Ledger->confirm($_POST,true); /* Show link for Invoice */ Modified: phpcompta/trunk/include/template/ledger_detail_ach.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 16:= 37:29 UTC (rev 4645) +++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-20 21:= 50:40 UTC (rev 4646) @@ -153,7 +153,7 @@ { $l_lib =3D ($q['j_text'] =3D=3D '') ? $fiche->strAttribut(ATTR_D= EF_NAME) : $q['j_text']; $hidden =3D HtmlInput::hidden("j_id[]", $q['j_id']); - $input =3D new IText("e_march" . $q[$e]['j_id'] . "_label", $l_l= ib); + $input =3D new IText("e_march" . $q['j_id'] . "_label", $l_lib); } else { From MAILER-DAEMON Tue Dec 20 17:10:25 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rd7tB-0005q6-UG for mharc-phpcompta-dev@gnu.org; Tue, 20 Dec 2011 17:10:25 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 20 Dec 2011 23:13:11 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r213 - in trunk/coprop: . 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 22:10:23 -0000 Author: danydb Date: 2011-12-20 23:13:09 +0100 (Tue, 20 Dec 2011) New Revision: 213 Added: trunk/coprop/include/class_copro_lot.php trunk/coprop/include/template/coprop_lot_add.php trunk/coprop/include/template/coprop_lot_list.php Removed: trunk/coprop/include/template/list_copro_lot.php Modified: trunk/coprop/ajax.php trunk/coprop/coprop-javascript.js trunk/coprop/include/lot.inc.php Log: Copro Modified: trunk/coprop/ajax.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/ajax.php 2011-12-18 20:27:11 UTC (rev 212) +++ trunk/coprop/ajax.php 2011-12-20 22:13:09 UTC (rev 213) @@ -7,9 +7,10 @@ $html=3D'';$extra=3D'';$ctl=3D''; ob_start(); switch($act) { -case 'dsp_decl': + // ajout un lien copro + lot +case 'addcopro': /* the hide button */ - require_once('include/ajax_dsp.php'); + require_once('include/ajax_add_copro_lot.php'); break; default: =20 Modified: trunk/coprop/coprop-javascript.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/coprop-javascript.js 2011-12-18 20:27:11 UTC (rev 212) +++ trunk/coprop/coprop-javascript.js 2011-12-20 22:13:09 UTC (rev 213) @@ -23,13 +23,27 @@ { try { - alert('Modifier un copropri=C3=A9taire et ses lots'); + $('listcoprolot').hide(); + $('ajoutcopro').show(); } catch(e) { alert(e.message); } } +function copro_show_list() +{ + try + { + $('listcoprolot').show(); + $('ajoutcopro').hide(); + } + catch(e) + { + alert(e.message); + } + +} /** * Ajout clef + tanti=C3=A8me lot associ=C3=A9s */ Added: trunk/coprop/include/class_copro_lot.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/class_copro_lot.php (rev= 0) +++ trunk/coprop/include/class_copro_lot.php 2011-12-20 22:13:09 UTC (rev= 213) @@ -0,0 +1,36 @@ + Modified: trunk/coprop/include/lot.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/lot.inc.php 2011-12-18 20:27:11 UTC (rev 212) +++ trunk/coprop/include/lot.inc.php 2011-12-20 22:13:09 UTC (rev 213) @@ -27,6 +27,19 @@ * */ global $cn,$g_copro_parameter; +if ( isset($_POST['copro_new'])) +{ + var_dump($_POST); + $cp=3Dnew Copro_List(); + try + { + $cp->insert($_POST); + } + catch(Exception $e) + { + echo $e->getTraceAsString(); + } +} //require_once 'include/class_coprop-lot_coprop.php'; /* Add button */ $f_add_button=3Dnew IButton('add_card'); @@ -56,11 +69,14 @@ (select ad_value from fiche_detail where f_id=3Djcl_lot and ad_id=3D23)= as lot_qcode from coprop.jnt_coprop_lot where jcl_id=3D$1"); =20 echo $f_add_button->input(); -require_once 'template/list_copro_lot.php'; +echo '
'; +require_once 'template/coprop_lot_list.php'; +echo '
'; + +echo '
'; +require_once('template/coprop_lot_add.php'); + +echo '
'; echo $f_add_button->input(); -/** - * @todo - * Bouton pour ajouter une fiche de lot ou copro (comme dans menu ach/ve= n...) - */ =20 ?> Added: trunk/coprop/include/template/coprop_lot_add.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/coprop_lot_add.php = (rev 0) +++ trunk/coprop/include/template/coprop_lot_add.php 2011-12-20 22:13:09 = UTC (rev 213) @@ -0,0 +1,127 @@ +label=3D"Copropri=C3=A9taire : ".HtmlInput::infobulle(0) ; + $copro->name=3D"w_copro"; + $copro->tabindex=3D1; + $copro->value=3D""; + $copro->table=3D0; + + // name of the field to update with the name of the card + $copro->set_attribute('label','w_copro_label'); + // Type of card : deb, cred, + $copro->set_attribute('typecard',$g_copro_parameter->categorie_coprop)= ; + + $copro->extra=3D$g_copro_parameter->categorie_coprop; + +// Add the callback function to filter the card on the jrn + $copro->set_callback('filter_card'); + $copro->set_attribute('ipopup','ipopcard'); +// when value selected in the autcomplete + $copro->set_function('fill_data'); + +// when the data change + $copro->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\');= " ', + $copro->name); + $copro->set_dblclick("fill_ipopcard(this);"); + + $copro_label=3Dnew ISpan(); + $copro_label->table=3D0; + $f_copro=3D$copro_label->input("w_copro_label",""); + +// Search button for card + $f_copro_bt=3D$copro->search(); + + +echo 'input(); +echo $f_copro_bt; +echo $f_copro; +echo HtmlInput::hidden('p_jrn',$g_copro_parameter->journal_appel); +echo HtmlInput::hidden('ledger_type','ODS'); +?> + + + + + +label=3D"Lot : ".HtmlInput::infobulle(0) ; + $lot->name=3D"w_lot".$i; + $lot->tabindex=3D1; + $lot->value=3D""; + $lot->table=3D0; + + // name of the field to update with the name of the card + $lot->set_attribute('label','w_lot_label'.$i); + // Type of card : deb, cred, + $lot->set_attribute('typecard',$g_copro_parameter->categorie_lot); + + $lot->extra=3D$g_copro_parameter->categorie_lot; + +// Add the callback function to filter the card on the jrn + $lot->set_callback('filter_card'); + $lot->set_attribute('ipopup','ipopcard'); +// when value selected in the autcomplete + $lot->set_function('fill_data'); + +// when the data change + $lot->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\');" = ', + $lot->name); + $lot->set_dblclick("fill_ipopcard(this);"); + + $lot_label=3Dnew ISpan(); + $lot_label->table=3D0; + $f_lot=3D$lot_label->input("w_lot_label".$i,""); + +// Search button for card + $f_lot_bt=3D$lot->search(); + $num=3Dnew INum("lot_per".$i); +?> + + + + + + +
LotPourcentage
+ + input()?> + + input()?> + + + +
+ + + Added: trunk/coprop/include/template/coprop_lot_list.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/coprop_lot_list.php = (rev 0) +++ trunk/coprop/include/template/coprop_lot_list.php 2011-12-20 22:13:09= UTC (rev 213) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + +
Nom copropri=C3=A9taire + Lot(s) +
+ execute('lot',$a_copro[$i]['jcl_id']); + $max=3DDatabase::num_row($rlot); + $sp=3D""; + for ($e=3D0;$e<$max;$e++): + $row=3DDatabase::fetch_array($rlot,$e); + $js_lot=3DHtmlInput::card_detail($row['lot_qcode'],$row['lot_name'])= ; + echo $js_lot.$sp; + $sp=3D" , "; + endfor; + ?> + +
+ \ No newline at end of file Deleted: trunk/coprop/include/template/list_copro_lot.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/list_copro_lot.php 2011-12-18 20:27:11 = UTC (rev 212) +++ trunk/coprop/include/template/list_copro_lot.php 2011-12-20 22:13:09 = UTC (rev 213) @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - -
Nom copropri=C3=A9taire - Lot(s) -
- execute('lot',$a_copro[$i]['jcl_id']); - $max=3DDatabase::num_row($rlot); - $sp=3D""; - for ($e=3D0;$e<$max;$e++): - $row=3DDatabase::fetch_array($rlot,$e); - $js_lot=3DHtmlInput::card_detail($row['lot_qcode'],$row['lot_name'])= ; - echo $js_lot.$sp; - $sp=3D" , "; - endfor; - ?> - -
- \ No newline at end of file From MAILER-DAEMON Wed Dec 21 06:09:40 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RdK3I-0003Ir-EE for mharc-phpcompta-dev@gnu.org; Wed, 21 Dec 2011 06:09:40 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 21 Dec 2011 12:12:39 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4647 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2011 11:09:39 -0000 Author: danydb Date: 2011-12-21 12:12:32 +0100 (Wed, 21 Dec 2011) New Revision: 4647 Modified: phpcompta/trunk/html/ajax_ledger.php phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/template/ledger_detail_bottom.php phpcompta/trunk/include/template/ledger_detail_misc.php Log: #315 D?\195?\169tail article=20 fix small bug Protect search against sql attack Modified: phpcompta/trunk/html/ajax_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_ledger.php 2011-12-20 21:50:40 UTC (rev 464= 6) +++ phpcompta/trunk/html/ajax_ledger.php 2011-12-21 11:12:32 UTC (rev 464= 7) @@ -367,7 +367,8 @@ $cn->exec_sql("select comptaproc.jrn_add_note($1,$2)", array($jr_id,$_POST['jrn_note'])); $rapt=3D$_POST['rapt']; - if ( $g_parameter->MY_UPDLAB=3D=3D'Y') + =20 + if ( $g_parameter->MY_UPDLAB=3D=3D'Y' && isset ($_POST['j_id= '])) { $a_rowid=3D$_POST["j_id"]; for ($e=3D0;$e + + jr_id=3D$jr_id; $aRap=3D$oRap->get(); Modified: phpcompta/trunk/include/template/ledger_detail_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-20 21= :50:40 UTC (rev 4646) +++ phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-21 11= :12:32 UTC (rev 4647) @@ -115,20 +115,34 @@ else $view_history=3D''; $row.=3Dtd($view_history); - if ( $q[$e]['j_text']!=3D'') +$l_lib =3D $q[$e]['j_text'] ; + =20 + if ( $l_lib!=3D'') { - $row.=3Dtd(h(strip_tags($q[$e]['j_text']))); - }else - if ( $q[$e]['j_qcode'] !=3D'') { + $l_lib=3D$q[$e]['j_text']; + } + else if ( $q[$e]['j_qcode'] !=3D'') { // nom de la fiche $ff=3Dnew Fiche($cn); $ff->get_by_qcode( $q[$e]['j_qcode']); - $row.=3Dtd(h($ff->strAttribut(ATTR_DEF_NAME))); + $l_lib=3D$ff->strAttribut(ATTR_DEF_NAME); } else { // libell=C3=A9 du compte $name=3D$cn->get_value('select pcm_lib from tmp_pcmn where pcm_val= =3D$1',array($q[$e]['j_poste'])); - $row.=3Dtd(h($name)); + $l_lib=3D$name; } + $l_lib=3Dstrip_tags($l_lib); + if ($owner->MY_UPDLAB =3D=3D 'Y') + { + $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + $input =3D new IText("e_march" . $q[$e]['j_id'] . "_label", $l_l= ib); + } + else + { + $input =3D new ISpan("e_march" . $q[$e]['j_id'] . "_label"); + $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); + } + $row.=3Dtd($input->input().$hidden); $montant=3Dtd(nbm($q[$e]['j_montant']),'class=3D"num"'); $row.=3D($q[$e]['j_debit']=3D=3D't')?$montant:td(''); $row.=3D($q[$e]['j_debit']=3D=3D'f')?$montant:td(''); From MAILER-DAEMON Wed Dec 21 16:27:05 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RdTgn-000486-7l for mharc-phpcompta-dev@gnu.org; Wed, 21 Dec 2011 16:27:05 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 21 Dec 2011 22:30:11 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4648 - in phpcompta/trunk: html html/js include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2011 21:27:03 -0000 Author: danydb Date: 2011-12-21 22:30:09 +0100 (Wed, 21 Dec 2011) New Revision: 4648 Modified: phpcompta/trunk/html/ajax_card.php phpcompta/trunk/html/fid.php phpcompta/trunk/html/js/card.js phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/class_document.php phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/class_print_ledger_detail.php phpcompta/trunk/include/template/detail-action.php phpcompta/trunk/include/template/ledger_detail_fin.php Log: fix cosmetic bug : 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-12-21 11:12:32 UTC (rev 4647) +++ phpcompta/trunk/html/ajax_card.php 2011-12-21 21:30:09 UTC (rev 4648) @@ -234,7 +234,7 @@ /* we filter thanks a given model of card */ if ( isset($cat)) { - $sql=3D$sql.sprintf(' where frd_id =3D '.sql_string ($cat)); + $sql=3D$sql.sprintf(' where frd_id in ('.sql_string ($cat).'= )'); } else /* we filter thanks a given list of category of card Modified: phpcompta/trunk/html/fid.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/fid.php 2011-12-21 11:12:32 UTC (rev 4647) +++ phpcompta/trunk/html/fid.php 2011-12-21 21:30:09 UTC (rev 4648) @@ -135,7 +135,7 @@ /* store the answer in an array and transform it later into a JSON o= bject */ $tmp=3Darray(); $tmp[]=3Darray('flabel',$fLabel); - $tmp[]=3Darray('name',h($name)); + $tmp[]=3Darray('name',$name); $tmp[]=3Darray('ftva_id',$fTva_id); $tmp[]=3Darray('tva_id',$tva_id); $tmp[]=3Darray('fPrice_sale',$fPrice_sale); 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-12-21 11:12:32 UTC (rev 4647) +++ phpcompta/trunk/html/js/card.js 2011-12-21 21:30:09 UTC (rev 4648) @@ -409,7 +409,7 @@ sx=3Ddocument.body.scrollTop+60; } =20 - var str_style=3D"top:"+sx+";left:25%;width:50%;height:auto"; + var str_style=3D"top:"+sx+";left:25%;width:50%;height:30%"; =20 var popup=3D{'id': content,'cssclass':'inner_box','style':str_style= ,'html':loading(),'drag':true}; =20 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-21 11:1= 2:32 UTC (rev 4647) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-21 21:3= 0:09 UTC (rev 4648) @@ -1089,7 +1089,7 @@ $march_label=3D(isset(${"e_march".$i."_label"}))?${"e_march"= .$i."_label"}:""; // retrieve the tva label and name //-- - if ( strlen(trim($march))!=3D0 ) + if ( strlen(trim($march))!=3D0 && strlen(trim($march_label)= )=3D=3D0 ) { $fMarch=3Dnew Fiche($this->db); $fMarch->get_by_qcode($march); Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-21 11:12:32= UTC (rev 4647) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-21 21:30:09= UTC (rev 4648) @@ -1198,7 +1198,7 @@ =20 // retrieve the tva label and name //-- - if ( strlen(trim($march))!=3D0 ) + if ( strlen(trim($march))!=3D0 && strlen(trim($march_label))= =3D=3D0) { $fMarch=3Dnew Fiche($this->db); $fMarch->get_by_qcode($march); Modified: phpcompta/trunk/include/class_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document.php 2011-12-21 11:12:32 UTC (r= ev 4647) +++ phpcompta/trunk/include/class_document.php 2011-12-21 21:30:09 UTC (r= ev 4648) @@ -66,8 +66,8 @@ /*! * \brief Generate the document, Call $this-\>Replace to replace * tag by value - * =20 * + * * \return an array : the url where the generated doc can be found, = the name * of the file and his mimetype */ @@ -108,7 +108,7 @@ $zip->extractTo($dirname.DIRECTORY_SEPARATOR); $zip->close(); } else { - echo __FILE__.":".__LINE__."cannot unzip model ".$filename;=09 + echo __FILE__.":".__LINE__."cannot unzip model ".$filename; } =20 // Remove the file we do not need anymore @@ -154,7 +154,7 @@ =20 /*! ParseDocument * \brief This function parse a document and replace all - * the predefined tags by a value. This functions=20 + * the predefined tags by a value. This functions * generate diffent documents (invoice, order, letter) * with the info from the database * @@ -169,7 +169,7 @@ * - MY_* table parameter * - ART_VEN* table quant_sold for invoice * - CUST_* table quant_sold and fiche for invoice - * - e_* for the invoice in the $_POST=20 + * - e_* for the invoice in the $_POST */ // open the document $infile_name=3D$p_dir.DIRECTORY_SEPARATOR.$p_file; @@ -223,7 +223,7 @@ while ( preg_match_all ($regex,$buffer,$f) >0 ) { =20 - =20 + foreach ( $f as $apattern ) { =20 @@ -276,8 +276,8 @@ /*! SaveGenerated * \brief Save the generated Document * \param $p_file is the generated file - *=20 * + * * \return 0 if no error otherwise 1 */ function SaveGenerated($p_file) @@ -307,7 +307,7 @@ return 0; } /*! Upload - * \brief Upload a file into document=20 + * \brief Upload a file into document * all the needed data are in $_FILES we don't increment the seq * \param $p_file : array containing by default $_FILES * @@ -447,7 +447,7 @@ } /*! * \brief replace the TAG by the real value, this value can be into - * the database or in $_POST=20 + * the database or in $_POST * The possible tags are * - [CUST_NAME] customer's name * - [CUST_ADDR_1] customer's address line 1 @@ -456,7 +456,7 @@ * - [CUST_CITY] customer's city * - [CUST_VAT] customer's VAT * - [MARCH_NEXT] end this item and increment the counter $i - * - [DATE_LIMIT]=20 + * - [DATE_LIMIT] * - [VEN_ART_NAME] * - [VEN_ART_PRICE] * - [VEN_ART_QUANT] @@ -804,13 +804,13 @@ extract ($_POST); $id=3D'e_march'.$counter."_label"; // check if the march exists - =20 + if (! isset (${$id}) || (isset (${$id}) && strlen(trim(${$id= })) =3D=3D 0)) { $id =3D 'e_march' . $counter; // check if the march exists if (!isset(${$id})) - return ""; + $r=3D ""; // check that something is sold if (${'e_march' . $counter . '_price'} !=3D 0 && ${'= e_quant' . $counter} !=3D 0) { @@ -818,10 +818,11 @@ $f->get_by_qcode(${$id}, false); $r =3D $f->strAttribut(ATTR_DEF_NAME); } + else + $r=3D""; } else $r=3D${'e_march'.$counter.'_label'}; - return $r; break; =20 case 'VEN_ART_PRICE': Modified: phpcompta/trunk/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-12-21 11:12:32 UTC (rev = 4647) +++ phpcompta/trunk/include/class_fiche.php 2011-12-21 21:30:09 UTC (rev = 4648) @@ -758,7 +758,7 @@ try { =20 - if (isNumber($v) =3D=3D 1 || strpos($v,',') !=3D= 0) + if ( strlen(trim($v)) !=3D 0) { $parameter=3Darray($this->id,$v); } 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 2011-12-21 11:1= 2:32 UTC (rev 4647) +++ phpcompta/trunk/include/class_print_ledger_detail.php 2011-12-21 21:3= 0:09 UTC (rev 4648) @@ -81,10 +81,10 @@ =20 $this->SetFont('DejaVu','BI',7); $this->Cell(215,7,'report D=C3=A9bit',0,0,'R'); - $this->Cell(30,7,sprintf('%10.2f',$rap_deb),0,0,'R'); + $this->Cell(30,7,nbm($rap_deb),0,0,'R'); $this->Ln(4); $this->Cell(215,7,'report Cr=C3=A9dit',0,0,'R'); - $this->Cell(30,7,sprintf('%10.2f',$rap_cred),0,0,'R'); + $this->Cell(30,7,nbm($rap_cred),0,0,'R'); $this->Ln(4); =20 // print all operation @@ -101,7 +101,8 @@ =20 $this->Ln(4); // get the entries - $aEntry=3D$this->cn->get_array("select j_id,j_poste,j_qcode,= j_montant,j_debit, ". + $aEntry=3D$this->cn->get_array("select j_id,j_poste,j_qcode,= j_montant,j_debit, j_text,". + " case when j_text=3D'' or j_text is null then pcm_lib else j= _text end as desc,". " pcm_lib ". " from jrnx join tmp_pcmn on (j= _poste=3Dpcm_val) where j_grpt =3D $1". " order by j_debit desc,j_id", @@ -115,7 +116,7 @@ $this->Cell(23,6,$entry['j_poste'],0,0,'R'); =20 // if j_qcode is not empty retrieve name - if ( $entry['j_qcode'] !=3D '') + if ( $entry['j_text'] =3D=3D'' && $entry['j_qcode'] !=3D= '') { $f_id=3D$this->cn->get_value('select f_id from vw_po= ste_qcode where j_qcode=3D$1',array($entry['j_qcode'])); if ($f_id !=3D '') @@ -125,7 +126,7 @@ $name=3D$entry['pcm_lib']; } else - $name=3D$entry['pcm_lib']; + $name=3D$entry['desc']; $this->Cell(150,6,$name,0,0,'L'); =20 // print amount 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 2011-12-21 11:12:3= 2 UTC (rev 4647) +++ phpcompta/trunk/include/template/detail-action.php 2011-12-21 21:30:0= 9 UTC (rev 4648) @@ -210,7 +210,7 @@ =20
- " onclick=3D"compute_all_purchase();" type=3D"button"> + " onclick=3D"compute_all_ledger();" type=3D"button"> =20

0.0 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 2011-12-21 11:= 12:32 UTC (rev 4647) +++ phpcompta/trunk/include/template/ledger_detail_fin.php 2011-12-21 21:= 30:09 UTC (rev 4648) @@ -27,9 +27,9 @@ det->array[0]['qf_bank']); -$view_history=3D sprintf('%s', +$view_history=3D sprintf('%s', $bk->id, $gDossier, $bk->get_quick_code()); -echo td(h($bk->getName())).td($view_history);; +echo td('Compte en banque').td(h($bk->getName())).td($view_history);; =20 ?> @@ -37,9 +37,9 @@ det->array[0]['qf_other']); -$view_history=3D sprintf('%s', +$view_history=3D sprintf('%s', $bk->id, $gDossier, $bk->get_quick_code()); -echo td(h($bk->getName())); +echo td('Tiers').td(h($bk->getName())); echo td($view_history); ?> @@ -49,7 +49,7 @@ $itext=3Dnew IText('lib'); $itext->value=3Dstrip_tags($obj->det->jr_comment); $itext->size=3D40; - echo td(_('Libell=C3=A9')).td($itext->input()); + echo td(_('Libell=C3=A9')).td($itext->input(),' colspan=3D"2" style=3D= "width:auto"'); =20 =20 ?> From MAILER-DAEMON Wed Dec 21 16:29:49 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RdTjR-0004bu-AS for mharc-phpcompta-dev@gnu.org; Wed, 21 Dec 2011 16:29:49 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 21 Dec 2011 22:33:04 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4649 - phpcompta/trunk/html/admin/sql/patch X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2011 21:29:48 -0000 Author: danydb Date: 2011-12-21 22:33:03 +0100 (Wed, 21 Dec 2011) New Revision: 4649 Modified: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql Log: add script for #350 Modified: phpcompta/trunk/html/admin/sql/patch/upgrade99.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/admin/sql/patch/upgrade99.sql 2011-12-21 21:30:0= 9 UTC (rev 4648) +++ phpcompta/trunk/html/admin/sql/patch/upgrade99.sql 2011-12-21 21:33:0= 3 UTC (rev 4649) @@ -37,6 +37,9 @@ qp_dep_priv=3D(-1)*qp_dep_priv where qp_quantite < 0 and qp_price > 0 and qp_vat >=3D 0; =20 +update jrnx set j_text =3D null from jrn where jr_grpt_id=3Dj_grpt and j= _text=3Djr_comment; +insert into parameter (pr_id,pr_value) values ('MY_UPDLAB','N'); + update version set val=3D100; =20 commit; \ No newline at end of file From MAILER-DAEMON Wed Dec 21 16:49:54 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RdU2s-0001cQ-78 for mharc-phpcompta-dev@gnu.org; Wed, 21 Dec 2011 16:49:54 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 21 Dec 2011 22:53:07 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4650 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2011 21:49:52 -0000 Author: danydb Date: 2011-12-21 22:53:06 +0100 (Wed, 21 Dec 2011) New Revision: 4650 Modified: phpcompta/trunk/include/class_user.php Log: cosmetic 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-12-21 21:33:03 UTC (rev 4= 649) +++ phpcompta/trunk/include/class_user.php 2011-12-21 21:53:06 UTC (rev 4= 650) @@ -919,9 +919,10 @@ =20 $result.=3D""; =20 + $result.=3Dtd($id,' class=3D"num" '); $result.=3D""; $result.=3D""; - $result.=3D$id . " " . h($name) . ""; + $result.=3D " " . h($name) . ""; $result.=3D""; $result.=3D""; $desc =3D ($desc =3D=3D "") ? "Aucune description" : h($desc); From MAILER-DAEMON Wed Dec 21 18:25:37 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RdVXV-0005CE-93 for mharc-phpcompta-dev@gnu.org; Wed, 21 Dec 2011 18:25:37 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 22 Dec 2011 00:28:48 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4651 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2011 23:25:35 -0000 Author: danydb Date: 2011-12-22 00:28:46 +0100 (Thu, 22 Dec 2011) New Revision: 4651 Modified: phpcompta/trunk/include/template/ledger_detail_misc.php Log: cosmetic in detail ledger_misc Modified: phpcompta/trunk/include/template/ledger_detail_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-21 21= :53:06 UTC (rev 4650) +++ phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-21 23= :28:46 UTC (rev 4651) @@ -115,8 +115,8 @@ else $view_history=3D''; $row.=3Dtd($view_history); -$l_lib =3D $q[$e]['j_text'] ; - =20 + $l_lib =3D $q[$e]['j_text'] ; + if ( $l_lib!=3D'') { $l_lib=3D$q[$e]['j_text']; @@ -140,6 +140,7 @@ else { $input =3D new ISpan("e_march" . $q[$e]['j_id'] . "_label"); + $input->value=3D$l_lib; $hidden =3D HtmlInput::hidden("j_id[]", $q[$e]['j_id']); } $row.=3Dtd($input->input().$hidden); From MAILER-DAEMON Thu Dec 22 04:56:27 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RdfNz-0000Yk-AR for mharc-phpcompta-dev@gnu.org; Thu, 22 Dec 2011 04:56:27 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 22 Dec 2011 10:59:30 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4652 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 09:56:26 -0000 Author: danydb Date: 2011-12-22 10:59:28 +0100 (Thu, 22 Dec 2011) New Revision: 4652 Modified: phpcompta/trunk/include/class_follow_up.php Log: Bug : document display twice if there 2 kind of the type of document Modified: phpcompta/trunk/include/class_follow_up.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_follow_up.php 2011-12-21 23:28:46 UTC (= rev 4651) +++ phpcompta/trunk/include/class_follow_up.php 2011-12-22 09:59:28 UTC (= rev 4652) @@ -679,10 +679,9 @@ =20 $sql=3D" select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as my_date,= ag_ref_ag_id,f_id_dest". - ",ag_title,md_type,dt_value,ag_ref, ag_priority,ag_state, + ",ag_title,dt_value,ag_ref, ag_priority,ag_state, (select ad_value from fiche_Detail where f_id=3Daction_gestion.f_id_= dest and ad_id=3D1) as name from action_gestion - left outer join document_modele on (ag_type=3Dmd_type) join document_type on (ag_type=3Ddt_id) where $p_filter_doc $p_search $sort"; $max_line=3D$this->db->count_sql($sql); From MAILER-DAEMON Fri Dec 23 21:32:21 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ReHPJ-00028G-Hf for mharc-phpcompta-dev@gnu.org; Fri, 23 Dec 2011 21:32:21 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 24 Dec 2011 03:35:19 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4653 - in phpcompta/trunk: doc 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Dec 2011 02:32:20 -0000 Author: danydb Date: 2011-12-24 03:35:18 +0100 (Sat, 24 Dec 2011) New Revision: 4653 Added: phpcompta/trunk/include/template/action-reference.php Modified: phpcompta/trunk/doc/manuel-fr.odt phpcompta/trunk/include/action.common.inc.php phpcompta/trunk/include/action.inc.php phpcompta/trunk/include/class_follow_up.php Log: documentation Add #495 possibilit?\195?\169 d'ajouter et enlever des actions d?\195?\16= 9pendantes Modified: phpcompta/trunk/doc/manuel-fr.odt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/action.common.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.common.inc.php 2011-12-22 09:59:28 UTC= (rev 4652) +++ phpcompta/trunk/include/action.common.inc.php 2011-12-24 02:35:18 UTC= (rev 4653) @@ -38,6 +38,7 @@ $supl_hidden.=3DHtmlInput::hidden('sb',$_REQUEST['sb']); $supl_hidden.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); =20 + /*----------------------------------------------------------------------= ----- */ /* We ask to generate the document */ /*----------------------------------------------------------------------= ----- */ @@ -49,6 +50,7 @@ { $act->save(); $ag_id=3D$act->ag_id; + } else { @@ -82,19 +84,16 @@ { $act2=3Dnew Follow_Up($cn); $act2->fromArray($_POST ); - - if ( $act2->Update() =3D=3D false ) - { - $sub_action=3D"detail"; - } - else - { - $url=3D"?$base&sa=3Ddetail&ag_id=3D".$act2->ag_id.'&'.dossie= r::get(); - echo '

'.hb(_('Actio= n sauv=C3=A9e').' : '.$act2->ag_ref).'

'; - - ShowActionList($cn,$base); - echo '

'.hb(_('Actio= n sauv=C3=A9e').' : '.$act2->ag_ref).'

'; - } + $sub_action=3D"detail"; + if ( $_POST["new_ref"] !=3D "0") + { + $act2->add_depend($_POST['new_ref']); + } + if ( isset ($_POST['sup_dep'])) + { + $act2->suppress_depend($_POST['sup_dep']); + } + $act2->Update(); } //------------------------------------------------------------------= ---- // Add a related action @@ -141,6 +140,7 @@ echo '
'; $act=3Dnew Follow_Up($cn); $act->ag_id=3D$ag_id; + $act->suppress=3D1; echo $act->get(); $act->ag_comment=3DDecode($act->ag_comment); echo '
'; @@ -152,6 +152,7 @@ echo HtmlInput::submit("save","Sauve"); echo HtmlInput::submit("add_action_here",_("Ajoute une action =C3=A0= celle-ci")); echo HtmlInput::submit("delete",_("Efface cette action"),' onclick=3D= "return confirm(\''._("Vous confirmez l\'effacement").'\')" '); + echo $retour; echo '
'; echo '
'; =20 Modified: phpcompta/trunk/include/action.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.inc.php 2011-12-22 09:59:28 UTC (rev 4= 652) +++ phpcompta/trunk/include/action.inc.php 2011-12-24 02:35:18 UTC (rev 4= 653) @@ -23,8 +23,7 @@ */ require_once('class_ipopup.php'); global $g_user; - -$retour=3DHtmlInput::button_anchor(_('Retour'),'?ac=3D'.$_REQUEST['ac'].= '&my_action&'.dossier::get()); +$retour=3DHtmlInput::button_anchor(_('Retour liste'),'?ac=3D'.$_REQUEST[= 'ac'].'&my_action&'.dossier::get()); //----------------------------------------------------- // Follow_Up //----------------------------------------------------- Modified: phpcompta/trunk/include/class_follow_up.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_follow_up.php 2011-12-22 09:59:28 UTC (= rev 4652) +++ phpcompta/trunk/include/class_follow_up.php 2011-12-24 02:35:18 UTC (= rev 4653) @@ -303,7 +303,7 @@ if( isset($_REQUEST['sb'])) $supl_hidden.=3D'&sb=3D'.$_REQUEST['sb']; =20 - $lag_ref_ag_id=3D'ag_ref_ag_id.'&'.dossier::get().'">'. $this->db->get_value("select ag_ref from = action_gestion where ag_id=3D$1",array($this->ag_ref_ag_id)). ""; @@ -523,6 +523,13 @@ $sql=3Dsprintf(" and ag_id in (select action_get_tree from c= omptaproc.action_get_tree(%s)) ",$this->ag_id); $r.=3D$this->myList($p_base,"",$sql); } + // New referecne + ob_start(); + require_once ('template/action-reference.php'); + $content=3Dob_get_contents(); + ob_end_clean(); + + $r.=3D$content; return $r; =20 } @@ -664,10 +671,10 @@ =20 $table=3Dnew Sort_Table(); $table->add('Date',$url,'order by ag_timestamp asc','order by ag_times= tamp desc','da','dd'); + $table->add('R=C3=A9f.',$url,'order by ag_ref asc','order by ag_ref de= sc','ra','rd'); $table->add('Exp=C3=A9diteur',$url,'order by name asc','order by name = desc','ea','ed'); $table->add('Titre',$url,'order by ag_title asc','order by ag_title de= sc','ta','td'); $table->add('Concerne',$url,'order by ag_ref_ag_id asc','order by ag_r= ef_ag_id desc','ca','cd'); - $table->add('R=C3=A9f.',$url,'order by ag_ref asc','order by ag_ref de= sc','ra','rd'); =20 $ord=3D(! isset($_GET['ord']))?"dd":$_GET['ord']; $sort=3D$table->get_sql_order($ord); @@ -702,11 +709,14 @@ $r.=3D''.$table->get_header(0).''; $r.=3D''.$table->get_header(1).''; $r.=3D''.$table->get_header(2).''; + $r.=3D''.$table->get_header(3).''; $r.=3D'type'; $r.=3Dth('Etat'); $r.=3Dth('Priorit=C3=A9'); $r.=3D''.$table->get_header(4).''; - $r.=3D''.$table->get_header(3).''; + if (isset($this->suppress)) { + $r.=3D" Suppr. d=C3=A9pendance"; + } $r.=3D""; =20 =20 @@ -732,6 +742,7 @@ if ($row['my_date']=3D=3D$today) $st=3D' style=3D"font-famil= y:bold; border:2px solid orange;"'; $r.=3D""; $r.=3D"".$href.$row['my_date'].''.""; + $r.=3D"".$href.$row['ag_ref'].''.""; =20 // Expediteur $fexp=3Dnew Fiche($this->db); @@ -805,11 +816,17 @@ } $r.=3Dtd($priority); =20 - $r.=3D"".$row['ag_ref'].""; - $r.=3D"".$ref.""; + $r.=3D"" . $ref . ""; + if (isset($this->suppress)) + { + $ck =3D new ICheckBox('sup_dep[]'); + $ck->value =3D $row['ag_id']; + $r.=3D"" . $ck->input() . ""; + } $r.=3D""; =20 } + $r.=3D""; =20 $r.=3D$bar; @@ -971,4 +988,26 @@ $array=3D$this->db->get_array($sql); return $array; } + /** + *@brief add an related action to the current one + */ + function add_depend($p_ref) + { + if ($p_ref =3D=3D 0 || $p_ref=3D=3D$this->ag_id) return; + // check if action exist and is not already related to the current act= ion + $exist=3D$this->db->get_value("select count(*) from action_gestion whe= re ag_id=3D$1",array($p_ref)); + if ( $exist =3D=3D 0) return; + + $this->db->exec_sql("update action_gestion set ag_ref_ag_id=3D$1 where= ag_id=3D$2", + array($this->ag_id,$p_ref)); + + } + function suppress_depend($p_array) + { + for ($i=3D0;$idb->exec_sql("update action_gestion set ag_ref_ag_id=3D0 where= ag_id=3D$1", + array($p_array[$i])); + } + } } Added: phpcompta/trunk/include/template/action-reference.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/action-reference.php = (rev 0) +++ phpcompta/trunk/include/template/action-reference.php 2011-12-24 02:3= 5:18 UTC (rev 4653) @@ -0,0 +1,35 @@ + +

+ Ajout d'une action qui d=C3=A9pend de l'action actuelle : input()?> + Ne donner que le num=C3=A9ro de document + +

\ No newline at end of file From MAILER-DAEMON Sun Dec 25 12:24:47 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ReroV-0008Hv-Ak for mharc-phpcompta-dev@gnu.org; Sun, 25 Dec 2011 12:24:47 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 25 Dec 2011 18:27:36 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r214 - in trunk/coprop: . 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Dec 2011 17:24:45 -0000 Author: danydb Date: 2011-12-25 18:27:34 +0100 (Sun, 25 Dec 2011) New Revision: 214 Added: trunk/coprop/include/ajax_mod_copro_lot.php trunk/coprop/include/template/coprop_lot_mod.php Modified: trunk/coprop/ajax.php trunk/coprop/coprop-constant.php trunk/coprop/coprop-javascript.js trunk/coprop/include/class_copro_lot.php trunk/coprop/include/lot.inc.php trunk/coprop/include/template/coprop_lot_add.php trunk/coprop/include/template/coprop_lot_list.php Log: Copropri?\195?\169taire / lot : ajout, modification et enlever Modified: trunk/coprop/ajax.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/ajax.php 2011-12-20 22:13:09 UTC (rev 213) +++ trunk/coprop/ajax.php 2011-12-25 17:27:34 UTC (rev 214) @@ -5,15 +5,18 @@ extract($_GET); global $cn; $html=3D'';$extra=3D'';$ctl=3D''; -ob_start(); -switch($act) { +switch ($act) +{ // ajout un lien copro + lot -case 'addcopro': - /* the hide button */ - require_once('include/ajax_add_copro_lot.php'); - break; -default: + case 'modcopro': + /* the hide button */ + require_once('include/ajax_mod_copro_lot.php'); + break; + case 'removelot': + $cn->exec_sql("delete from coprop.lot where l_id=3D$1",array($lot_id))= ; + break; + default: =20 - var_dump($_GET); + var_dump($_GET); } ?> Modified: trunk/coprop/coprop-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 --- trunk/coprop/coprop-constant.php 2011-12-20 22:13:09 UTC (rev 213) +++ trunk/coprop/coprop-constant.php 2011-12-25 17:27:34 UTC (rev 214) @@ -10,8 +10,9 @@ require_once ('class_database.php'); require_once 'include/class_copro_parameter.php'; global $cn,$g_copro_parameter,$gDossier; - +$cn=3DDossier::connect(); $gDossier=3DDossier::id(); $g_copro_parameter=3Dnew Copro_Parameter(); +define ("COPRO_MAX_LOT",19); =20 ?> \ No newline at end of file Modified: trunk/coprop/coprop-javascript.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/coprop-javascript.js 2011-12-20 22:13:09 UTC (rev 213) +++ trunk/coprop/coprop-javascript.js 2011-12-25 17:27:34 UTC (rev 214) @@ -5,17 +5,77 @@ /** * Modifier un copropri=C3=A9taire et les lots qu'il a */ -function mod_coprop(dossier,copro_qcode,plugin_code) +function mod_coprop(dossier,coprop_id,plugin_code,ac) { + waiting_box(); try { - alert('Modifier un copropri=C3=A9taire et ses lots'); + var queryString=3D"plugin_code=3D"+plugin_code+"&gDossier=3D"+dossier+= "&coprop_id=3D"+coprop_id+'&ac=3D'+ac+"&act=3Dmodcopro"; + var action=3Dnew Ajax.Request ( 'ajax.php', + { + method:'get', + parameters:queryString, + onFailure:null, + onSuccess:function (response) + { + try + { + remove_waiting_box(); + $('listcoprolot').hide(); + $('ajoutcopro').hide(); + $('divcopropmod').innerHTML=3Dresponse.responseText; + //response.responseText.evalScripts(); + } + catch(e) + { + alert("R=C3=A9ponse Ajax =3D"+e.message); + } + } + } + ); } catch(e) { alert(e.message); } } +function remove_lot(plugin_code,ac,dossier,lot_id) +{ + if (! confirm("Vous voulez enlever ce lot ?")) { return;} + waiting_box(); + try + { + var queryString=3D"plugin_code=3D"+plugin_code+"&gDossier=3D"+dossier+= "&lot_id=3D"+lot_id+'&ac=3D'+ac+"&act=3Dremovelot"; + var action=3Dnew Ajax.Request ( 'ajax.php', + { + method:'get', + parameters:queryString, + onFailure:null, + onSuccess:function (response) + { + try + { + remove_waiting_box(); + alert("lot_id=3D"+lot_id); + $("row"+lot_id).style.color=3D"red"; + $("row"+lot_id).style.textDecoration=3D"line-through"; + $("col"+lot_id).innerHTML=3D"Enlev=C3=A9"; + + //response.responseText.evalScripts(); + } + catch(e) + { + alert("R=C3=A9ponse Ajax =3D"+e.message); + } + } + } + ); + } + catch(e) + { + alert(e.message); + } +} /** * Ajout un lien entre copropri=C3=A9taire et lot */ Added: trunk/coprop/include/ajax_mod_copro_lot.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/ajax_mod_copro_lot.php (= rev 0) +++ trunk/coprop/include/ajax_mod_copro_lot.php 2011-12-25 17:27:34 UTC (= rev 214) @@ -0,0 +1,60 @@ + string 'COPROP' (length=3D6) + 'gDossier' =3D> string '26' (length=3D2) + 'coprop_id' =3D> string '32' (length=3D2) + 'ac' =3D> string 'EXT/COPROP' (length=3D10) + 'act' =3D> string 'modcopro' (length=3D8) + + *@endcode + */ + +$copro=3Dnew Fiche($cn); +$copro->id=3D$coprop_id; + +$acurrent=3D$cn->get_array("select lot.l_id ,l_fiche_id, + (select ad_value from fiche_detail where f_id=3Dl_fiche_id and ad_id=3D= 1) as fiche_name, + (select ad_value from fiche_detail where f_id=3Dl_fiche_id and ad_id=3D= 23) as fiche_qcode, + l_part + from coprop.lot where coprop_fk=3D$1", + array($coprop_id)); + +$not_assigned=3D$cn->get_array("select a.f_id, + (select ad_value from fiche_detail as e where e.f_id=3Da.f_id and ad_= id=3D1) as fiche_name, + (select ad_value from fiche_detail as f where f.f_id=3Da.f_id and ad_= id=3D23) as fiche_qcode, + coalesce(l_part,0) as str_part + from coprop.lot + right join fiche as a on (l_fiche_id=3Da.f_id) + where + coalesce(coprop_fk,0) <>$1 and fd_id=3D$2", + array($coprop_id,$g_copro_parameter->categorie_lot)); + +require_once("template/coprop_lot_mod.php") +?> Modified: trunk/coprop/include/class_copro_lot.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/class_copro_lot.php 2011-12-20 22:13:09 UTC (rev= 213) +++ trunk/coprop/include/class_copro_lot.php 2011-12-25 17:27:34 UTC (rev= 214) @@ -24,13 +24,172 @@ /** * @file * @brief g=C3=A8re la liaison entre lots et copropri=C3=A9taire + * table jnt_coprop_lot * */ -class Copro_List +class Copro_Lot { function insert($p_array) { - =09 + global $cn; + extract($p_array); + try + { + // find the coprop + $coprop=3Dnew Fiche($cn); + $coprop->get_by_qcode($w_copro); + if ($coprop->id =3D=3D 0) throw new Exception("Ce copropri=C3=A9taire= $w_copro n'existe pas",1); + $count=3D$cn->get_value("select count(*) from coprop.coproprietaire w= here c_fiche_id=3D$1", + array($coprop->id)); + if ( $count > 0 ) throw new Exception ("Copropri=C3=A9taire d=C3=A9= j=C3=A0 encod=C3=A9",2); + $cn->exec_sql("insert into coprop.coproprietaire(c_fiche_id)values($1= )", + array($coprop->id)); + // Find the lot. + $str_warning=3D"";$n_warning=3D0; + for ($i=3D0;$iid=3D$lot[$i]; + + $part=3D${'lot_per'.$lot[$i]}; + + if ( trim($part)<>'' && isNumber($part)=3D=3D0) + { + // avertissement et mettre =C3=A0 100% + $part=3D100; + } + // si w_lot pas inser=C3=A9 alors inserer + $cn->exec_sql("insert into coprop.lot(l_fiche_id,l_part,coprop_fk)". + " values ($1,$2,$3)", + array($flot->id,$part,$coprop->id)); + + // si w_lot ins=C3=A9rer avec nouveau coprop. calculer somme jcl_par= t si total de jcl_part > 100 alors + // avertissement + $tot=3D$cn->get_value("select sum(l_part) from coprop.lot where l_fi= che_id=3D$1", + array($flot->id)); + if ($tot > 100 ) + { + // avertisement affect=C3=A9 =C3=A0 +100% + } elseif ($tot < 100 ) + { + // avertisement affect=C3=A9 =C3=A0 - 100% + + } + } + } + catch (Exception $e) + { + echo $e->getMessage(); + echo $e->getTraceAsString(); + + } + + } + function add_lot($p_array) + { + global $cn; + extract($p_array); + try + { + // find the coprop + $coprop=3Dnew Fiche($cn); + $coprop->id=3D$copro_id; + if ($coprop->id =3D=3D 0) throw new Exception("Ce copropri=C3=A9taire= $w_copro n'existe pas",1); + $count=3D$cn->get_value("select count(*) from coprop.coproprietaire w= here c_fiche_id=3D$1", + array($coprop->id)); + // Find the lot. + $str_warning=3D"";$n_warning=3D0; + for ($i=3D0;$iid=3D$lot[$i]; + + $part=3D${'Part'.$lot[$i]}; + + if ( trim($part)<>'' && isNumber($part)=3D=3D0) + { + // avertissement et mettre =C3=A0 100% + $part=3D100; + } + // si w_lot pas inser=C3=A9 alors inserer + $cn->exec_sql("insert into coprop.lot(l_fiche_id,l_part,coprop_fk)". + " values ($1,$2,$3)", + array($flot->id,$part,$coprop->id)); + + // si w_lot ins=C3=A9rer avec nouveau coprop. calculer somme jcl_par= t si total de jcl_part > 100 alors + // avertissement + $tot=3D$cn->get_value("select sum(l_part) from coprop.lot where l_fi= che_id=3D$1", + array($flot->id)); + if ($tot > 100 ) + { + // avertisement affect=C3=A9 =C3=A0 +100% + } elseif ($tot < 100 ) + { + // avertisement affect=C3=A9 =C3=A0 - 100% + + } + } + } + catch (Exception $e) + { + echo $e->getMessage(); + echo $e->getTraceAsString(); + + } + + + } + function update_lot($p_array) + { + global $cn; + extract($p_array); + try + { + $lot=3D$cn->get_array("select l_id,l_fiche_id,l_part from coprop.lot = where coprop_fk=3D$1 ", + array($copro_id)); + // Find the lot. + $str_warning=3D"";$n_warning=3D0; + for ($i=3D0;$iid=3D$lot[$i]['l_fiche_id']; + + $part=3D${'num'.$lot[$i]['l_id']}; + + if ( trim($part)<>'' && isNumber($part)=3D=3D0) + { + // avertissement et mettre =C3=A0 100% + $part=3D100; + } + // si w_lot pas inser=C3=A9 alors inserer + $cn->exec_sql("update coprop.lot set l_part=3D$1 where l_id=3D$2", + array($part,$lot[$i]['l_id'])); + + // si w_lot ins=C3=A9rer avec nouveau coprop. calculer somme jcl_par= t si total de jcl_part > 100 alors + // avertissement + $tot=3D$cn->get_value("select sum(l_part) from coprop.lot where l_fi= che_id=3D$1", + array($flot->id)); + if ($tot > 100 ) + { + // avertisement affect=C3=A9 =C3=A0 +100% + } elseif ($tot < 100 ) + { + // avertisement affect=C3=A9 =C3=A0 - 100% + + } + } + } + catch (Exception $e) + { + echo $e->getMessage(); + echo $e->getTraceAsString(); + + } + + + } + + } ?> Modified: trunk/coprop/include/lot.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/lot.inc.php 2011-12-20 22:13:09 UTC (rev 213) +++ trunk/coprop/include/lot.inc.php 2011-12-25 17:27:34 UTC (rev 214) @@ -26,11 +26,12 @@ * @brief liaison entre lot et copropri=C3=A9taires * */ +require_once 'class_copro_lot.php'; global $cn,$g_copro_parameter; if ( isset($_POST['copro_new'])) { var_dump($_POST); - $cp=3Dnew Copro_List(); + $cp=3Dnew Copro_Lot(); try { $cp->insert($_POST); @@ -40,6 +41,34 @@ echo $e->getTraceAsString(); } } +// Ajout de lots +if (isset($_POST['addlot'])) +{ + var_dump($_POST); + $cp=3Dnew Copro_Lot(); + try + { + $cp->add_lot($_POST); + } + catch(Exception $e) + { + echo $e->getTraceAsString(); + } +} +// Mise =C3=A0 jour lots existants +if ( isset($_POST['updexist'])) +{ + var_dump($_POST); + $cp=3Dnew Copro_Lot(); + try + { + $cp->update_lot($_POST); + } + catch(Exception $e) + { + echo $e->getTraceAsString(); + } +} //require_once 'include/class_coprop-lot_coprop.php'; /* Add button */ $f_add_button=3Dnew IButton('add_card'); @@ -53,20 +82,22 @@ /* * Liste */ -$sql=3D" select jcl_id, - jcl_copro, - (select ad_value from fiche_detail where f_id=3Djcl_copro and ad_id=3D1= ) as coprop_name, - (select ad_value from fiche_detail where f_id=3Djcl_copro and ad_id=3D2= 3) as coprop_qcode +$sql=3D" select distinct + c_fiche_id, + (select ad_value from fiche_detail where f_id=3Dc_fiche_id and ad_id=3D= 1) as copro_name, + (select ad_value from fiche_detail where f_id=3Dc_fiche_id and ad_id=3D= 23) as copro_qcode + from - coprop.jnt_coprop_lot + coprop.coproprietaire "; /** * @todo ajouter tri */ $a_copro=3D$cn->get_array($sql); =20 -$sql_lot=3D$cn->prepare ("lot","select jcl_lot, (select ad_value from fi= che_detail where f_id=3Djcl_lot and ad_id=3D1) as lot_name, - (select ad_value from fiche_detail where f_id=3Djcl_lot and ad_id=3D23)= as lot_qcode from coprop.jnt_coprop_lot where jcl_id=3D$1"); +$sql_lot=3D$cn->prepare ("lot","select coprop_fk, (select ad_value from = fiche_detail where f_id=3Dl_fiche_id and ad_id=3D1) as lot_name, + (select ad_value from fiche_detail where f_id=3Dl_fiche_id and ad_id=3D= 23) as lot_qcode,l_part + from coprop.lot where coprop_fk=3D$1"); =20 echo $f_add_button->input(); echo '
'; @@ -77,6 +108,7 @@ require_once('template/coprop_lot_add.php'); =20 echo '
'; +echo '
'; echo $f_add_button->input(); =20 ?> Modified: trunk/coprop/include/template/coprop_lot_add.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/coprop_lot_add.php 2011-12-20 22:13:09 = UTC (rev 213) +++ trunk/coprop/include/template/coprop_lot_add.php 2011-12-25 17:27:34 = UTC (rev 214) @@ -66,6 +66,17 @@ echo $f_copro; echo HtmlInput::hidden('p_jrn',$g_copro_parameter->journal_appel); echo HtmlInput::hidden('ledger_type','ODS'); +$alot=3D$cn->get_array("select f_id, + (select ad_value from fiche_Detail as e where ad_id=3D1 and e.f_id=3Da= .f_id) as fname, + (select ad_value from fiche_Detail as f where ad_id=3D23 and f.f_id=3D= a.f_id) as fqcode + from fiche as a + where + fd_id=3D$1 + ", array($g_copro_parameter->categorie_lot)); +if ( count($alot)=3D=3D0) { + echo h2info('Aucune fiche de lot'); + exit(); +} ?> @@ -73,51 +84,22 @@ label=3D"Lot : ".HtmlInput::infobulle(0) ; - $lot->name=3D"w_lot".$i; - $lot->tabindex=3D1; - $lot->value=3D""; - $lot->table=3D0; +for ($i=3D0;$iset_attribute('label','w_lot_label'.$i); - // Type of card : deb, cred, - $lot->set_attribute('typecard',$g_copro_parameter->categorie_lot); - - $lot->extra=3D$g_copro_parameter->categorie_lot; - -// Add the callback function to filter the card on the jrn - $lot->set_callback('filter_card'); - $lot->set_attribute('ipopup','ipopcard'); -// when value selected in the autcomplete - $lot->set_function('fill_data'); - -// when the data change - $lot->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\');" = ', - $lot->name); - $lot->set_dblclick("fill_ipopcard(this);"); - - $lot_label=3Dnew ISpan(); - $lot_label->table=3D0; - $f_lot=3D$lot_label->input("w_lot_label".$i,""); - // Search button for card - $f_lot_bt=3D$lot->search(); $num=3Dnew INum("lot_per".$i); + $ck=3Dnew ICheckBox("lot[]"); + $ck->value=3D$alot[$i]['f_id']; ?> Modified: trunk/coprop/include/template/coprop_lot_list.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/coprop_lot_list.php 2011-12-20 22:13:09= UTC (rev 213) +++ trunk/coprop/include/template/coprop_lot_list.php 2011-12-25 17:27:34= UTC (rev 214) @@ -37,20 +37,19 @@ - - +
Pourcentage
- - input()?> + input()?> - input()?> + - - + input()?>
execute('lot',$a_copro[$i]['jcl_id']); + $rlot=3D$cn->execute('lot',array($a_copro[$i]['c_fiche_id'])); $max=3DDatabase::num_row($rlot); $sp=3D""; for ($e=3D0;$e<$max;$e++): $row=3DDatabase::fetch_array($rlot,$e); - $js_lot=3DHtmlInput::card_detail($row['lot_qcode'],$row['lot_name'])= ; - echo $js_lot.$sp; + $js_lot=3DHtmlInput::card_detail($row['lot_qcode'],$row['lot_name'],= ' class=3D"line"'); + echo $sp.$js_lot.nb($row['l_part']); $sp=3D" , "; endfor; ?> Added: trunk/coprop/include/template/coprop_lot_mod.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coprop/include/template/coprop_lot_mod.php = (rev 0) +++ trunk/coprop/include/template/coprop_lot_mod.php 2011-12-25 17:27:34 = UTC (rev 214) @@ -0,0 +1,104 @@ + +

+ ModificationstrAttribut(ATTR_DEF_QU= ICKCODE),$copro->strAttribut(ATTR_DEF_NAME),' class=3D"line"')?> +

+

Lot affect=C3=A9 =C3=A0 ce copropri=C3=A9taire

+
+ id)?> + + + + + + + "> + + + + + +
+ Lot + + Pourcentage +
+ + + value=3D$acurrent[$i]['l_part']; + echo $num->input(); + ?> + "> + +
+ +
+
+

Autre lots

+
+ id)?> + + + + + + + + + + + + +
+ Lot + + Pourcentage +
+ + + input(); + ?> + + value=3D$not_assigned[$i]['f_id']; + echo $ck->input(); + ?> +
+ +
From MAILER-DAEMON Sun Dec 25 12:25:18 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rerp0-0008NC-Do for mharc-phpcompta-dev@gnu.org; Sun, 25 Dec 2011 12:25:18 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 25 Dec 2011 18:28:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4654 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Dec 2011 17:25:17 -0000 Author: danydb Date: 2011-12-25 18:28:16 +0100 (Sun, 25 Dec 2011) New Revision: 4654 Modified: phpcompta/trunk/include/class_html_input.php Log: correct HtmlInput::card_detail corrige style personnalis?\195?\169 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-12-24 02:35:18 UTC = (rev 4653) +++ phpcompta/trunk/include/class_html_input.php 2011-12-25 17:28:16 UTC = (rev 4654) @@ -444,10 +444,10 @@ */ static function card_detail($p_qcode,$pname=3D'',$p_style=3D"") { - if ($pname=3D=3D'')$pname=3D$p_qcode; + //if ($pname=3D=3D'')$pname=3D$p_qcode; $r=3D""; - $r.=3Dsprintf('%s[%s]', - $p_qcode,$pname,$p_qcode,$p_style); + $r.=3Dsprintf('%s [%s]', + $p_style,$p_qcode,$pname,$p_qcode); return $r; } /** From MAILER-DAEMON Tue Dec 27 06:27:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RfVBb-0008BI-V0 for mharc-phpcompta-dev@gnu.org; Tue, 27 Dec 2011 06:27:15 -0500 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 27 Dec 2011 12:29:59 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4655 - 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Dec 2011 11:27:14 -0000 Author: danydb Date: 2011-12-27 12:29:57 +0100 (Tue, 27 Dec 2011) New Revision: 4655 Modified: phpcompta/trunk/include/class_itextarea.php Log: Improve ITextarea add a custom style 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 2011-12-25 17:28:16 UTC (= rev 4654) +++ phpcompta/trunk/include/class_itextarea.php 2011-12-27 11:29:57 UTC (= rev 4655) @@ -21,7 +21,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 /*!\file - * \brief Html Input=20 + * \brief Html Input */ require_once('class_html_input.php'); class ITextarea extends HtmlInput @@ -31,10 +31,11 @@ { $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" '; if ( $this->readOnly=3D=3Dtrue) return $this->display(); =20 $r=3D""; - $r.=3D'