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

[nomail]

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

date: 2004/10/22 17:45:16;  author: sigurdne;  state: Exp;  lines: +2 -6

Log Message:
no message
=====================================================================
Index: property/inc/class.sopricebook.inc.php
diff -u property/inc/class.sopricebook.inc.php:1.5 
property/inc/class.sopricebook.inc.php:1.6
--- property/inc/class.sopricebook.inc.php:1.5  Tue Aug 24 13:08:02 2004
+++ property/inc/class.sopricebook.inc.php      Fri Oct 22 17:45:16 2004
@@ -219,23 +219,19 @@
 
                                $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_agreement.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_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 
(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();