From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 16 Sep 2009 11:30:21 +0000 (+0000)
Subject: Clean ups in default themes.
X-Git-Tag: v2.4.2~19^2~1239
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=98c3d4786f920b0fbbc415343fe69e9fb69ea995

Clean ups in default themes.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cff0b998..064d4064 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,13 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+16-Sep-2009 Joe Hunt
+! Clean ups in default themes.
+$ config.php
+  /themes/default/default.css
+  /themes/aqua/default.css
+  /themes/cool/default.css
+  
 15-Sep-2009 Janusz Dobrowolski/Joe Hunt
 # Fixed journal entry type and systype selectors
 # Restore of the 4 include files in types.inc
diff --git a/config.php b/config.php
index c88489c4..810620f2 100644
--- a/config.php
+++ b/config.php
@@ -107,8 +107,8 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	/* Default border and spacing for tables */
 	/* Should be moved to CSS */
 
-	$table_style 	= "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'";
-	$table_style2 	= "cellpadding=3 border=1 bordercolor='#cccccc' style='border-collapse: collapse'";
+	$table_style 	= "cellpadding=3 border=1 bordercolor='#8cacbb' class='tablestyle'";
+	$table_style2 	= "cellpadding=3 border=1 bordercolor='#cccccc' class='tablestyle2'";
 
 	/* Accounts Payable */
 	/* System check to see if quantity charged on purchase invoices exceeds the quantity received.
diff --git a/reporting/rep101.php b/reporting/rep101.php
index 913c12b4..c57ab3ae 100644
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -34,12 +34,12 @@ function get_open_balance($debtorno, $to, $convert)
 	$to = date2sql($to);
 
     $sql = "SELECT SUM(IF(".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.", (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)";
+    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)";
     if ($convert)
     	$sql .= " * rate";
     $sql .= ", 0)) AS charges,
     	SUM(IF(".TB_PREF."debtor_trans.type <> ".ST_SALESINVOICE.", (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)";
+    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)";
     if ($convert)
     	$sql .= " * rate";
     $sql .= " * -1, 0)) AS credits,
@@ -48,12 +48,12 @@ function get_open_balance($debtorno, $to, $convert)
 		$sql .= " * rate";
 	$sql .= ") AS Allocated,
 		SUM(IF(".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.", (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc)";
+    	".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc)";
     if ($convert)
     	$sql .= " * rate";
     $sql .= ", 
     	((".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
-    	".TB_PREF."debtor_trans.ov_discount) * -1 + ".TB_PREF."debtor_trans.alloc)";
+    	".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) * -1 + ".TB_PREF."debtor_trans.alloc)";
     if ($convert)
     	$sql .= " * rate";
     $sql .= ")) AS OutStanding
@@ -72,7 +72,8 @@ function get_transactions($debtorno, $from, $to)
 	$to = date2sql($to);
 
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
-		(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)
+		(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
+		".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
 		AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
 		((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
 		AND ".TB_PREF."debtor_trans.due_date < '$to') AS OverDue
diff --git a/themes/aqua/default.css b/themes/aqua/default.css
index 775116d9..e7584a94 100644
--- a/themes/aqua/default.css
+++ b/themes/aqua/default.css
@@ -356,14 +356,10 @@ div.tabs a:hover {
 }
 
 .tablestyle {
-	padding: 3px;
-	border: 1px solid #8cacbb;
 	border-collapse: collapse;
 }
 
 .tablestyle2 {
-	padding: 0 3px;
-	border: 1px solid #ccc;
 	border-collapse: collapse;
 }
 .tablestyle_noborder {
diff --git a/themes/cool/default.css b/themes/cool/default.css
index bf6e6eac..a2dddc9a 100644
--- a/themes/cool/default.css
+++ b/themes/cool/default.css
@@ -361,14 +361,10 @@ div.tabs a:hover {
 }
 
 .tablestyle {
-	padding: 3px;
-	border: 1px solid #cccccc;
 	border-collapse: collapse;
 }
 
 .tablestyle2 {
-	padding: 0 3px;
-	border: 1px solid #ccc;
 	border-collapse: collapse;
 }
 .tablestyle_noborder {
diff --git a/themes/default/default.css b/themes/default/default.css
index d45f2e2c..d5d5dde0 100644
--- a/themes/default/default.css
+++ b/themes/default/default.css
@@ -356,14 +356,10 @@ div.tabs a:hover {
 }
 
 .tablestyle {
-	padding: 3px;
-	border: 1px solid #8cacbb;
 	border-collapse: collapse;
 }
 
 .tablestyle2 {
-	padding: 3px;
-	border: 1px solid #cccccc;
 	border-collapse: collapse;
 }
 .tablestyle_noborder {