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

[nomail]

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

date: 2004/08/24 13:08:02;  author: sigurdne;  state: Exp;  lines: +17 -12

Log Message:
no message
=====================================================================
Index: property/inc/class.sopricebook.inc.php
diff -u property/inc/class.sopricebook.inc.php:1.4 
property/inc/class.sopricebook.inc.php:1.5
--- property/inc/class.sopricebook.inc.php:1.4  Fri Aug 20 15:15:21 2004
+++ property/inc/class.sopricebook.inc.php      Tue Aug 24 13:08:02 2004
@@ -217,20 +217,25 @@
                                $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, 
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 "
-                               . " $this->join fm_agreement ON 
fm_activities.agreement_id = fm_agreement.id "
-                               . " WHERE fm_agreement.status='active' AND 
(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";
-*/
-                       $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_agreement.vendor_id = fm_vendor.id "
-                               . " $this->join fm_branch ON 
fm_activities.branch_id = fm_branch.id "
-                               . " $this->join fm_agreement ON 
fm_activity_price_index.agreement_id = fm_agreement.id "
-                               . " WHERE fm_agreement.status='active' AND 
(vendor_id $vendor_condition and current_index is not null "
+                               $sql = "SELECT fm_activities.num, 
fm_activities.unit, fm_activities.dim_d, fm_activities.ns3420, 
fm_activities.descr AS descr,"
+                      . " fm_activities.base_descr, 
fm_activity_price_index.activity_id, fm_vendor.org_name, fm_branch.descr AS 
branch,"
+                      . " fm_activity_price_index.vendor_id, 
fm_activity_price_index.total_cost, fm_activity_price_index.m_cost,"
+                      . " fm_activity_price_index.w_cost, 
fm_activity_price_index.index_count, fm_activity_price_index.this_index, 
fm_agreement.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_activities.branch_id = fm_branch.id 
$this->join "
+                      . " fm_agreement ON fm_activity_price_index.agreement_id 
= fm_agreement.id "
+                               . " WHERE fm_agreement.status='active' AND 
(fm_agreement.vendor_id $vendor_condition and current_index is not null "
                                . " OR (fm_agreement.vendor_id 
$vendor_condition) AND (fm_activity_price_index.this_index IS NULL)) 
$querymethod";
 
+
+
+//echo $sql;
+
+
+
+
                        $this->db2->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db2->num_rows();