X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_points_db.inc;h=35d220dd7bb0c4f8c27de9499c776dcf25d41014;hb=4a4e032fdf10fe2eacb0d268b97bed6ff06a3915;hp=c9f0d95caa6adf45c86b74e193770490b780cde2;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/sales/includes/db/sales_points_db.inc b/sales/includes/db/sales_points_db.inc
index c9f0d95c..35d220dd 100644
--- a/sales/includes/db/sales_points_db.inc
+++ b/sales/includes/db/sales_points_db.inc
@@ -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>.
 ***********************************************************************/
 function add_sales_point($name, $location, $account, $cash, $credit)
 {
@@ -30,24 +30,24 @@ function update_sales_point($id, $name, $location, $account, $cash, $credit)
 	db_query($sql, "could not update sales type");			
 }
 
-function get_all_sales_points()
+function get_all_sales_points($all=false)
 {
 	$sql = "SELECT pos.*, loc.location_name, acc.bank_account_name FROM "
-		.TB_PREF."sales_pos as pos,"
-		.TB_PREF."locations as loc,"
-		.TB_PREF."bank_accounts as acc"
-		." WHERE pos.pos_location=loc.loc_code AND pos.pos_account=acc.id";
+		.TB_PREF."sales_pos as pos
+		LEFT JOIN ".TB_PREF."locations as loc on pos.pos_location=loc.loc_code
+		LEFT JOIN ".TB_PREF."bank_accounts as acc on pos.pos_account=acc.id";
+	if (!$all) $sql .= " WHERE !pos.inactive";
 	
 	return db_query($sql, "could not get all POS definitions");
 } 
 
 function get_sales_point($id)
 {
-	$sql = "SELECT pos.*, loc.location_name, acc.bank_account_name, acc.account_code FROM "
-		.TB_PREF."sales_pos as pos,"
-		.TB_PREF."locations as loc,"
-		.TB_PREF."bank_accounts as acc"
-		." WHERE pos.id=$id AND pos.pos_location=loc.loc_code AND pos.pos_account=acc.id";
+	$sql = "SELECT pos.*, loc.location_name, acc.bank_account_name FROM "
+		.TB_PREF."sales_pos as pos
+		LEFT JOIN ".TB_PREF."locations as loc on pos.pos_location=loc.loc_code
+		LEFT JOIN ".TB_PREF."bank_accounts as acc on pos.pos_account=acc.id
+		WHERE pos.id='$id'";
 	
 	$result = db_query($sql, "could not get POS definition");