Sales group query error in mysql 8. groups is a reserved word. Fixed

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index a15d45733e4519a85b6cd179c37e280a2c043923..45253e32fd01c20585149b7fb935d012d4d7d051 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1345,7 +1345,7 @@ function sales_areas_list_row($label, $name, $selected_id=null, $special_option=
 
 function sales_groups_list($name, $selected_id=null, $special_option=false)
 {
-       $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
+       $sql = "SELECT id, description, inactive FROM `".TB_PREF."groups`";
        return combo_input($name, $selected_id, $sql, 'id', 'description', array(
                'spec_option' => $special_option===true ? ' ' : $special_option,
                'order' => 'description', 'spec_id' => 0,

diff --git a/sales/includes/db/sales_groups_db.inc b/sales/includes/db/sales_groups_db.inc
index 6f926d7ee7887d1e3f5eaa091a8d796be8470646..61fbcdc5182b1e6bd754dcb73c3f4833c7792148 100644 (file)
--- a/sales/includes/db/sales_groups_db.inc
+++ b/sales/includes/db/sales_groups_db.inc
@@ -12,25 +12,25 @@
 
 function add_sales_group($description)
 {
-       $sql = "INSERT INTO ".TB_PREF."groups (description) VALUES (".db_escape($description) . ")";
+       $sql = "INSERT INTO `".TB_PREF."groups` (description) VALUES (".db_escape($description) . ")";
        db_query($sql,"The sales group could not be added");
 }
 
 function update_sales_group($selected_id, $description)
 {
-       $sql = "UPDATE ".TB_PREF."groups SET description=".db_escape($description)." WHERE id = ".db_escape($selected_id);
+       $sql = "UPDATE `".TB_PREF."groups` SET description=".db_escape($description)." WHERE id = ".db_escape($selected_id);
        db_query($sql,"The sales group could not be updated");
 }
 
 function delete_sales_group($selected_id)
 {
-       $sql="DELETE FROM ".TB_PREF."groups WHERE id=".db_escape($selected_id);
+       $sql="DELETE FROM `".TB_PREF."groups` WHERE id=".db_escape($selected_id);
        db_query($sql,"could not delete sales group");
 }
 
 function get_sales_groups($show_inactive)
 {
-       $sql = "SELECT * FROM ".TB_PREF."groups";
+       $sql = "SELECT * FROM `".TB_PREF."groups`";
        if (!$show_inactive) $sql .= " WHERE !inactive";
        $sql .= " ORDER BY description";
        return db_query($sql,"could not get groups");
@@ -38,7 +38,7 @@ function get_sales_groups($show_inactive)
 
 function get_sales_group($selected_id)
 {
-       $sql = "SELECT * FROM ".TB_PREF."groups WHERE id=".db_escape($selected_id);
+       $sql = "SELECT * FROM `".TB_PREF."groups` WHERE id=".db_escape($selected_id);
 
        $result = db_query($sql,"could not get group");
        return db_fetch($result);
@@ -46,7 +46,7 @@ function get_sales_group($selected_id)
 
 function get_sales_group_name($group_no)
 {
-       $sql = "SELECT description FROM ".TB_PREF."groups WHERE id = ".db_escape($group_no);
+       $sql = "SELECT description FROM `".TB_PREF."groups` WHERE id = ".db_escape($group_no);
        $result = db_query($sql, "could not get group");
        $row = db_fetch($result);
        return is_array($row) ? $row[0] : false;