[wiaflos-devel] COMMIT - r220 - trunk/wiaflos/server

[svn at linuxrulz.org]

Author: nkukard
Date: 2008-08-10 17:16:32 +0000 (Sun, 10 Aug 2008)
New Revision: 220

Modified:
   trunk/wiaflos/server/Suppliers.pm
Log:
* Schema changes


Modified: trunk/wiaflos/server/Suppliers.pm
===================================================================
--- trunk/wiaflos/server/Suppliers.pm	2008-08-10 17:15:21 UTC (rev 219)
+++ trunk/wiaflos/server/Suppliers.pm	2008-08-10 17:16:32 UTC (rev 220)
@@ -418,7 +418,7 @@
 		# Create new account
 		my $newAcc;
 		$newAcc->{'Code'} = wiaflos::server::GL::getNextGLSubAccountCode($tmp);
-		$newAcc->{'Name'} = "Supplier: ".$detail->{'Code'};
+		$newAcc->{'Name'} = "Supplier: $supplierCode";
 		$newAcc->{'FinCatCode'} = $subGLAcc->{'FinCatCode'};
 		$newAcc->{'RwCatCode'} = $subGLAcc->{'RwCatCode'}; 
 		$newAcc->{'ParentAccountNumber'} = $detail->{'GLAccountNumber'};
@@ -505,7 +505,7 @@
 
 	# Link in supplier address
 	my $sth = DBDo("
-		INSERT INTO supplier_addrs 
+		INSERT INTO supplier_addresses 
 				(SupplierID,Type,Address) 
 			VALUES
 				(
@@ -520,7 +520,7 @@
 	}
 
 	# Grab last ID
-	my $ID = DBLastInsertID("supplier_addrs","ID");
+	my $ID = DBLastInsertID("supplier_addresses","ID");
 
 	return $ID;
 }
@@ -574,7 +574,7 @@
 
 	# Link in supplier address
 	my $sth = DBDo("
-		INSERT INTO supplier_email 
+		INSERT INTO supplier_email_addresses
 				(SupplierID,Type,Address) 
 			VALUES
 				(
@@ -589,7 +589,7 @@
 	}
 
 	# Grab last ID
-	my $ID = DBLastInsertID("supplier_email","ID");
+	my $ID = DBLastInsertID("supplier_email_addresses","ID");
 
 	return $ID;
 }
@@ -663,7 +663,7 @@
 
 	# Link in supplier address
 	my $sth = DBDo("
-		INSERT INTO supplier_phnums 
+		INSERT INTO supplier_phone_numbers 
 				(SupplierID,Type,Number$extraCols) 
 			VALUES
 				(
@@ -679,7 +679,7 @@
 	}
 
 	# Grab last ID
-	my $ID = DBLastInsertID("supplier_phnums","ID");
+	my $ID = DBLastInsertID("supplier_phone_numbers","ID");
 
 	return $ID;
 }
@@ -719,11 +719,11 @@
 	# Return list of addresses
 	my $sth = DBSelect("
 		SELECT 
-			supplier_addrs.ID, supplier_addrs.SupplierID, supplier_addrs.Type, supplier_addrs.Address
+			supplier_addresses.ID, supplier_addresses.SupplierID, supplier_addresses.Type, supplier_addresses.Address
 		FROM
-			supplier_addrs
+			supplier_addresses
 		WHERE
-			supplier_addrs.SupplierID = ".DBQuote($supplierID)."
+			supplier_addresses.SupplierID = ".DBQuote($supplierID)."
 	");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());
@@ -791,11 +791,11 @@
 	# Return list of email addresses
 	my $sth = DBSelect("
 		SELECT 
-			supplier_email.ID, supplier_email.SupplierID, supplier_email.Type, supplier_email.Address
+			supplier_email_addresses.ID, supplier_email_addresses.SupplierID, supplier_email_addresses.Type, supplier_email_addresses.Address
 		FROM
-			supplier_email
+			supplier_email_addresses
 		WHERE
-			supplier_email.SupplierID = ".DBQuote($supplierID)."
+			supplier_email_addresses.SupplierID = ".DBQuote($supplierID)."
 	");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());
@@ -862,11 +862,11 @@
 	# Return list of numbers
 	my $sth = DBSelect("
 		SELECT 
-			supplier_phnums.ID, supplier_phnums.SupplierID, supplier_phnums.Type, supplier_phnums.Number
+			supplier_phone_numbers.ID, supplier_phone_numbers.SupplierID, supplier_phone_numbers.Type, supplier_phone_numbers.Number
 		FROM
-			supplier_phnums
+			supplier_phone_numbers
 		WHERE
-			supplier_phnums.SupplierID = ".DBQuote($supplierID)."
+			supplier_phone_numbers.SupplierID = ".DBQuote($supplierID)."
 	");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());
@@ -925,20 +925,27 @@
 	DBBegin();
 
 	# Remove supplier
-	my $sth = DBDo("DELETE FROM supplier_addrs WHERE SupplierID = ".DBQuote($supplier->{'ID'})."");
+	my $sth = DBDo("DELETE FROM supplier_addresses WHERE SupplierID = ".DBQuote($supplier->{'ID'})."");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());
 		DBRollback();
 		return ERR_DB;
 	}
 
-	$sth = DBDo("DELETE FROM supplier_email WHERE SupplierID = ".DBQuote($supplier->{'ID'})."");
+	$sth = DBDo("DELETE FROM supplier_phone_numbers WHERE SupplierID = ".DBQuote($supplier->{'ID'})."");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());
 		DBRollback();
 		return ERR_DB;
 	}
 
+	$sth = DBDo("DELETE FROM supplier_email_addresses WHERE SupplierID = ".DBQuote($supplier->{'ID'})."");
+	if (!$sth) {
+		setError(wiaflos::server::dblayer::Error());
+		DBRollback();
+		return ERR_DB;
+	}
+
 	$sth = DBDo("DELETE FROM suppliers WHERE ID = ".DBQuote($supplier->{'ID'})."");
 	if (!$sth) {
 		setError(wiaflos::server::dblayer::Error());