SF.net SVN: ledger-smb:[5193] trunk/sql/modules

[..hidden..]

Revision: 5193
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5193&view=rev
Author:   einhverfr
Date:     2012-11-14 09:56:04 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Fixing Berend Tober's bugs

Modified Paths:
--------------
    trunk/sql/modules/Payroll.sql
    trunk/sql/modules/Transaction_Templates.sql

Modified: trunk/sql/modules/Payroll.sql
===================================================================
--- trunk/sql/modules/Payroll.sql	2012-11-14 09:23:35 UTC (rev 5192)
+++ trunk/sql/modules/Payroll.sql	2012-11-14 09:56:04 UTC (rev 5193)
@@ -71,7 +71,7 @@
 
 CREATE OR REPLACE FUNCTION payroll_income_type__get(in_id int)
 RETURNS payroll_income_type AS $$
-SELECT * FROM payroll_income_class WHERE id  = $1;
+SELECT * FROM payroll_income_type WHERE id  = $1;
 $$ LANGUAGE SQL;
 
 CREATE OR REPLACE FUNCTION payroll_income_category__list() 

Modified: trunk/sql/modules/Transaction_Templates.sql
===================================================================
--- trunk/sql/modules/Transaction_Templates.sql	2012-11-14 09:23:35 UTC (rev 5192)
+++ trunk/sql/modules/Transaction_Templates.sql	2012-11-14 09:56:04 UTC (rev 5193)
@@ -11,7 +11,7 @@
 $$
 DECLARE retval journal;
 BEGIN
-	INSERT INTO journal (source, description, entry_type, transaction_date,
+	INSERT INTO journal_entry (source, description, entry_type, transaction_date,
 			approved, is_template)
 	VALUES (in_source, in_description, in_entry_type, in_transaction_date,
 			coalesce(in_approved, false), 
@@ -95,7 +95,7 @@
 			j.transaction_date, j.approved, 
 			j.is_template, eca.meta_number, 
 			e.name, ec.class
-		FROM journal j
+		FROM journal_entry j
 		LEFT JOIN eca_invoice i ON (i.journal_id = j.id)
 		LEFT JOIN entity_credit_account eca ON (eca.id = credit_id)
 		LEFT JOIN entity e ON (eca.entity_id = e.id)
@@ -127,7 +127,7 @@
 
 CREATE OR REPLACE FUNCTION journal__get_entry(in_id int) RETURNS journal AS
 $$
-SELECT * FROM journal where id = $1;
+SELECT * FROM journal_entry where id = $1;
 $$ language sql;
 
 CREATE OR REPLACE FUNCTION journal__lines(in_id int) RETURNS SETOF journal_line AS

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