[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5855] trunk
- Subject: SF.net SVN: ledger-smb:[5855] trunk
- From: ..hidden..
- Date: Tue, 21 May 2013 14:57:30 +0000
Revision: 5855
http://sourceforge.net/p/ledger-smb/code/5855
Author: einhverfr
Date: 2013-05-21 14:57:30 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Balance sheet needs styling and the filter screen still needs to be done but it works.
Modified Paths:
--------------
trunk/LedgerSMB/Report/Balance_Sheet.pm
trunk/sql/modules/Report.sql
Modified: trunk/LedgerSMB/Report/Balance_Sheet.pm
===================================================================
--- trunk/LedgerSMB/Report/Balance_Sheet.pm 2013-05-21 14:51:19 UTC (rev 5854)
+++ trunk/LedgerSMB/Report/Balance_Sheet.pm 2013-05-21 14:57:30 UTC (rev 5855)
@@ -108,8 +108,9 @@
my @headings = $self->exec_method({funcname => 'account__all_headings'});
my $head = {};
$head->{$_->{accno}} = $_ for (@headings);
+
my @lines = $self->exec_method({funcname => 'report__balance_sheet'});
-
+
my $sheet = {A => { # Assets
lines => [],
total => 0, },
Modified: trunk/sql/modules/Report.sql
===================================================================
--- trunk/sql/modules/Report.sql 2013-05-21 14:51:19 UTC (rev 5854)
+++ trunk/sql/modules/Report.sql 2013-05-21 14:57:30 UTC (rev 5855)
@@ -593,7 +593,7 @@
JOIN acc_trans ac ON ac.approved AND a.id = ac.chart_id
JOIN tx_report t ON t.approved AND t.id = ac.trans_id
LEFT JOIN account a2 ON a.id = a2.id AND a2.category NOT IN ('I', 'E')
- WHERE ac.transdate <= $1
+ WHERE ac.transdate <= coalesce($1, (select max(transdate) from acc_trans))
GROUP BY a2.id, a.accno, a.description, a.category, at.path
ORDER BY CASE WHEN a.category = 'A' THEN 1
WHEN a.category = 'L' THEN 2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.