[Phpgroupware-cvs] property/inc/class.soagreement.inc.php, 1.2

[nomail]

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

date: 2004/08/20 16:11:51;  author: sigurdne;  state: Exp;  lines: +11 -4

Log Message:
no message
=====================================================================
Index: property/inc/class.soagreement.inc.php
diff -u property/inc/class.soagreement.inc.php:1.1 
property/inc/class.soagreement.inc.php:1.2
--- property/inc/class.soagreement.inc.php:1.1  Fri Aug 20 15:15:21 2004
+++ property/inc/class.soagreement.inc.php      Fri Aug 20 16:11:51 2004
@@ -88,7 +88,7 @@
                        $joinmethod .= " $this->join $category_table ON ( 
$entity_table.category =$category_table.id)";
                        $joinmethod .= " $this->join  fm_vendor ON ( 
$entity_table.vendor_id =fm_vendor.id ))";
 
-                       $cols = $entity_table . ".*,$category_table.descr as 
category";
+                       $cols = $entity_table . ".*,$category_table.descr as 
category, org_name";
 
                        $cols_return[]                          = 'id';
                        $uicols['input_type'][]         = 'text';
@@ -96,12 +96,19 @@
                        $uicols['descr'][]                      = lang('ID');
                        $uicols['statustext'][]         = lang('ID');
 
+
                        $cols_return[]                          = 'name';
                        $uicols['input_type'][]         = 'text';
                        $uicols['name'][]                       = 'name';
                        $uicols['descr'][]                      = lang('name');
                        $uicols['statustext'][]         = lang('name');
 
+                       $cols_return[]                          = 'org_name';
+                       $uicols['input_type'][]         = 'text';
+                       $uicols['name'][]                       = 'org_name';
+                       $uicols['descr'][]                      = 
lang('Vendor');
+                       $uicols['statustext'][]         = lang('Vendor');
+
                        $cols_return[]                          = 'category';
                        $uicols['input_type'][]         = 'text';
                        $uicols['name'][]                       = 'category';
@@ -725,9 +732,9 @@
                                }
                        }
 
-                       $cols[] = $agreement['group_id'];
+                       $cols[] = 'group_id';
                        $vals[] = $agreement['group_id'];
-                       $cols[] = $agreement['status'];
+                       $cols[] = 'status';
                        $vals[] = $agreement['status'];
 
                        if($cols)
@@ -1437,7 +1444,7 @@
 
                        $this->uicols   = $uicols;
 
-                       $sql="SELECT fm_activities.* FROM fm_activities WHERE 
agreement_group_id = 1";
+                       $sql="SELECT fm_activities.* FROM fm_activities WHERE 
agreement_group_id = $group_id";
                        $this->db->query($sql);
 
                        while ($this->db->next_record())