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

[nomail]

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

date: 2004/06/03 18:15:27;  author: sigurdne;  state: Exp;  lines: +4 -1

Log Message:
no message
=====================================================================
Index: property/inc/class.sopricebook.inc.php
diff -u property/inc/class.sopricebook.inc.php:1.2 
property/inc/class.sopricebook.inc.php:1.3
--- property/inc/class.sopricebook.inc.php:1.2  Wed Jun  2 18:54:28 2004
+++ property/inc/class.sopricebook.inc.php      Thu Jun  3 18:15:27 2004
@@ -71,6 +71,8 @@
                {
                        $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 "
+                               . " $this->join fm_agreement ON 
fm_activities.agreement_id = fm_agreement.id "
+                               . " WHERE fm_agreement.status='active'"
                                . " GROUP by fm_vendor.org_name ,vendor_id "
                                . " ORDER BY fm_vendor.org_name ");
                                while ($this->db->next_record())
@@ -219,7 +221,8 @@
                        $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 "
+                               . " $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";
 
                        $this->db2->query($sql,__LINE__,__FILE__);