Merged changes form main trunk since 2.1RC

[fa-stable.git] / sales / includes / db / sales_points_db.inc

diff --git a/sales/includes/db/sales_points_db.inc b/sales/includes/db/sales_points_db.inc
index 6f54fa2206d86c6e432259582bb096fbd67c65a2..9feae5aa7846d2866fb6d85bce957b8a4bb1af9e 100644 (file)
--- a/sales/includes/db/sales_points_db.inc
+++ b/sales/includes/db/sales_points_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/gpl-3.0.html>.
+***********************************************************************/
 function add_sales_point($name, $location, $account, $cash, $credit)
 {
        $sql = "INSERT INTO ".TB_PREF."sales_pos (pos_name, pos_location, pos_account, cash_sale, credit_sale) VALUES (".db_escape($name)
@@ -24,21 +33,20 @@ function update_sales_point($id, $name, $location, $account, $cash, $credit)
 function get_all_sales_points()
 {
        $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.account_code";
+               .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";
        
        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 id=$id AND pos.pos_location=loc.loc_code AND pos.pos_account=acc.account_code";
+       $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");