Author: danydb
Date: 2012-02-04 21:25:42 +0100 (Sat, 04 Feb 2012)
New Revision: 4755
Modified:
phpcompta/trunk/
phpcompta/trunk/include/class_impress.php
Log:
Merged revisions 4745 via svnmerge from
file:///home/developper/svn/phpcompta/tags/rel600
........
r4745 | danydb | 2012-02-04 16:44:10 +0100 (Sat, 04 Feb 2012) | 3 lines
Bug : clause from in report didn't work properly
........
Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
- /phpcompta/tags/rel600:1-4736,4738-4741,4743-4744
+ /phpcompta/tags/rel600:1-4736,4738-4741,4743-4745
Modified: phpcompta/trunk/include/class_impress.php
===================================================================
--- phpcompta/trunk/include/class_impress.php 2012-02-04 20:25:30 UTC (rev
4754)
+++ phpcompta/trunk/include/class_impress.php 2012-02-04 20:25:42 UTC (rev
4755)
@@ -57,6 +57,7 @@
$cond=sql_filter_per($p_cn,$p_start,$p_end,'p_id','j_tech_per');
else
$cond="( j_date >= to_date('$p_start','DD.MM.YYYY') and j_date <=
to_date('$p_end','DD.MM.YYYY'))";
+
include_once("class_acc_account_ledger.php");
// while (@ereg("(\[[0-9]*%*D*C*S*\])",$p_formula,$e) == true)
@@ -112,7 +113,8 @@
$oPeriode=new Periode($p_cn);
try
{
- $from=$oPeriode->find_periode('01'.$from);
+ $pfrom=$oPeriode->find_periode('01.'.$from);
+ $cond=
sql_filter_per($p_cn, $pfrom, $p_end,'p_id','j_tech_per');
}
catch (Exception $exp)
{
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
_______________________________________________
Phpcompta est un logiciel libre de comptabilité en ligne
(http://www.phpcompta.eu)
Phpcompta-dev mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/phpcompta-dev
