[Phpgroupware-cvs] [18655] update and stabilize

[Sigurd Nes]

Revision: 18655
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18655
Author:   sigurdne
Date:     2008-08-29 19:04:50 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
update and stabilize

Modified Paths:
--------------
    trunk/property/inc/class.bos_agreement.inc.php
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/inc/class.uis_agreement.inc.php

Modified: trunk/property/inc/class.bos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.bos_agreement.inc.php      2008-08-27 18:20:24 UTC 
(rev 18654)
+++ trunk/property/inc/class.bos_agreement.inc.php      2008-08-29 19:04:50 UTC 
(rev 18655)
@@ -46,7 +46,7 @@
                /**
                * @var object $custom reference to custom fields object
                */
-               protected $custom;
+               public $custom;
 
                var $public_functions = array
                (

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2008-08-27 18:20:24 UTC (rev 
18654)
+++ trunk/property/inc/class.soinvoice.inc.php  2008-08-29 19:04:50 UTC (rev 
18655)
@@ -197,11 +197,10 @@
 
                        if($query)
                        {
-                               $query = $this->db->db_addslashes($query);
-                               $querymethod = " $where ( spvend_code 
$this->like '%$query%' OR bilagsnr $this->like '%$query%' )";
+                               $query = (int) $query;
+                               $querymethod = " $where ( spvend_code = 
{$query} OR bilagsnr = {$query})";
                        }
 
-
                        $sql = "SELECT bilagsnr, count(bilagsnr) as 
invoice_count, sum(belop) as belop,spvend_code,fakturadato FROM  $table 
$join_tables $filtermethod $querymethod group by 
bilagsnr,spvend_code,fakturadato ";
                        $sql2 = "SELECT DISTINCT bilagsnr FROM  $table 
$join_tables $filtermethod $querymethod";
 

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2008-08-27 18:20:24 UTC (rev 
18654)
+++ trunk/property/inc/class.uientity.inc.php   2008-08-29 19:04:50 UTC (rev 
18655)
@@ -902,21 +902,21 @@
 
 //_debug_array($values['origin']);
 
-                       for ($i=0;$i<count($values['attributes']);$i++)
+                       foreach ($values['attributes'] as & $attribute)
                        {
-                               if($values['attributes'][$i]['history']==1)
+                               if($attribute['history'] == true)
                                {
                                        $link_history_data = array
                                        (
                                                'menuaction'    => 
'property.uientity.attrib_history',
                                                'entity_id'     => 
$this->entity_id,
                                                'cat_id'        => 
$this->cat_id,
-                                               'attrib_id'     => 
$values['attributes'][$i]['attrib_id'],
+                                               'attrib_id'     => 
$attribute['id'],
                                                'id'            => $id,
                                                'edit'          => true
                                        );
 
-                                       
$values['attributes'][$i]['link_history']=$GLOBALS['phpgw']->link('/index.php',$link_history_data);
+                                       $attribute['link_history'] = 
$GLOBALS['phpgw']->link('/index.php',$link_history_data);
                                }
                        }
 

Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php      2008-08-27 18:20:24 UTC 
(rev 18654)
+++ trunk/property/inc/class.uis_agreement.inc.php      2008-08-29 19:04:50 UTC 
(rev 18655)
@@ -80,6 +80,7 @@
                        $this->acl_edit         = 
$this->acl->check($this->acl_location, PHPGW_ACL_EDIT, 'property');
                        $this->acl_delete       = 
$this->acl->check($this->acl_location, PHPGW_ACL_DELETE, 'property');
                        $this->acl_manage       = 
$this->acl->check($this->acl_location, 16, 'property');
+                       $this->custom           = & $this->bo->custom;
 
                        $this->start            = $this->bo->start;
                        $this->query            = $this->bo->query;
@@ -1572,7 +1573,7 @@
                                'table_header'          => $table_header,
                        );
 
-                       $attrib_data    = $this->bo->custom->get('property', 
'.s_agreement.detail', $attrib_id);
+                       $attrib_data    = $this->custom->get('property', 
'.s_agreement.detail', $attrib_id);
                        $appname        = $attrib_data['input_text'];
 
                        $function_msg   = lang('history');