X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.1.php;h=371c3d6a33ec12a3ec562df3a37b6b6459c12c2a;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=155aa4a4c48aa1c1fb09151f655b8db0c9478511;hpb=4e436722cb991b7273c08bdc1dc53b5390772972;p=fa-stable.git

diff --git a/sql/alter2.1.php b/sql/alter2.1.php
index 155aa4a4..371c3d6a 100644
--- a/sql/alter2.1.php
+++ b/sql/alter2.1.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 class fa2_1 {
 	var $version = '2.1';	// version installed
@@ -75,7 +75,8 @@ class fa2_1 {
 	$move_sql =array( 
 	"debtor_trans_tax_details" =>
 		"SELECT tr.tran_date, tr.type, tr.trans_no, dt.tax_type_id, 
-			dt.rate, dt.included_in_price, dt.amount, tr.reference as ref
+			dt.rate, dt.included_in_price, dt.amount, tr.reference as ref,
+			tr.rate as ex_rate
 		FROM ".$pref."debtor_trans_tax_details dt	
 			LEFT JOIN ".$pref."trans_tax_details tt
 				ON dt.debtor_trans_no=tt.trans_no 
@@ -87,7 +88,8 @@ class fa2_1 {
 	
 	"supp_invoice_tax_items" =>
 		"SELECT tr.tran_date, tr.type, tr.trans_no, st.tax_type_id, 
-			st.rate, st.included_in_price, st.amount, tr.supp_reference as ref
+			st.rate, st.included_in_price, st.amount, tr.supp_reference as ref,
+			tr.rate as ex_rate
 			FROM ".$pref."supp_invoice_tax_items st	
 				LEFT JOIN ".$pref."trans_tax_details tt
 					ON st.supp_trans_no=tt.trans_no 
@@ -106,12 +108,12 @@ class fa2_1 {
 							($row['amount']/$row['rate']*(100-$row['rate']))
 							:($row['amount']/$row['rate']*100));
 				$sql2 = "INSERT INTO ".$pref."trans_tax_details 
-				(trans_type,trans_no,tran_date,tax_type_id,rate,
+				(trans_type,trans_no,tran_date,tax_type_id,rate,ex_rate,
 					included_in_price, net_amount, amount, memo)
 				VALUES ('".$row['type']."','".$row['trans_no']."','"
 					.$row['tran_date']."','".$row['tax_type_id']."','"
-					.$row['rate']."','".$row['included_in_price']."','"
-					.$net_amount
+					.$row['rate']."','".$row['ex_rate']."','"
+					.$row['included_in_price']."','".$net_amount
 					."','".$row['amount']."','".$row['ref']."')";
 				db_query($sql2, "Cannot move trans tax details from $tbl");
 			}