[Phpgroupware-cvs] property/inc class.soactor.inc.php, 1.7 class.menu.inc.php, 1.11 class.uiactor.inc.php, 1.8

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soactor.inc.php lines: +19 -6
            class.menu.inc.php lines: +10 -1
            class.uiactor.inc.php lines: +2 -2

Log Message:
no message

====================================================
Index: property/inc/class.soactor.inc.php
diff -u property/inc/class.soactor.inc.php:1.6 
property/inc/class.soactor.inc.php:1.7
--- property/inc/class.soactor.inc.php:1.6      Tue Feb  1 11:35:09 2005
+++ property/inc/class.soactor.inc.php  Thu Apr 28 11:08:16 2005
@@ -421,6 +421,12 @@
                                }
                        }

+                       if($this->role == 'vendor')
+                       {
+                               $cols[] = 'member_of';
+                               $vals[] = $actor['member_of'];
+                       }
+
                        if($cols)
                        {
                                $cols   = "," . implode(",", $cols);
@@ -437,8 +443,8 @@
                                $id = $this->bocommon->next_id($table);
                        }

-                       $this->db->query("INSERT INTO $table 
(id,entry_date,category,member_of $cols) "
-                               . "VALUES ($id,'" . time() . "','" . 
$actor['cat_id'] . "','" . $actor['member_of'] . "' $vals)");
+                       $this->db->query("INSERT INTO $table 
(id,entry_date,category $cols) "
+                               . "VALUES ($id,'" . time() . "','" . 
$actor['cat_id'] . "' $vals)");

                        $receipt['actor_id']= 
$id;//$this->db->get_last_insert_id($table,'id');

@@ -475,13 +481,20 @@
                                }
                        }

+                       $value_set['entry_date']        = time();
+                       $value_set['category']  = $actor['cat_id'];
+
+                       if($this->role == 'vendor')
+                       {
+                               $value_set['member_of'] = $actor['member_of'];
+                       }
+
                        if($value_set)
                        {
-                               $value_set      = ',' . 
$this->bocommon->validate_db_update($value_set);
+                               $value_set      = 
$this->bocommon->validate_db_update($value_set);
                        }

-                       $this->db->query("UPDATE $table set entry_date='" . 
time() . "', category='"
-                                                       . $actor['cat_id'] . 
"', member_of='" . $actor['member_of'] . "'$value_set WHERE id=" . 
intval($actor['actor_id']));
+                       $this->db->query("UPDATE $table set $value_set WHERE 
id=" . intval($actor['actor_id']));

                        $receipt['actor_id']= $actor['actor_id'];
                        $receipt['message'][] = array('msg'=>lang('actor %1 has 
been edited',$actor['actor_id']));

====================================================
Index: property/inc/class.menu.inc.php
diff -u property/inc/class.menu.inc.php:1.10 
property/inc/class.menu.inc.php:1.11
--- property/inc/class.menu.inc.php:1.10        Thu Apr 14 14:48:39 2005
+++ property/inc/class.menu.inc.php     Thu Apr 28 11:08:16 2005
@@ -239,6 +239,15 @@
                                        $menu['sub_menu'][$i]['name']           
        =       lang('Vendor');
                                        $menu['sub_menu'][$i]['statustext']     
        =       lang('Vendor');

+                                       $i++;
+                                       if($page=='tenant')
+                                       {
+                                               
$menu['sub_menu'][$i]['this']=True;
+                                       }
+                                       $menu['sub_menu'][$i]['link']           
        =       
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiactor.index&role=tenant');
+                                       $menu['sub_menu'][$i]['name']           
        =       lang('Tenant');
+                                       $menu['sub_menu'][$i]['statustext']     
        =       lang('Tenant');
+
                                        if ($this->acl2->check('.invoice',16))
                                        {
                                                $i++;

====================================================
Index: property/inc/class.uiactor.inc.php
diff -u property/inc/class.uiactor.inc.php:1.7 
property/inc/class.uiactor.inc.php:1.8
--- property/inc/class.uiactor.inc.php:1.7      Thu Jan 13 16:52:48 2005
+++ property/inc/class.uiactor.inc.php  Thu Apr 28 11:08:16 2005
@@ -165,7 +165,7 @@
                function index()
                {
                        $menu_sub = array(
-                               'tenant'=>'admin',
+                               'tenant'=>'invoice',
                                'owner' =>'admin',
                                'vendor'=>'invoice'
                                );