[wiaflos-devel] COMMIT - r232 - in trunk: database wiaflos/server

[svn at linuxrulz.org]

Author: nkukard
Date: 2008-08-16 15:43:03 +0000 (Sat, 16 Aug 2008)
New Revision: 232

Modified:
   trunk/database/schema.tsql
   trunk/wiaflos/server/GL.pm
Log:
* Changed fincats table to financial_categories
* Changed rwcats table to reportwriter_categories


Modified: trunk/database/schema.tsql
===================================================================
--- trunk/database/schema.tsql	2008-08-16 09:27:16 UTC (rev 231)
+++ trunk/database/schema.tsql	2008-08-16 15:43:03 UTC (rev 232)
@@ -173,7 +173,7 @@
 
 /* Financial categories */
 
-CREATE TABLE gl_fincats (
+CREATE TABLE gl_financial_categories (
 	ID			@SERIAL_TYPE@,
 
 	Code			VARCHAR(255) NOT NULL,
@@ -182,18 +182,18 @@
 	UNIQUE (Code)
 ) @CREATE_TABLE_SUFFIX@;
 
-CREATE INDEX gl_fincats_idx1 ON gl_fincats (Code);
+CREATE INDEX gl_financial_categories_idx1 ON gl_financial_categories (Code);
 
-INSERT INTO gl_fincats (Code,Description) VALUES ('A01','Asset');
-INSERT INTO gl_fincats (Code,Description) VALUES ('B01','Liability');
-INSERT INTO gl_fincats (Code,Description) VALUES ('C01','Equity');
-INSERT INTO gl_fincats (Code,Description) VALUES ('D01','Income');
-INSERT INTO gl_fincats (Code,Description) VALUES ('E01','Expense');
+INSERT INTO gl_financial_categories (Code,Description) VALUES ('A01','Asset');
+INSERT INTO gl_financial_categories (Code,Description) VALUES ('B01','Liability');
+INSERT INTO gl_financial_categories (Code,Description) VALUES ('C01','Equity');
+INSERT INTO gl_financial_categories (Code,Description) VALUES ('D01','Income');
+INSERT INTO gl_financial_categories (Code,Description) VALUES ('E01','Expense');
 
 
 /* Report writer categories */
 
-CREATE TABLE gl_rwcats (
+CREATE TABLE gl_reportwriter_categories (
 	ID			@SERIAL_TYPE@,
 
 	Code			VARCHAR(255) NOT NULL,
@@ -202,13 +202,13 @@
 	UNIQUE (Code)
 ) @CREATE_TABLE_SUFFIX@;
 
-CREATE INDEX gl_rwcats_idx1 ON gl_rwcats (Code);
+CREATE INDEX gl_reportwriter_categories_idx1 ON gl_reportwriter_categories (Code);
 
-INSERT INTO gl_rwcats (Code,Description) VALUES ('00','Asset');
-INSERT INTO gl_rwcats (Code,Description) VALUES ('20','Liability');
-INSERT INTO gl_rwcats (Code,Description) VALUES ('40','Equity');
-INSERT INTO gl_rwcats (Code,Description) VALUES ('60','Income');
-INSERT INTO gl_rwcats (Code,Description) VALUES ('80','Expense');
+INSERT INTO gl_reportwriter_categories (Code,Description) VALUES ('00','Asset');
+INSERT INTO gl_reportwriter_categories (Code,Description) VALUES ('20','Liability');
+INSERT INTO gl_reportwriter_categories (Code,Description) VALUES ('40','Equity');
+INSERT INTO gl_reportwriter_categories (Code,Description) VALUES ('60','Income');
+INSERT INTO gl_reportwriter_categories (Code,Description) VALUES ('80','Expense');
 
 
 /* General ledger accounts */
@@ -227,8 +227,8 @@
 
 	UNIQUE (Code,ParentGLAccountID),
 	FOREIGN KEY (ParentGLAccountID) REFERENCES gl_accounts(ID),
-	FOREIGN KEY (FinCatID) REFERENCES gl_fincats(ID),
-	FOREIGN KEY (RwCatID) REFERENCES gl_rwcats(ID)
+	FOREIGN KEY (FinCatID) REFERENCES gl_financial_categories(ID),
+	FOREIGN KEY (RwCatID) REFERENCES gl_reportwriter_categories(ID)
 ) @CREATE_TABLE_SUFFIX@;
 
 CREATE INDEX gl_accounts_idx1 ON gl_accounts (ParentGLAccountID);

Modified: trunk/wiaflos/server/GL.pm
===================================================================
--- trunk/wiaflos/server/GL.pm	2008-08-16 09:27:16 UTC (rev 231)
+++ trunk/wiaflos/server/GL.pm	2008-08-16 15:43:03 UTC (rev 232)
@@ -243,7 +243,7 @@
 		SELECT 
 			ID
 		FROM
-			gl_fincats
+			gl_financial_categories
 		WHERE
 			Code = ".DBQuote($finCatCode)."
 	");
@@ -276,7 +276,7 @@
 		SELECT 
 			ID
 		FROM
-			gl_rwcats
+			gl_reportwrite_categories
 		WHERE
 			Code = ".DBQuote($rwCatCode)."
 	");
@@ -370,12 +370,12 @@
 	# Check and return GL account financial category
 	my $sth = DBSelect("
 		SELECT 
-			gl_fincats.Code
+			gl_financial_categories.Code
 		FROM
-			gl_fincats, gl_accounts
+			gl_financial_categories, gl_accounts
 		WHERE
 			gl_accounts.ID = ".DBQuote($GLAccID)."
-			AND gl_fincats.ID = gl_accounts.FinCatID
+			AND gl_financial_categories.ID = gl_accounts.FinCatID
 	");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());
@@ -461,13 +461,13 @@
 	my $sth = DBSelect("
 		SELECT 
 			gl_accounts.ID, gl_accounts.ParentGLAccountID, gl_accounts.Code, gl_accounts.Name,
-			gl_fincats.Code AS FinCatCode, gl_fincats.Description AS FinCatDescription,
-			gl_rwcats.Code AS RwCatCode, gl_rwcats.Description AS RwCatDescription
+			gl_financial_categories.Code AS FinCatCode, gl_financial_categories.Description AS FinCatDescription,
+			gl_reportwrite_categories.Code AS RwCatCode, gl_reportwrite_categories.Description AS RwCatDescription
 		FROM
-			gl_accounts, gl_fincats, gl_rwcats
+			gl_accounts, gl_financial_categories, gl_reportwrite_categories
 		WHERE
-			gl_fincats.ID = gl_accounts.FinCatID
-			AND gl_rwcats.ID = gl_accounts.RwCatID
+			gl_financial_categories.ID = gl_accounts.FinCatID
+			AND gl_reportwrite_categories.ID = gl_accounts.RwCatID
 	");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());
@@ -524,14 +524,14 @@
 	my $sth = DBSelect("
 		SELECT 
 			gl_accounts.ID, gl_accounts.ParentGLAccountID, gl_accounts.Code, gl_accounts.Name,
-			gl_fincats.Code AS FinCatCode, gl_fincats.Description AS FinCatDescription,
-			gl_rwcats.Code AS RwCatCode, gl_rwcats.Description AS RwCatDescription
+			gl_financial_categories.Code AS FinCatCode, gl_financial_categories.Description AS FinCatDescription,
+			gl_reportwrite_categories.Code AS RwCatCode, gl_reportwrite_categories.Description AS RwCatDescription
 		FROM
-			gl_accounts, gl_fincats, gl_rwcats
+			gl_accounts, gl_financial_categories, gl_reportwrite_categories
 		WHERE
 			gl_accounts.ID = ".DBQuote($GLAccID)."
-			AND gl_fincats.ID = gl_accounts.FinCatID
-			AND gl_rwcats.ID = gl_accounts.RwCatID
+			AND gl_financial_categories.ID = gl_accounts.FinCatID
+			AND gl_reportwrite_categories.ID = gl_accounts.RwCatID
 	");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());