[Phpgroupware-cvs] CVS: property/inc class.sob_account.inc.php,1.1,1.2 class.sogab.inc.php,1.9,1.10 class.soinvoice.inc.php,1.25,1.26

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.sob_account.inc.php class.sogab.inc.php 
        class.soinvoice.inc.php 
Log Message:
no message

Index: class.sob_account.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sob_account.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.sob_account.inc.php   29 Jun 2003 10:12:52 -0000      1.1
--- class.sob_account.inc.php   29 Jun 2003 15:43:11 -0000      1.2
***************
*** 109,113 ****
  
                        $this->db->query("INSERT INTO $table (id, 
descr,grouping) "
!                               . "VALUES (" . $b_account['id'] . ",'" . 
$b_account['descr']. "'," . substr($b_account['id'],0,2) . 
")",__LINE__,__FILE__);
  
                        $receipt['message'][]=array('msg'=>lang('budget account 
%1 has been saved',$b_account['id']));
--- 109,113 ----
  
                        $this->db->query("INSERT INTO $table (id, 
descr,grouping) "
!                               . "VALUES ('" . $b_account['id'] . "','" . 
$b_account['descr']. "','" . substr($b_account['id'],0,2) . 
"')",__LINE__,__FILE__);
  
                        $receipt['message'][]=array('msg'=>lang('budget account 
%1 has been saved',$b_account['id']));

Index: class.sogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sogab.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sogab.inc.php 28 Jun 2003 16:11:47 -0000      1.9
--- class.sogab.inc.php 29 Jun 2003 15:43:11 -0000      1.10
***************
*** 71,76 ****
                        if ($loc1)
                        {
!                               $len=strlen($loc1);
!                               $filtermethod .= " $where 
left(fm_gab_location.location_code,$len)='$loc1' ";
                                $where = 'AND';
                        }
--- 71,75 ----
                        if ($loc1)
                        {
!                               $filtermethod .= " $where 
fm_gab_location.loc1='$loc1' ";
                                $where = 'AND';
                        }
***************
*** 97,102 ****
                        }
  
! //                    $sql = "SELECT fm_gab_location.location_code, gab_id 
,count(gab_id) as hits FROM fm_gab_location $filtermethod GROUP BY gab_id";
!                       $sql = "SELECT fm_gab_location.location_code, gab_id 
,count(gab_id) as hits,descr as address  FROM fm_gab_location $this->join 
fm_entrance on fm_gab_location.location_code=fm_entrance.location_code 
$filtermethod GROUP BY gab_id";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
--- 96,100 ----
                        }
  
!                       $sql = "SELECT distinct gab_id,count(gab_id) as hits, 
loc1_name as address FROM fm_gab_location $this->join fm_location1 on 
fm_gab_location.loc1=fm_location1.loc1 $filtermethod GROUP BY 
gab_id,fm_location1.loc1_name ";
  
                        $this->db2->query($sql,__LINE__,__FILE__);

Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.soinvoice.inc.php     29 Jun 2003 10:12:52 -0000      1.25
--- class.soinvoice.inc.php     29 Jun 2003 15:43:11 -0000      1.26
***************
*** 437,446 ****
                        if($b_account_class)
                        {
!                               $filtermethod= " $where 
left(spbudact_code,2)='$b_account_class'";
                                $where= 'AND';
                        }
                        else
                        {
!                               $select_account_class=',left(spbudact_code,2) 
as b_account_class';
                                $group_account_class=', spbudact_code';
                        }
--- 437,446 ----
                        if($b_account_class)
                        {
!                               $filtermethod= " $where 
fm_b_account.grouping='$b_account_class'";
                                $where= 'AND';
                        }
                        else
                        {
!                               $select_account_class=',fm_b_account.grouping 
as b_account_class';
                                $group_account_class=', spbudact_code';
                        }
***************
*** 481,486 ****
  
                        $sql = "SELECT district_id,periode,sum(godkjentbelop) 
as consume $select_account_class "
!                               . " FROM  fm_ecobilagoverf  $this->join 
fm_location1 ON left(fm_ecobilagoverf.dima,4) = fm_location1.loc1 $this->join "
!                       . " fm_part_of_town ON fm_location1.part_of_town_id = 
fm_part_of_town.part_of_town_id "
                        . " $filtermethod group by district_id,periode 
$group_account_class";
  //echo $sql;
--- 481,487 ----
  
                        $sql = "SELECT district_id,periode,sum(godkjentbelop) 
as consume $select_account_class "
!                               . " FROM  fm_ecobilagoverf $this->join 
fm_location1 ON (left(fm_ecobilagoverf.dima,4) = fm_location1.loc1) "
!                               . " $this->join fm_part_of_town ON 
(fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id) "
!                               . " $this->join fm_b_account ON 
(fm_ecobilagoverf.spbudact_code = fm_b_account.id) "
                        . " $filtermethod group by district_id,periode 
$group_account_class";
  //echo $sql;