[Phpgroupware-cvs] property/inc/class.sodocument.inc.php, 1.3.2.1

[nomail]

Update of /property/inc
Modified Files:
        Branch: proposed-0_9_18-branch
          class.sodocument.inc.php

date: 2004/11/07 20:37:01;  author: sigurdne;  state: Exp;  lines: +8 -3

Log Message:
no message
=====================================================================
Index: property/inc/class.sodocument.inc.php
diff -u property/inc/class.sodocument.inc.php:1.3 
property/inc/class.sodocument.inc.php:1.3.2.1
--- property/inc/class.sodocument.inc.php:1.3   Thu Oct 21 19:54:15 2004
+++ property/inc/class.sodocument.inc.php       Sun Nov  7 20:37:01 2004
@@ -111,8 +111,13 @@
 
                                $document_table = 'fm_document';
 
-                               $cols .= $document_table . '.location_code';
+                               $cols .= $document_table . '.location_code, 
document_name';
                                $cols_return[] = 'location_code';
+                               $cols_return[] = 'document_name';
+                               $uicols['input_type'][]         = 'text';
+                               $uicols['name'][]                       = 
'document_name';
+                               $uicols['descr'][]                      = 
lang('Name');
+                               $uicols['statustext'][]         = lang('Name');
 
 //                             $cols .= ",$document_table.id as document_id";
 //                             $cols_return[]                          = 
'document_id';
@@ -168,12 +173,12 @@
                                $this->cols_extra       = 
$this->bocommon->fm_cache('cols_extra_document_' . $entity_id);
                        }
 
-                       $groupmethod= " GROUP BY 
fm_document.location_code,fm_document.address  ";
+//                     $groupmethod= " GROUP BY 
fm_document.location_code,fm_document.address  ";
 
                        if ($entity_id)
                        {
 
-                               $groupmethod.= " 
,fm_document.p_entity_id,fm_entity_category.name,fm_document.p_num,fm_document.p_cat_id";
+//                             $groupmethod.= " 
,fm_document.p_entity_id,fm_entity_category.name,fm_document.p_num,fm_document.p_cat_id";
                        }
 
                        if ($order)