[Phpgroupware-cvs] CVS: property/inc class.sopricebook.inc.php, 1.12, 1.13 class.soproject.inc.php, 1.32, 1.33

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv10430

Modified Files:
        class.sopricebook.inc.php class.soproject.inc.php 
Log Message:
no message

Index: class.sopricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sopricebook.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.sopricebook.inc.php   8 Aug 2003 21:16:48 -0000       1.12
--- class.sopricebook.inc.php   30 Aug 2003 23:30:00 -0000      1.13
***************
*** 63,67 ****
                        $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 org_name ,vendor_id "
                                . " ORDER BY phpgw_addressbook.org_name ");
                                while ($this->db->next_record())
--- 63,67 ----
                        $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 ");
                                while ($this->db->next_record())
***************
*** 193,196 ****
--- 193,201 ----
                        {
                                $filtermethod .= " AND cat_id='$cat_id' ";
+                               $vendor_condition= "= $cat_id";
+                       }
+                       else
+                       {                               
+                               $vendor_condition= " IS NULL";
                        }
  
***************
*** 206,211 ****
                                . " 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 "
                                . " $this->join fm_branch ON 
fm_activities.branch_id = fm_branch.id "
!                               . " WHERE (vendor_id='$cat_id' and 
current_index is not null "
!                               . " OR (fm_activity_price_index.vendor_id = 
'$cat_id') AND (fm_activity_price_index.this_index IS NULL)) $querymethod";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
--- 211,216 ----
                                . " 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 "
                                . " $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";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
***************
*** 445,449 ****
                        else
                        {
!                               $filtermethod = " Where agreement_id = ''";
                        }
                        if($query)
--- 450,454 ----
                        else
                        {
!                               $filtermethod = " Where agreement_id IS NULL";
                        }
                        if($query)

Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** class.soproject.inc.php     29 Aug 2003 16:17:55 -0000      1.32
--- class.soproject.inc.php     30 Aug 2003 23:30:00 -0000      1.33
***************
*** 335,339 ****
                {
  
!                       $this->db2->query("SELECT branch_id from 
fm_projectbranch WHERE project_id='$project_id' ",__LINE__,__FILE__);
                        while ($this->db2->next_record())
                        {
--- 335,339 ----
                {
  
!                       $this->db2->query("SELECT branch_id from 
fm_projectbranch WHERE project_id=" .  (int)$project_id ,__LINE__,__FILE__);
                        while ($this->db2->next_record())
                        {