SF.net SVN: ledger-smb:[2744] trunk

[..hidden..]

Revision: 2744
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2744&view=rev
Author:   einhverfr
Date:     2009-07-28 19:41:16 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
Correcting two issues with GL report

Modified Paths:
--------------
    trunk/bin/gl.pl
    trunk/sql/Pg-database.sql
    trunk/sql/modules/EndOfYear.sql

Modified: trunk/bin/gl.pl
===================================================================
--- trunk/bin/gl.pl	2009-07-28 16:13:02 UTC (rev 2743)
+++ trunk/bin/gl.pl	2009-07-28 19:41:16 UTC (rev 2744)
@@ -498,7 +498,7 @@
     );
     my @options;
     if ($form->{chart_accno}){
-        $form->{title} = $locale->text('General Ledger: [_1]', $form->{chart_accno});
+        $form->{title} = $locale->text('General Ledger: [_1] [_2]', $form->{chart_accno}, $form->{chart_description});
     } else {
         $form->{title} = $locale->text('General Ledger');
     }

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2009-07-28 16:13:02 UTC (rev 2743)
+++ trunk/sql/Pg-database.sql	2009-07-28 19:41:16 UTC (rev 2744)
@@ -878,39 +878,13 @@
 -- notes are from entity_note
 -- ssn, iban and bic are from entity_credit_account
 -- 
--- The view below is broken.  Disabling for now.
 CREATE VIEW employee AS
  SELECT s.salutation, p.first_name, p.last_name, ee.entity_id, ee.startdate, ee.enddate, ee."role", ee.ssn, ee.sales, ee.manager_id, ee.employeenumber, ee.dob
    FROM person p
    JOIN entity_employee ee USING (entity_id)
    LEFT JOIN salutation s ON p.salutation_id = s.id;
 
-/*
-create view employee as
-    SELECT 
-        ente.entity_id,
-        3,
-        u.username,
-        ente.startdate,
-        ente.enddate,
-        en.note,
-        ente.ssn,
-        eca.iban,
-        eca.bic,
-        ente.manager_id,
-        ente.employeenumber,
-        ente.dob
-    FROM
-        entity_employee ente
-    JOIN 
-        entity_credit_account eca on (eca.entity_id = ente.entity_id)
-    JOIN
-        entity_note en on (en.entity_id = ente.entity_id)
-    JOIN
-        users u on (u.entity_id = ente.entity_id);
-*/
 
-
 CREATE VIEW customer AS 
     SELECT 
         c.id,

Modified: trunk/sql/modules/EndOfYear.sql
===================================================================
--- trunk/sql/modules/EndOfYear.sql	2009-07-28 16:13:02 UTC (rev 2743)
+++ trunk/sql/modules/EndOfYear.sql	2009-07-28 19:41:16 UTC (rev 2744)
@@ -151,6 +151,7 @@
 	WHERE ac.chart_id = in_account_id 
 		AND ac.transdate > coalesce(cp.end_date, ac.transdate - '1 day'::interval)
 		and ac.approved and a.approved
+		and ac.transdate <= in_transdate
 	GROUP BY cp.amount, ac.chart_id;
 
 	RETURN balance;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.