[Phpgroupware-cvs] property/inc/class.sopricebook.inc.php, 1.1.1.2

[nomail]

Update of /property/inc
Modified Files:
        Branch: 
          class.sopricebook.inc.php

date: 2004/05/30 19:10:31;  author: sigurdne;  state: Exp;  lines: +11 -11

Log Message:
no message
=====================================================================
Index: property/inc/class.sopricebook.inc.php
diff -u property/inc/class.sopricebook.inc.php:1.1.1.1 
property/inc/class.sopricebook.inc.php:1.1.1.2
--- property/inc/class.sopricebook.inc.php:1.1.1.1      Fri Apr 23 13:13:57 2004
+++ property/inc/class.sopricebook.inc.php      Sun May 30 19:10:31 2004
@@ -69,10 +69,10 @@
 
                function get_vendor_list()
                {
-                       $this->db->query("SELECT phpgw_addressbook.org_name 
,vendor_id "
-                               . " FROM (fm_activities $this->join 
fm_activity_price_index ON fm_activities.id = 
fm_activity_price_index.activity_id) $this->join phpgw_addressbook ON 
fm_activity_price_index.vendor_id = phpgw_addressbook.id "
-                               . " GROUP by phpgw_addressbook.org_name 
,vendor_id "
-                               . " ORDER BY phpgw_addressbook.org_name ");
+                       $this->db->query("SELECT fm_vendor.org_name ,vendor_id "
+                               . " FROM (fm_activities $this->join 
fm_activity_price_index ON fm_activities.id = 
fm_activity_price_index.activity_id) $this->join fm_vendor ON 
fm_activity_price_index.vendor_id = fm_vendor.id "
+                               . " GROUP by fm_vendor.org_name ,vendor_id "
+                               . " ORDER BY fm_vendor.org_name ");
                                while ($this->db->next_record())
                                {
 //--------->fix this------->
@@ -195,7 +195,7 @@
                        }
                        else
                        {
-                               $ordermethod = ' order by 
phpgw_addressbook.org_name,activity_id';
+                               $ordermethod = ' order by 
fm_vendor.org_name,activity_id';
                        }
 
                        if ($cat_id > 0)
@@ -216,8 +216,8 @@
                                $querymethod = " AND (fm_activities.descr LIKE 
'%$query%' or fm_activities.num LIKE '%$query%')";
                        }
 
-                       $sql = "SELECT 
fm_activities.num,fm_activities.unit,fm_activities.dim_d,fm_activities.ns3420,fm_activities.descr
 as descr, fm_activities.base_descr,activity_id, 
phpgw_addressbook.org_name,fm_branch.descr as branch 
,vendor_id,total_cost,m_cost,w_cost,index_count,fm_activity_price_index.this_index
 "
-                               . " FROM (fm_activities  $this->join 
fm_activity_price_index ON fm_activities.id = 
fm_activity_price_index.activity_id) $this->join phpgw_addressbook ON 
fm_activity_price_index.vendor_id = phpgw_addressbook.id "
+                       $sql = "SELECT 
fm_activities.num,fm_activities.unit,fm_activities.dim_d,fm_activities.ns3420,fm_activities.descr
 as descr, fm_activities.base_descr,activity_id, 
fm_vendor.org_name,fm_branch.descr as branch 
,vendor_id,total_cost,m_cost,w_cost,index_count,fm_activity_price_index.this_index
 "
+                               . " FROM (fm_activities  $this->join 
fm_activity_price_index ON fm_activities.id = 
fm_activity_price_index.activity_id) $this->join fm_vendor ON 
fm_activity_price_index.vendor_id = fm_vendor.id "
                                . " $this->join fm_branch ON 
fm_activities.branch_id = fm_branch.id "
                                . " WHERE (vendor_id $vendor_condition and 
current_index is not null "
                                . " OR (fm_activity_price_index.vendor_id 
$vendor_condition) AND (fm_activity_price_index.this_index IS NULL)) 
$querymethod";
@@ -530,7 +530,7 @@
                        }
                        else
                        {
-                               $ordermethod = " order by 
phpgw_addressbook.org_name asc";
+                               $ordermethod = " order by fm_vendor.org_name 
asc";
                        }
 
                        if ($cat_id > 0)
@@ -546,11 +546,11 @@
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
 
-                               $querymethod = " AND 
(phpgw_addressbook.org_name LIKE '%$query%' or vendor_id LIKE '%$query%')";
+                               $querymethod = " AND (fm_vendor.org_name LIKE 
'%$query%' or vendor_id LIKE '%$query%')";
                        }
 
-                       $sql = "SELECT fm_activities.id as 
activity_id,fm_activities.num, phpgw_addressbook.org_name,fm_branch.descr as 
branch ,vendor_id "
-                               . " FROM (fm_activities  $this->join 
fm_activity_price_index ON fm_activities.id = 
fm_activity_price_index.activity_id)  $this->join phpgw_addressbook ON 
fm_activity_price_index.vendor_id = phpgw_addressbook.id "
+                       $sql = "SELECT fm_activities.id as 
activity_id,fm_activities.num, fm_vendor.org_name,fm_branch.descr as branch 
,vendor_id "
+                               . " FROM (fm_activities  $this->join 
fm_activity_price_index ON fm_activities.id = 
fm_activity_price_index.activity_id)  $this->join fm_vendor ON 
fm_activity_price_index.vendor_id = fm_vendor.id "
                                . " $this->join fm_branch on fm_branch.id = 
fm_activities.branch_id "
                                . " Where fm_activity_price_index.activity_id= 
'$activity_id' $querymethod group by 
fm_activities.id,fm_activities.num,fm_branch.descr,org_name ,vendor_id ";