phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: property/inc class.bolookup.inc.php,1.4,1.5 clas


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/inc class.bolookup.inc.php,1.4,1.5 class.bopricebook.inc.php,1.2,1.3 class.sobuilding.inc.php,1.7,1.8 class.solookup.inc.php,1.11,1.12 class.sopricebook.inc.php,1.2,1.3 class.sostandard_2.inc.php,1.5,1.6 class.uilookup.inc.php,1.9,1.10 class.uipricebook.inc.php,1.2,1.3 hook_admin.inc.php,1.18,1.19
Date: Tue, 04 Mar 2003 05:48:58 -0500

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

Modified Files:
        class.bolookup.inc.php class.bopricebook.inc.php 
        class.sobuilding.inc.php class.solookup.inc.php 
        class.sopricebook.inc.php class.sostandard_2.inc.php 
        class.uilookup.inc.php class.uipricebook.inc.php 
        hook_admin.inc.php 
Log Message:
no message

Index: class.bolookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolookup.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bolookup.inc.php      27 Feb 2003 09:53:36 -0000      1.4
--- class.bolookup.inc.php      4 Mar 2003 10:48:52 -0000       1.5
***************
*** 112,115 ****
--- 112,124 ----
                }
  
+               function read_ns3420()
+               {
+                       $ns3420 = $this->so->read_ns3420(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
+                                                                               
        'filter' => $this->filter,'cat_id' => $this->cat_id));
+                       $this->total_records = $this->so->total_records;
+ 
+                       return $ns3420;
+               }
+ 
                function read_location()
                {

Index: class.bopricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bopricebook.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bopricebook.inc.php   2 Mar 2003 00:39:12 -0000       1.2
--- class.bopricebook.inc.php   4 Mar 2003 10:48:52 -0000       1.3
***************
*** 103,106 ****
--- 103,115 ----
                }
  
+               function read_activity_prize($activity_id,$vendor_id)
+               {
+                       $pricebook = 
$this->so->read_activity_prize(array('start' => $this->start,'query' => 
$this->query,'sort' => $this->sort,'order' => $this->order,
+                                                                               
        'filter' => $this->filter,'cat_id' => 
$this->cat_id,'allrows'=>$this->allrows,'activity_id'=>$activity_id,'vendor_id'=>$vendor_id));
+                       $this->total_records = $this->so->total_records;
+                       return $pricebook;
+               }
+ 
+ 
                function read_activities_pr_aggreement()
                {
***************
*** 111,117 ****
                }
  
!               function read_single($property_id,$building_id)
                {
!                       return 
$this->so->read_single($property_id,$building_id);
                }
  
--- 120,139 ----
                }
  
!               function read_vendor_pr_activity($activity_id)
!               {
!                       $pricebook = 
$this->so->read_vendor_pr_activity(array('start' => $this->start,'query' => 
$this->query,'sort' => $this->sort,'order' => $this->order,
!                                                                               
        'filter' => $this->filter,'cat_id' => 
$this->cat_id,'allrows'=>$this->allrows,'activity_id'=>$activity_id));
!                       $this->total_records = $this->so->total_records;
!                       return $pricebook;
!               }
! 
!               function add_activity_vendor($values)
!               {
!                       return $this->so->add_activity_vendor($values);
!               }
! 
!               function read_single_activity($id='')
                {
!                       return $this->so->read_single_activity($id);
                }
  
***************
*** 124,131 ****
                {
  
                        
$date_array=$this->bocommon->date_array($values['date']);
  
                        $date = mktime 
(2,0,0,$date_array['month'],$date_array['day'],$date_array['year']);
!                       $date= date($this->bocommon->dateformat,$date);
  
                        $new_index=str_replace(",",".",$values['new_index']);
--- 146,154 ----
                {
  
+ //_debug_array($values);
                        
$date_array=$this->bocommon->date_array($values['date']);
  
                        $date = mktime 
(2,0,0,$date_array['month'],$date_array['day'],$date_array['year']);
! //                    $date= date($this->bocommon->dateformat,$date);
  
                        $new_index=str_replace(",",".",$values['new_index']);
***************
*** 137,145 ****
                                if(!$values['old_total_cost'][$n])
                                {
!                                       
$new_total_cost=($values['old_m_cost'][$n]+$values['old_w_cost'][$n])*$values['new_index'];
                                }
                                else
                                {
!                                       
$new_total_cost=$values['old_total_cost'][$n]*$values['new_index'];
                                }
  
--- 160,168 ----
                                if(!$values['old_total_cost'][$n])
                                {
!                                       
$new_total_cost=($values['old_m_cost'][$n]+$values['old_w_cost'][$n])*$new_index;
                                }
                                else
                                {
!                                       
$new_total_cost=$values['old_total_cost'][$n]*$new_index;
                                }
  
***************
*** 150,154 ****
                                else
                                {
!                                       
$new_m_cost=$values['old_m_cost'][$n]*$values['new_index'];
                                }
  
--- 173,177 ----
                                else
                                {
!                                       
$new_m_cost=$values['old_m_cost'][$n]*$new_index;
                                }
  
***************
*** 159,163 ****
                                else
                                {
!                                       
$new_w_cost=$values['old_w_cost'][$n]*$values['new_index'];
                                }
  
--- 182,186 ----
                                else
                                {
!                                       
$new_w_cost=$values['old_w_cost'][$n]*$new_index;
                                }
  
***************
*** 168,172 ****
                                        'activity_id'           => 
$values['activity_id'][$n],
                                        'vendor_id'                     => 
$values['vendor_id'][$n],
!                                       'new_index'                     => 
$values['new_index'],
                                        'new_date'                      => 
$date,
                                );
--- 191,195 ----
                                        'activity_id'           => 
$values['activity_id'][$n],
                                        'vendor_id'                     => 
$values['vendor_id'][$n],
!                                       'new_index'                     => 
$new_index,
                                        'new_date'                      => 
$date,
                                );
***************
*** 177,183 ****
                        if($update)
                        {
!                               $this->so->update_pricebook($update);
                        }
  
                }
  
--- 200,231 ----
                        if($update)
                        {
!                               $receipt =      
$this->so->update_pricebook($update);
!                       }
!                       else
!                       {
!                                       $receipt['message'][] = 
array('msg'=>lang('Nothing to do!'));
                        }
  
+                       return $receipt;
+ 
+               }
+ 
+               function add_activity_first_prize($values)
+               {
+ 
+                       
$date_array=$this->bocommon->date_array($values['date']);
+ 
+                       $date = mktime 
(2,0,0,$date_array['month'],$date_array['day'],$date_array['year']);
+ //                    $date= date($this->bocommon->dateformat,$date);
+ 
+                       $m_cost                 = 
str_replace(",",".",$values['m_cost']);
+                       $w_cost                 = 
str_replace(",",".",$values['w_cost']);
+                       $total_cost             = $m_cost + $w_cost;
+                       $activity_id    = $values['activity_id'];
+                       $vendor_id              = $values['vendor_id'];
+ 
+                       $receipt = 
$this->so->add_activity_first_prize($m_cost,$w_cost,$total_cost,$activity_id,$vendor_id,$date);
+ 
+                       return $receipt;
                }
  
***************
*** 223,226 ****
--- 271,373 ----
                }
  
+               function get_dim_d_list($selected='')
+               {
+                       
$GLOBALS['phpgw']->xslttpl->add_file(array('dim_d_select'));
+ 
+                       $dim_ds= $this->so->get_dim_d_list();
+ 
+                       while (is_array($dim_ds) && list(,$dim_d_entry) = 
each($dim_ds))
+                       {
+                               $sel_dim_d_entry = '';
+                               if ($dim_d_entry['id']==$selected)
+                               {
+                                       $sel_dim_d_entry = 'selected';
+                               }
+ 
+                               $dim_d_list[] = array
+                               (
+                                       'id'            => $dim_d_entry['id'],
+                                       'name'          => $dim_d_entry['name'],
+                                       'selected'      => $sel_dim_d_entry
+                               );
+                       }
+ 
+                       for ($i=0;$i<count($dim_d_list);$i++)
+                       {
+                               if ($dim_d_list[$i]['selected'] != 'selected')
+                               {
+                                       unset($dim_d_list[$i]['selected']);
+                               }
+                       }
+ 
+                       return $dim_d_list;
+               }
+ 
+               function get_unit_list($selected='')
+               {
+                       
$GLOBALS['phpgw']->xslttpl->add_file(array('unit_select'));
+ 
+                       $units= $this->so->get_unit_list();
+ 
+                       while (is_array($units) && list(,$unit_entry) = 
each($units))
+                       {
+                               $sel_unit_entry = '';
+                               if ($unit_entry['id']==$selected)
+                               {
+                                       $sel_unit_entry = 'selected';
+                               }
+ 
+                               $unit_list[] = array
+                               (
+                                       'id'            => $unit_entry['id'],
+                                       'name'          => $unit_entry['name'],
+                                       'selected'      => $sel_unit_entry
+                               );
+                       }
+ 
+                       for ($i=0;$i<count($unit_list);$i++)
+                       {
+                               if ($unit_list[$i]['selected'] != 'selected')
+                               {
+                                       unset($unit_list[$i]['selected']);
+                               }
+                       }
+ 
+                       return $unit_list;
+               }
+ 
+               function get_branch_list($selected='')
+               {
+                       
$GLOBALS['phpgw']->xslttpl->add_file(array('branch_select'));
+ 
+                       $branches= $this->so->get_branch_list();
+ 
+                       while (is_array($branches) && list(,$branch_entry) = 
each($branches))
+                       {
+                               $sel_branch_entry = '';
+                               if ($branch_entry['id']==$selected)
+                               {
+                                       $sel_branch_entry = 'selected';
+                               }
+ 
+                               $branch_list[] = array
+                               (
+                                       'id'            => $branch_entry['id'],
+                                       'name'          => 
$branch_entry['name'],
+                                       'selected'      => $sel_branch_entry
+                               );
+                       }
+ 
+                       for ($i=0;$i<count($branch_list);$i++)
+                       {
+                               if ($branch_list[$i]['selected'] != 'selected')
+                               {
+                                       unset($branch_list[$i]['selected']);
+                               }
+                       }
+ 
+                       return $branch_list;
+               }
+ 
                function get_agreement_list($format='',$selected='')
                {
***************
*** 265,310 ****
  
  
!               function save($building,$action='')
                {
-                       if ($building['access'])
-                       {
-                               $building['access'] = 'private';
-                       }
-                       else
-                       {
-                               $building['access'] = 'public';
-                       }
  
                        if ($action=='edit')
                        {
!                               if 
($this->socommon->check_building($building['property_id'],$building['building_id']))
!                               {
!                                       $receipt = $this->so->edit($building);
!                               }
!                               else
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('This building_id ID does not exist!'));
!                               }
                        }
                        else
                        {
! 
!                               
if(!$this->socommon->check_property($building['property_id']))
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('This property ID does not exist!'));
!                               }
! 
!                               if(!$receipt['error'])
!                               {
!                                       
$building['location_code']=$this->bocommon->location_code($building['property_id'],$building['building_id']);
!                                       $receipt = $this->so->add($building);
!                               }
                        }
                        return $receipt;
                }
  
!               function delete($property_id,$building_id)
                {
!                       $this->so->delete($property_id,$building_id);
                }
        }
--- 412,448 ----
  
  
!               function check_category_num($num='')
!               {
!                       return $this->so->check_category_num($num);
!               }
! 
!               function save_activity($values,$action='')
                {
  
                        if ($action=='edit')
                        {
!                               $receipt = $this->so->edit_activity($values);
                        }
                        else
                        {
!                               
$values['activity_id']=$this->socommon->next_id('fm_wo_activities');
!                               $receipt = $this->so->add_activity($values);
                        }
                        return $receipt;
                }
  
!               function delete_activity_vendor($activity_id,$vendor_id)
!               {
!                       
$this->so->delete_activity_vendor($activity_id,$vendor_id);
!               }
! 
!               function delete_activity($activity_id)
!               {
!                       $this->so->delete_activity($activity_id);
!               }
! 
!               function 
delete_prize_index($activity_id,$vendor_id,$index_count)
                {
!                       
$this->so->delete_prize_index($activity_id,$vendor_id,$index_count);
                }
        }

Index: class.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.sobuilding.inc.php    27 Feb 2003 09:53:36 -0000      1.7
--- class.sobuilding.inc.php    4 Mar 2003 10:48:52 -0000       1.8
***************
*** 183,187 ****
                function delete($property_id,$building_id )
                {
!                       $this->db->query("DELETE FROM fm_building WHERE 
property_id='" . $property_id . "' and building_id='" . $building_id 
."'",__LINE__,__FILE__);
                }
        }
--- 183,187 ----
                function delete($property_id,$building_id )
                {
!                       $this->db->query("DELETE FROM fm_building WHERE 
property_id='$property_id' and building_id='$building_id'",__LINE__,__FILE__);
                }
        }

Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.solookup.inc.php      27 Feb 2003 09:53:36 -0000      1.11
--- class.solookup.inc.php      4 Mar 2003 10:48:52 -0000       1.12
***************
*** 287,291 ****
                }
  
!                       function read_property($data)
                {
  //_debug_array($data);
--- 287,345 ----
                }
  
!               function read_ns3420($data)
!               {
!                       if(is_array($data))
!                       {
!                               if ($data['start'])
!                               {
!                                       $start=$data['start'];
!                               }
!                               else
!                               {
!                                       $start=0;
!                               }
!                               $filter = 
(isset($data['filter'])?$data['filter']:'none');
!                               $query = 
(isset($data['query'])?$data['query']:'');
!                               $sort = 
(isset($data['sort'])?$data['sort']:'DESC');
!                               $order = 
(isset($data['order'])?$data['order']:'');
!                               $cat_id = 
(isset($data['cat_id'])?$data['cat_id']:0);
!                       }
! 
!                       if ($order)
!                       {
!                               $ordermethod = " order by $order $sort";
!                       }
!                       else
!                       {
!                               $ordermethod = ' order by tekst1 DESC';
!                       }
! 
!                       if($query)
!                       {
!                               $query = ereg_replace("'",'',$query);
!                               $query = ereg_replace('"','',$query);
! 
!                               $querymethod = " where ( tekst1 LIKE '%$query%' 
or tekst2 LIKE '%$query%' or tekst3 LIKE '%$query%' or tekst4 LIKE '%$query%' 
or tekst5 LIKE '%$query%' or tekst6 LIKE '%$query%')";
!                       }
! 
!                       $sql = "SELECT * FROM fm_wo_ns3420  $querymethod  ";
! 
!                       $this->db2->query($sql,__LINE__,__FILE__);
!                       $this->total_records = $this->db2->num_rows();
!                       $this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
! 
!                       while ($this->db->next_record())
!                       {
!                               $ns3420[] = array
!                               (
!                                       'id'                    => 
$this->db->f('id'),
!                                       'ns3420_descr'  => 
$this->db->f('tekst1') . ' ' .$this->db->f('tekst2') . ' ' 
.$this->db->f('tekst3') . ' ' .$this->db->f('tekst4') . ' ' 
.$this->db->f('tekst5') . ' ' .$this->db->f('tekst6')
!                                       );
!                       }
! 
!                       return $ns3420;
!               }
! 
!               function read_property($data)
                {
  //_debug_array($data);

Index: class.sopricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sopricebook.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sopricebook.inc.php   2 Mar 2003 00:39:12 -0000       1.2
--- class.sopricebook.inc.php   4 Mar 2003 10:48:52 -0000       1.3
***************
*** 29,32 ****
--- 29,42 ----
                }
  
+               function 
add_activity_first_prize($m_cost,$w_cost,$total_cost,$activity_id,$vendor_id,$date)
+               {
+                       $this->db->query("insert_ into 
fm_wo_activity_price_index (activity_id, vendor_id, index_count, this_index, 
m_cost, w_cost, total_cost, date,current_index) "
+                       . " values 
('$activity_id','$vendor_id','1','1','$m_cost','$w_cost','$total_cost','$date','1')",__LINE__,__FILE__);
+ 
+                       $receipt['message'][] = array('msg'=>lang('First entry 
is added!'));
+ 
+                       return $receipt;
+               }
+ 
                function update_pricebook($update)
                {
***************
*** 52,55 ****
--- 62,69 ----
                        }
  
+                       $receipt['message'][] = array('msg'=>lang('%1 entries 
is updated!',$i));
+ 
+                       return $receipt;
+ 
                }
  
***************
*** 85,88 ****
--- 99,156 ----
                }
  
+               function get_dim_d_list()
+               {
+                       $this->db->query("SELECT * FROM fm_wo_dim_d ORDER BY 
descr asc");
+                       while ($this->db->next_record())
+                       {
+                               $dim_d_list[]=array
+                               (
+                                       'id'    => $this->db->f('id'),
+                                       'name'  => $this->db->f('id')
+                               );
+                       }
+                       return $dim_d_list;
+               }
+ 
+               function get_unit_list()
+               {
+                       $this->db->query("SELECT * FROM fm_standard_unit ORDER 
BY descr asc");
+                       while ($this->db->next_record())
+                       {
+                               $unit_list[]=array
+                               (
+                                       'id'    => $this->db->f('id'),
+                                       'name'  => 
$GLOBALS['phpgw']->strip_html($this->db->f('descr'))
+                               );
+                       }
+                       return $unit_list;
+               }
+ 
+               function get_branch_list()
+               {
+                       $this->db->query("SELECT * FROM fm_wo_branch ORDER BY 
descr asc");
+                       while ($this->db->next_record())
+                       {
+                               $branch_list[]=array
+                               (
+                                       'id'    => $this->db->f('id'),
+                                       'name'  => 
$GLOBALS['phpgw']->strip_html($this->db->f('descr'))
+                               );
+                       }
+                       return $branch_list;
+               }
+ 
+               function check_category_num($num='')
+               {
+                       $this->db->query("SELECT count(*) FROM fm_wo_activities 
where num='$num'");
+ 
+                       $this->db->next_record();
+ 
+                       if ( $this->db->f(0))
+                       {
+                               return True;
+                       }
+               }
+ 
                function read($data)
                {
***************
*** 168,171 ****
--- 236,318 ----
                }
  
+               function read_activity_prize($data)
+               {
+                       if(is_array($data))
+                       {
+                               if ($data['start'])
+                               {
+                                       $start=$data['start'];
+                               }
+                               else
+                               {
+                                       $start=0;
+                               }
+                               $filter = 
(isset($data['filter'])?$data['filter']:'none');
+                               $query = 
(isset($data['query'])?$data['query']:'');
+                               $sort = 
(isset($data['sort'])?$data['sort']:'DESC');
+                               $order = 
(isset($data['order'])?$data['order']:'');
+                               $cat_id = 
(isset($data['cat_id'])?$data['cat_id']:0);
+                               $activity_id = 
(isset($data['activity_id'])?$data['activity_id']:0);
+                               $vendor_id = 
(isset($data['vendor_id'])?$data['vendor_id']:0);
+                               $allrows                = 
(isset($data['allrows'])?$data['allrows']:'');
+                       }
+ 
+                       if ($order)
+                       {
+                               $ordermethod = " order by $order $sort";
+                       }
+                       else
+                       {
+                               $ordermethod = ' order by index_count';
+                       }
+ 
+                       if ($cat_id > 0)
+                       {
+                               $filtermethod .= " AND cat_id='$cat_id' ";
+                       }
+ 
+                       if($query)
+                       {
+                               $query = ereg_replace("'",'',$query);
+                               $query = ereg_replace('"','',$query);
+ 
+                               $querymethod = " AND (fm_wo_activities.descr 
LIKE '%$query%' or fm_wo_activities.num LIKE '%$query%')";
+                       }
+ 
+                       $sql = "SELECT 
index_count,this_index,current_index,m_cost,w_cost,total_cost,date"
+                               . " FROM fm_wo_activity_price_index Where 
activity_id= '$activity_id' and vendor_id= '$vendor_id'";
+ 
+ 
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       $this->total_records = $this->db2->num_rows();
+ 
+                       if(!$allrows)
+                       {
+                               $this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
+                       }
+                       else
+                       {
+                               $this->db->query($sql . 
$ordermethod,__LINE__,__FILE__);
+                       }
+ 
+                       while ($this->db->next_record())
+                       {
+                               $ngrants = 
(int)$this->grants[$this->db->f('building_owner')];
+                               $pricebook[] = array
+                               (
+                                       'index_count'           => 
$this->db->f('index_count'),
+                                       'this_index'            => 
$this->db->f('this_index'),
+                                       'current_index'                 => 
$this->db->f('current_index'),
+                                       'm_cost'                        => 
$this->db->f('m_cost'),
+                                       'w_cost'                        => 
$this->db->f('w_cost'),
+                                       'total_cost'            => 
$this->db->f('total_cost'),
+                                       'date'                          => 
$this->db->f('date'),
+                                       'grants'                        => 
$ngrants
+                               );
+                       }
+ //            _debug_array($pricebook);
+                       return $pricebook;
+               }
+ 
                function read_activities_pr_aggreement($data)
                {
***************
*** 250,256 ****
                }
  
!               function read_single($property_id,$building_id)
                {
!                       $sql = "SELECT * FROM fm_building  where 
property_id='$property_id' and building_id='$building_id'";
  
                        $this->db->query($sql,__LINE__,__FILE__);
--- 397,482 ----
                }
  
!               function read_vendor_pr_activity($data)
                {
!                       if(is_array($data))
!                       {
!                               if ($data['start'])
!                               {
!                                       $start=$data['start'];
!                               }
!                               else
!                               {
!                                       $start=0;
!                               }
!                               $filter                 = 
(isset($data['filter'])?$data['filter']:'none');
!                               $query                  = 
(isset($data['query'])?$data['query']:'');
!                               $sort                   = 
(isset($data['sort'])?$data['sort']:'DESC');
!                               $order                  = 
(isset($data['order'])?$data['order']:'');
!                               $cat_id                 = 
(isset($data['cat_id'])?$data['cat_id']:0);
!                               $allrows                = 
(isset($data['allrows'])?$data['allrows']:'');
!                               $activity_id    = 
(isset($data['activity_id'])?$data['activity_id']:'');
!                       }
! 
!                       if ($order)
!                       {
!                               $ordermethod = " order by $order $sort";
!                       }
!                       else
!                       {
!                               $ordermethod = " order by 
phpgw_addressbook.org_name asc";
!                       }
! 
!                       if ($cat_id > 0)
!                       {
!                               $filtermethod .= " Where agreement_id='$cat_id' 
";
!                       }
!                       else
!                       {
!                               $filtermethod = " Where agreement_id = ''";
!                       }
!                       if($query)
!                       {
!                               $query = ereg_replace("'",'',$query);
!                               $query = ereg_replace('"','',$query);
! 
!                               $querymethod = " AND 
(phpgw_addressbook.org_name LIKE '%$query%' or vendor_id LIKE '%$query%')";
!                       }
! 
!                       $sql = "SELECT fm_wo_activities.id as 
activity_id,fm_wo_activities.num, phpgw_addressbook.org_name,fm_wo_branch.descr 
as branch ,vendor_id "
!                               . " FROM (fm_wo_activities  $this->join 
fm_wo_activity_price_index ON fm_wo_activities.id = 
fm_wo_activity_price_index.activity_id)  $this->join phpgw_addressbook ON 
fm_wo_activity_price_index.vendor_id = phpgw_addressbook.id "
!                               . " $this->join fm_wo_branch on fm_wo_branch.id 
= fm_wo_activities.branch_id "
!                               . " Where 
fm_wo_activity_price_index.activity_id= '$activity_id' $querymethod group by 
fm_wo_activities.num,fm_wo_branch.descr,org_name ,vendor_id ";
! 
!                       $this->db2->query($sql,__LINE__,__FILE__);
!                       $this->total_records = $this->db2->num_rows();
! 
!                       if(!$allrows)
!                       {
!                               $this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
!                       }
!                       else
!                       {
!                               $this->db->query($sql . 
$ordermethod,__LINE__,__FILE__);
!                       }
! 
!                       while ($this->db->next_record())
!                       {
!                               $ngrants = 
(int)$this->grants[$this->db->f('building_owner')];
!                               $pricebook[] = array
!                               (
!                                       'activity_id'   => 
$this->db->f('activity_id'),
!                                       'num'                   => 
$this->db->f('num'),
!                                       'branch'                => 
$this->db->f('branch'),
!                                       'vendor_name'   => 
$this->db->f('org_name'),
!                                       'vendor_id'             => 
$this->db->f('vendor_id'),
!                                       'grants'                => $ngrants
!                               );
!                       }
!                       return $pricebook;
!               }
! 
!               function read_single_activity($id)
!               {
!                       $sql = "SELECT * FROM fm_wo_activities where id='$id'";
  
                        $this->db->query($sql,__LINE__,__FILE__);
***************
*** 258,305 ****
                        if ($this->db->next_record())
                        {
!                               $building['property_id']                = 
$this->db->f('property_id');
!                               $building['building_id']                = 
$this->db->f('building_id');
!                               $building['owner']                              
= $this->db->f('owner');
!                               $building['name']                               
= stripslashes($this->db->f('building_name'));
!                               $building['general_address']    = 
stripslashes($this->db->f('general_address'));
!                               $building['access']                             
= $this->db->f('access');
!                               $building['date']                               
= $this->db->f('entry_date');
!                               $building['cat_id']                             
= (int)$this->db->f('cat_id');
!                               $building['location_code']              = 
$this->db->f('location_code');
!                               $building['remark']                             
= $this->db->f('remark');
  
!                               return $building;
                        }
                }
  
!               function add($building)
                {
!                       $building['remark'] = 
$this->db->db_addslashes($building['remark']);
  
!                       $this->db->query("INSERT INTO fm_building 
(location_code, 
property_id,building_id,owner,access,entry_date,building_name,general_address,cat_id,remark)
 "
!                               . "VALUES ('" . $building['location_code']. 
"','" . $building['property_id'] . "','" . $building['building_id'] . "','" . 
$this->account . "','" . $building['access'] . "','" . time() . "','" . 
$building['name']
!                               . "','" . $building['general_address'] ."','" . 
$building['cat_id'] ."','" . $building['remark']. "')",__LINE__,__FILE__);
  
!                       $receipt['message'][] = array('msg'=>lang('Building has 
been saved'));
                        return $receipt;
                }
  
!               function edit($building)
                {
!                       $building['remark'] = 
$this->db->db_addslashes($building['remark']);
  
!                       $this->db->query("UPDATE fm_building set 
building_name='" . $building['name'] . "', entry_date='" . time()
!                                               . "', cat_id='" . 
$building['cat_id'] . "', general_address='" . $building['general_address'] . 
"', access='" . $building['access'] . "', remark='" . $building['remark']
!                                               . "' WHERE property_id= '" . 
$building['property_id']
!                                               . "' AND building_id=" . 
$building['building_id'],__LINE__,__FILE__);
  
!                       $receipt['message'][] = array('msg'=>lang('Building has 
been edited'));
                        return $receipt;
                }
  
!               function delete($property_id,$building_id )
                {
!                       $this->db->query("DELETE FROM fm_building WHERE 
property_id='" . $property_id . "' and building_id='" . $building_id 
."'",__LINE__,__FILE__);
                }
        }
  ?>
--- 484,594 ----
                        if ($this->db->next_record())
                        {
!                               $activity['activity_id']= $id;
!                               $activity['num']                = 
$this->db->f('num');
!                               $activity['unit']               = 
$this->db->f('unit');
!                               $activity['cat_id']             = 
$this->db->f('agreement_id');
!                               $activity['ns3420_id']  = 
$this->db->f('ns3420');
!                               $activity['descr']              = 
stripslashes($this->db->f('descr'));
!                               $activity['base_descr'] = 
stripslashes($this->db->f('base_descr'));
!                               $activity['dim_d']              = 
$this->db->f('dim_d');
!                               $activity['branch_id']  = 
$this->db->f('branch_id');
  
!                               return $activity;
                        }
                }
  
!               function add_activity($values)
                {
!                       $values['descr'] = 
$this->db->db_addslashes($values['descr']);
!                       $values['base_descr'] = 
$this->db->db_addslashes($values['base_descr']);
  
!                       $this->db->query("INSERT INTO fm_wo_activities (id, 
num,unit,agreement_id,ns3420,dim_d,branch_id,descr,base_descr) "
!                               . "VALUES ('" .
!                               $values['activity_id']. "','" .
!                               $values['num'] . "','" .
!                               $values['unit'] . "','" .
!                               $values['cat_id'] . "','" . // agreement
!                               $values['ns3420_id'] . "','" .
!                               $values['dim_d']        . "','" .
!                               $values['branch_id'] ."','" .
!                               $values['descr'] ."','" .
!                               $values['base_descr']. "')",__LINE__,__FILE__);
  
!                       $receipt['message'][] = array('msg'=>lang('Activity has 
been saved'));
                        return $receipt;
                }
  
!               function edit_activity($values)
                {
!                       $values['descr'] = 
$this->db->db_addslashes($values['descr']);
!                       $values['base_descr'] = 
$this->db->db_addslashes($values['base_descr']);
  
!                       $this->db->query("UPDATE fm_wo_activities set
!                               num='" . $values['num'] . "',
!                               unit='" . $values['unit'] . "',
!                               agreement_id='" . $values['cat_id'] . "',
!                               ns3420='" . $values['ns3420_id'] . "',
!                               dim_d='" . $values['dim_d'] . "',
!                               branch_id='" . $values['branch_id'] . "',
!                               descr='" . $values['descr'] . "',
!                               base_descr='" . $values['base_descr']
!                               . "' WHERE id= '" . $values['activity_id'] . 
"'",__LINE__,__FILE__);
  
!                       $receipt['message'][] = array('msg'=>lang('Activity has 
been edited'));
                        return $receipt;
                }
  
!               function delete_activity_vendor($activity_id,$vendor_id)
!               {
!                       $this->db->query("DELETE FROM 
fm_wo_activity_price_index WHERE activity_id='$activity_id' and 
vendor_id='$vendor_id'",__LINE__,__FILE__);
!               }
! 
!               function delete_activity($activity_id)
                {
!                       $this->db->query("DELETE FROM fm_wo_activities WHERE 
id='$activity_id'",__LINE__,__FILE__);
!                       $this->db->query("DELETE FROM 
fm_wo_activity_price_index WHERE activity_id='$activity_id'",__LINE__,__FILE__);
                }
+ 
+               function 
delete_prize_index($activity_id,$vendor_id,$index_count)
+               {
+                       if ($index_count==1)
+                       {
+                               $this->db->query("update 
fm_wo_activity_price_index set current_index = '0', this_index=Null, 
m_cost=Null,w_cost=Null,total_cost=Null,date=Null  where 
activity_id='$activity_id' and vendor_id= '$vendor_id' and index_count= 
'1'",__LINE__,__FILE__);
+                       }
+                       else
+                       {
+                               $this->db->query("delete from 
fm_wo_activity_price_index where activity_id='$activity_id' and vendor_id= 
'$vendor_id' and index_count= '$index_count'",__LINE__,__FILE__);
+ 
+                               $new_index_count= $index_count -1;
+ 
+                               $this->db->query("update 
fm_wo_activity_price_index set current_index = '1' where 
activity_id='$activity_id' and vendor_id= '$vendor_id' and index_count= 
'$new_index_count'",__LINE__,__FILE__);
+                       }
+ 
+               }
+ 
+               function add_activity_vendor($values)
+               {
+                       $this->db->query("SELECT count(*) FROM 
fm_wo_activity_price_index where activity_id='" . $values['activity_id'] . "' 
and vendor_id='" . $values['vendor_id'] . "'",__LINE__,__FILE__);
+ 
+                       $this->db->next_record();
+ 
+                       if ( $this->db->f(0))
+                       {
+                               $receipt['error'][] = array('msg'=>lang('This 
Vendor is already registered for this activity'));
+                       }
+                       else
+                       {
+                               $this->db->query("insert into 
fm_wo_activity_price_index (activity_id, vendor_id, index_count) "
+                                       . " values ('" .
+                                       $values['activity_id']. "','" .
+                                       $values['vendor_id']. 
"','1')",__LINE__,__FILE__);
+ 
+                               $receipt['message'][] = 
array('msg'=>lang('Vendor has been added'));
+ 
+                       }
+                       return $receipt;
+               }
+ 
+ 
        }
  ?>

Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.sostandard_2.inc.php  15 Feb 2003 19:51:39 -0000      1.5
--- class.sostandard_2.inc.php  4 Mar 2003 10:48:52 -0000       1.6
***************
*** 137,140 ****
--- 137,143 ----
                                        $table='fm_apartment_category';
                                        break;
+                               case 'unit':
+                                       $table='fm_standard_unit';
+                                       break;
  
                        }

Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uilookup.inc.php      27 Feb 2003 09:53:37 -0000      1.9
--- class.uilookup.inc.php      4 Mar 2003 10:48:52 -0000       1.10
***************
*** 26,29 ****
--- 26,30 ----
                        'location'   => True,
                        'equipment'   => True,
+                       'ns3420'   => True,
                        'street'   => True
                );
***************
*** 272,275 ****
--- 273,371 ----
  
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_street' => $data));
+                       $this->save_sessiondata();
+               }
+ 
+               function ns3420()
+               {
+ 
+                       $GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
+                                                                               
'nextmatchs',
+                                                                               
'headonly',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'app_header',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'filter_select',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'search_field'));
+ 
+                       $ns3420_list = $this->bo->read_ns3420();
+ 
+                       while (is_array($ns3420_list) && list(,$ns3420_entry) = 
each($ns3420_list))
+                       {
+                               $content[] = array
+                               (
+                                       'id'                            => 
$ns3420_entry['id'],
+                                       'ns3420_descr'          => 
$ns3420_entry['ns3420_descr'],
+                                       'lang_select'           => 
lang('Select'),
+                                       'lang_select_statustext' => 
lang('Select this ns3420 - code')
+                               );
+                       }
+ 
+                       $table_header[] = array
+                       (
+                               'sort_descr'    => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'tekst1',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.ns3420',
+                                                                               
                                                        'cat_id'        
=>$this->cat_id)
+                                                                               
)),
+                               'lang_descr'            => lang('ns3420 
description'),
+                               'sort_id'       => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'id',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.ns3420',
+                                                                               
                                                        'cat_id'        
=>$this->cat_id)
+                                                                               
)),
+                               'lang_id'               => lang('ID'),
+                               'lang_select'           => lang('Select')
+                       );
+ 
+                       $table_done[] = array
+                       (
+                               'lang_done'                             => 
lang('Done'),
+                               'lang_done_statustext'  => lang('Close this 
window')
+                       );
+ 
+                       $link_select = array
+                       (
+                               'menuaction'            => 
$this->currentapp.'.uilookup.ns3420',
+                               'second_display'        => true,
+                               'order'                         => $this->order,
+                               'sort'                          => $this->sort,
+                               'cat_id'                        => 
$this->cat_id,
+                               'query'                         => $this->query,
+                               'filter'                        => $this->filter
+                       );
+ 
+ 
+                       $data = array
+                       (
+                               'allow_allrows'                                 
=> false,
+                               'start_record'                                  
=> $this->start,
+                               'record_limit'                                  
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+                               'num_records'                                   
=> count($ns3420_list),
+                               'all_records'                                   
=> $this->bo->total_records,
+                               'link_url'                                      
        => $GLOBALS['phpgw']->link('/index.php',$link_select),
+                               'img_path'                                      
        => $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
+       //                      'appname'                                       
        => '',
+                               'function_msg'                                  
=> lang('list ns3420'),
+                               'lang_no_cat'                                   
=> lang('no category'),
+                               'lang_cat_statustext'                   => 
lang('Select the category the building belongs to. To do not use a category 
select NO CATEGORY'),
+                               'select_name'                                   
=> 'cat_id',
+                               'cat_list'                                      
        => $this->cats->formatted_xslt_list(array('selected' => 
$this->cat_id,'globals' => True)),
+                               'select_action'                                 
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
+                               'filter_list'                                   
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' => 
'yes')),
+                               'lang_filter_statustext'                => 
lang('Select the filter. To show all entries select SHOW ALL'),
+                               'lang_searchfield_statustext'   => lang('Enter 
the search string. To show all entries, empty this field and press the SUBMIT 
button again'),
+                               'lang_searchbutton_statustext'  => lang('Submit 
the search string'),
+                               'query'                                         
        => $this->query,
+                               'lang_submit'                                   
=> lang('submit'),
+                               'table_header_ns3420'           => 
$table_header,
+                               'values_ns3420'                 => $content,
+                               'table_done'                                    
=> $table_done
+                       );
+ 
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_ns3420' => $data));
                        $this->save_sessiondata();
                }

Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uipricebook.inc.php   2 Mar 2003 00:39:12 -0000       1.2
--- class.uipricebook.inc.php   4 Mar 2003 10:48:52 -0000       1.3
***************
*** 22,30 ****
                var $public_functions = array
                (
!                       'activity'              => True,
!                       'index'                 => True,
!                       'view'                  => True,
!                       'edit_activity' => True,
!                       'delete'                => True
                );
  
--- 22,32 ----
                var $public_functions = array
                (
!                       'activity'                      => True,
!                       'index'                         => True,
!                       'view'                          => True,
!                       'edit_activity'         => True,
!                       'activity_vendor'       => True,
!                       'prizing'                       => True,
!                       'delete'                        => True
                );
  
***************
*** 109,119 ****
                                        'descr'                                 
=> $pricebook['descr'],
                                        'index_count'                   => 
$pricebook['index_count'],
!                                       'link_view'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.view&property_id='
 . $pricebook['property_id'].'&pricebook_id=' . $pricebook['building_id']),
!                                       'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit&property_id='
 . $pricebook['property_id'].'&pricebook_id=' . $pricebook['building_id']),
!                                       'link_prizing'                          
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&property_id='
 . $pricebook['property_id'].'&pricebook_id=' . $pricebook['building_id']),
!                                       'lang_view_statustext'          => 
lang('view the pricebook'),
                                        'lang_edit_statustext'          => 
lang('edit the pricebook'),
                                        'lang_prizing_statustext'       => 
lang('view or edit prizing history of this element'),
-                                       'text_view'                             
        => lang('view'),
                                        'text_edit'                             
        => lang('edit'),
                                        'text_prizing'                          
=> lang('prizing')
--- 111,118 ----
                                        'descr'                                 
=> $pricebook['descr'],
                                        'index_count'                   => 
$pricebook['index_count'],
!                                       'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
 . $pricebook['activity_id']),
!                                       'link_prizing'                          
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
 . $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']),
                                        'lang_edit_statustext'          => 
lang('edit the pricebook'),
                                        'lang_prizing_statustext'       => 
lang('view or edit prizing history of this element'),
                                        'text_edit'                             
        => lang('edit'),
                                        'text_prizing'                          
=> lang('prizing')
***************
*** 238,242 ****
                }
  
!               function activity()
                {
  
--- 237,241 ----
                }
  
!               function prizing()
                {
  
***************
*** 250,253 ****
--- 249,259 ----
                        $links = $this->bocommon->menu();
  
+                       if(!$referer)
+                       {
+                               $referer = 
$GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] ? 
$GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] : $GLOBALS['HTTP_REFERER'];
+                       }
+ 
+                       $activity_id            = 
get_var('activity_id',array('GET'));
+                       $vendor_id                      = 
get_var('vendor_id',array('GET'));
                        $values                         = 
get_var('values',array('POST'));
                        $values['date']         = get_var('date',array('POST'));
***************
*** 256,262 ****
                        if($values['submit_update'])
                        {
!                               $receipt=$this->bo->update_pricebook($values);
                        }
  
  
                        $pricebook_list = 
$this->bo->read_activities_pr_aggreement();
--- 262,441 ----
                        if($values['submit_update'])
                        {
!                               if(!$values['date'])
!                               {
!                                       $receipt['error'][] = 
array('msg'=>lang('Please select a date!'));
!                               }
! 
!                               if(!$values['new_index'])
!                               {
!                                       $receipt['error'][] = 
array('msg'=>lang('Please enter a new index for calkulating next value(s)!'));
!                               }
! 
!                               if(!$receipt['error'])
!                               {
!                                       
$receipt=$this->bo->update_pricebook($values);
!                               }
!                       }
! 
!                       if($values['submit_add'])
!                       {
!                               if(!$values['date'])
!                               {
!                                       $receipt['error'][] = 
array('msg'=>lang('Please select a date!'));
!                               }
! 
!                               if(!$values['m_cost'] && !$values['w_cost'])
!                               {
!                                       $receipt['error'][] = 
array('msg'=>lang('Please enter a value for either material cost, labour cost 
or both !'));
!                               }
! 
!                               if(!$receipt['error'])
!                               {
!                                       
$receipt=$this->bo->add_activity_first_prize($values);
!                               }
!                       }
! 
! 
!                       $pricebook_list = 
$this->bo->read_activity_prize($activity_id,$vendor_id);
! 
!                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
! 
!                       while (is_array($pricebook_list) && list(,$pricebook) = 
each($pricebook_list))
!                       {
! 
!                               if($pricebook['current_index'])
!                               {
!                                       $link_delete            = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=prize&activity_id='
 . $activity_id .'&vendor_id=' . $vendor_id .'&index_count=' . 
$pricebook['index_count']);
!                                       $value_m_cost           = 
$pricebook['m_cost'];
!                                       $value_w_cost           = 
$pricebook['w_cost'];
!                                       $value_total_cost       = 
$pricebook['total_cost'];
!                               }
! 
!                               $content[] = array
!                               (
!                                       'm_cost'                                
        => $pricebook['m_cost'],
!                                       'w_cost'                                
        => $pricebook['w_cost'],
!                                       'total_cost'                            
=> $pricebook['total_cost'],
!                                       'this_index'                            
=> $pricebook['this_index'],
!                                       'date'                                  
        => $GLOBALS['phpgw']->common->show_date($pricebook['date'],$dateformat),
!                                       'current_index'                         
=> $pricebook['current_index'],
!                                       'index_count'                           
=> $pricebook['index_count'],
!                                       'link_delete'                           
=> $link_delete,
!                                       'lang_delete_statustext'        => 
lang('Delete this entry'),
!                                       'text_delete'                           
=> lang('delete'),
!                               );
! 
!                       }
! 
!                       $table_header[] = array
!                       (
!                               'lang_index_count'      => lang('Index Count'),
!                               'lang_total_cost'       => lang('Total Cost'),
!                               'lang_prizing'          => lang('Prizing'),
!                               'lang_last_index'       => lang('Last index'),
!                               'lang_m_cost'           => lang('Material 
cost'),
!                               'lang_w_cost'           => lang('Labour cost'),
!                               'lang_date'                     => lang('Date'),
!                               'lang_delete'           => lang('Delete')
!                       );
! 
!                       $dateformat = strtolower($dateformat);
!                       $sep = '/';
!                       $dlarr[strpos($dateformat,'y')]                 = 
'yyyy';
!                       $dlarr[strpos($dateformat,'m')]                 = 'MM';
!                       $dlarr[strpos($dateformat,'d')]                 = 'DD';
!                       ksort($dlarr);
!                       $dateformat= (implode($sep,$dlarr));
! 
!                       $table_update[] = array
!                       (
!                               'lang_new_index'                        => 
lang('New index'),
!                               'lang_new_index_statustext'     => lang('Enter 
a new index'),
!                               'dateformat'                            => 
$dateformat,
!                               'link_calendar_date'            => 
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
!                               'calendar_gif'                          => 
'./'.$this->currentapp.'/templates/default/images/calendar.gif',
!                               'calendar_source'                       => 
'./'.$this->currentapp.'/inc/calendar.js',
!                               'lang_popup_calendar'           => lang('Popup 
Calendar'),
!                               'lang_date_statustext'          => lang('Select 
the date for the update'),
!                               'lang_update'                           => 
lang('Update'),
!                               'lang_update_statustext'        => lang('update 
selected investments')
!                       );
! 
!                       $table_first_entry[] = array
!                       (
!                               'lang_m_cost'                           => 
lang('Material cost'),
!                               'lang_m_cost_statustext'        => lang('Enter 
a value for the material cost'),
!                               'lang_w_cost'                           => 
lang('Labour cost'),
!                               'lang_w_cost_statustext'        => lang('Enter 
a value for the labour cost'),
!                               'lang_date'                                     
=> lang('Date'),
!                               'dateformat'                            => 
$dateformat,
!                               'link_calendar_date'            => 
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
!                               'calendar_gif'                          => 
'./'.$this->currentapp.'/templates/default/images/calendar.gif',
!                               'calendar_source'                       => 
'./'.$this->currentapp.'/inc/calendar.js',
!                               'lang_popup_calendar'           => lang('Popup 
Calendar'),
!                               'lang_date_statustext'          => lang('Select 
the date for the first value'),
!                               'lang_add'                              => 
lang('Add'),
!                               'lang_add_statustext'   => lang('Add first 
value for this prizing')
!                       );
! 
!                       $link_data = array
!                       (
!                               'menuaction'    => 
$this->currentapp.'.uipricebook.prizing',
!                                               'activity_id'   =>$activity_id,
!                                               'vendor_id'             
=>$vendor_id
!                       );
! 
!                       if(!$this->allrows)
!                       {
!                               $record_limit   = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
!                       }
!                       else
!                       {
!                               $record_limit   = $this->bo->total_records;
                        }
  
+                       $num_records    = count($pricebook_list);
+                       $data = array
+                       (
+                               'error'                                         
        => $receipt['error'],
+                               'message'                                       
        => $receipt['message'],
+                               'links'                                         
        => $links,
+                               'allrows'                                       
        => $this->allrows,
+                               'allow_allrows'                                 
=> true,
+                               'start_record'                                  
=> $this->start,
+                               'record_limit'                                  
=> $record_limit,
+                               'num_records'                                   
=> $num_records,
+                               'all_records'                                   
=> $this->bo->total_records,
+                               'link_url'                                      
        => $GLOBALS['phpgw']->link('/index.php',$link_data),
+                               'img_path'                                      
        => $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
+                               'appname'                                       
        => lang($this->currentapp),
+                               'function_msg'                                  
=> lang('edit prizing'),
+                               'value_activity_id'                             
=> $activity_id,
+                               'value_vendor_id'                               
=> $vendor_id,
+                               'value_m_cost'                                  
=> $value_m_cost,
+                               'value_w_cost'                                  
=> $value_w_cost,
+                               'value_total_cost'                              
=> $value_w_cost,
+                               'table_header_prizing'                  => 
$table_header,
+                               'values_prizing'                                
=> $content,
+                               'table_update'                                  
=> $table_update,
+                               'table_first_entry'                             
=> $table_first_entry,
+                               'update_action'                                 
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
 . $activity_id . '&vendor_id=' . $vendor_id)
+                               );
+ 
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('prizing' => $data));
+                       $this->save_sessiondata();
+               }
+ 
+               function activity()
+               {
+ 
+                       $GLOBALS['phpgw']->xslttpl->add_file(array('pricebook',
+                                                                               
'menu',
+                                                                               
'nextmatchs',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'app_header',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'filter_select',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'search_field'));
+ 
+                       $links = $this->bocommon->menu();
  
                        $pricebook_list = 
$this->bo->read_activities_pr_aggreement();
***************
*** 274,280 ****
                                        'unit'                                  
        => $pricebook['unit'],
                                        'descr'                                 
        => $pricebook['descr'],
!                                       'link_vendor'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.vendor&activity_id='
 . $pricebook['activity_id'].'&agreement=' . $this->cat_id),
                                        'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
 . $pricebook['activity_id'].'&agreement=' . $this->cat_id),
!                                       'link_delete'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&activity_id='
 . $pricebook['property_id']),
                                        'lang_vendor_statustext'        => 
lang('view the vendor(s) for this activity'),
                                        'lang_edit_statustext'          => 
lang('edit this activity'),
--- 453,459 ----
                                        'unit'                                  
        => $pricebook['unit'],
                                        'descr'                                 
        => $pricebook['descr'],
!                                       'link_vendor'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity_vendor&activity_id='
 . $pricebook['activity_id'].'&agreement=' . $this->cat_id),
                                        'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
 . $pricebook['activity_id'].'&agreement=' . $this->cat_id),
!                                       'link_delete'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=activity&activity_id='
 . $pricebook['activity_id']),
                                        'lang_vendor_statustext'        => 
lang('view the vendor(s) for this activity'),
                                        'lang_edit_statustext'          => 
lang('edit this activity'),
***************
*** 371,447 ****
                }
  
                function edit_activity()
                {
!                       $agreement                      = 
get_var('agreement',array('GET'));
!                       $building_id                    = 
get_var('building_id',array('POST','GET'));
!                       $values                                 = 
get_var('values',array('POST','GET'));
!                       $values['property_id']  = 
get_var('property_id',array('POST'));
!                       $values['property_name']        = 
get_var('property_name',array('POST'));
!                       $values_attribute               = 
get_var('values_attribute',array('POST','GET'));
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
  
                        if ($values['save'])
                        {
!                               if(!$values['property_id']  && !$property_id)
                                {
!                                       
$receipt['error'][]=array('msg'=>lang('Please select a Property ID !'));
!                                       $error_property_id=true;
                                        $error_id=true;
                                }
  
!                               if(!$values['building_id']  && !$building_id)
                                {
!                                       
$receipt['error'][]=array('msg'=>lang('Please enter a Building ID !'));
!                                       $error_building_id=true;
!                                       $error_id=true;
                                }
  
!                               if($values['property_id']  && 
$values['building_id'])
                                {
!                                       
if($this->socommon->check_building($values['property_id'],$values['building_id']))
                                        {
!                                               
$receipt['error'][]=array('msg'=>lang('This building is already registered!') . 
'[ '.$values['property_id'].'-'.$values['building_id'].' ]');
!                                               $error_building_id=true;
                                                $error_id=true;
                                        }
                                }
  
!                               if($building_id)
                                {
!                                       $values['property_id']=$property_id;
!                                       $values['building_id']=$building_id;
                                        $action='edit';
                                }
                                else
                                {
!                                       $property_id =  $values['property_id'];
!                                       $building_id =  $values['building_id'];
                                }
  
- //_debug_array($values);
                                if(!$receipt['error'])
                                {
!                                       $receipt = 
$this->bo->save($values,$action);
!                                       if($values_attribute)
!                                       {
!                                               
$this->bocommon->save_attributes($values_attribute,'location');
!                                       }
                                }
                        }
                        else
                        {
!                               $values['property_id']= $property_id;
!                               $values['building_id']= $building_id;
!                               $values = 
$this->bo->read_single($property_id,$building_id);
                        }
  
!                       if ($building_id)
                        {
!                               $function_msg = lang('edit building');
                        }
                        else
                        {
!                               $function_msg = lang('add building');
                        }
  
--- 550,766 ----
                }
  
+               function activity_vendor()
+               {
+ 
+                       $GLOBALS['phpgw']->xslttpl->add_file(array('pricebook',
+                                                                               
'menu',
+                                                                               
'nextmatchs',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'app_header',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'filter_select',
+                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'search_field'));
+ 
+                       $links = $this->bocommon->menu();
+ 
+                       $activity_id            = 
get_var('activity_id',array('GET'));
+                       $values                         = 
get_var('values',array('POST'));
+                       $values['vendor_id']            = 
get_var('vendor_id',array('POST'));
+ 
+                       if($values['add'])
+                       {
+                               if(!$values['vendor_id'])
+                               {
+                                       $receipt['error'][] = 
array('msg'=>lang('Please - select a vendor!'));
+                               }
+                               else
+                               {
+                                       $receipt = 
$this->bo->add_activity_vendor($values);
+                               }
+                       }
+ 
+ 
+                       $pricebook_list = 
$this->bo->read_vendor_pr_activity($activity_id);
+ 
+                       while (is_array($pricebook_list) && list(,$pricebook) = 
each($pricebook_list))
+                       {
+                               $content[] = array
+                               (
+                                       'activity_id'                           
=> $pricebook['activity_id'],
+                                       'num'                                   
        => $pricebook['num'],
+                                       'branch'                                
        => $pricebook['branch'],
+                                       'vendor_name'                           
=> $pricebook['vendor_name'],
+                                       'link_prizing'                          
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
 . $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']),
+                                       'link_delete'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=activity_vendor&activity_id='
 . $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']),
+                                       'lang_prizing_statustext'       => 
lang('view edit the prize for this activity'),
+                                       'lang_delete_statustext'        => 
lang('delete this vendor from this activity'),
+                                       'text_prizing'                          
=> lang('Prizing'),
+                                       'text_delete'                           
=> lang('delete')
+                               );
+                       }
+ 
+                       $table_header[] = array
+                       (
+                               'sort_vendor'   => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'org_name',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uipricebook.activity_vendor',
+                                                                               
                                                        'cat_id'        
=>$this->cat_id,
+                                                                               
                                                        'activity_id'   
=>$activity_id,
+                                                                               
                                                        'allrows'       
=>$this->allrows)
+                                                                               
)),
+                               'lang_num'                      => 
lang('Activity Num'),
+                               'lang_branch'           => lang('Branch'),
+                               'lang_vendor'           => lang('Vendor'),
+                               'lang_prizing'          => lang('Prizing'),
+                               'lang_delete'           => lang('delete')
+                       );
+ 
+                       $table_add[] = array
+                       (
+                               'lang_add'                              => 
lang('add'),
+                               'lang_add_statustext'   => lang('add a 
building'),
+                               'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&agreement='
 . $this->cat_id)
+                       );
+ 
+                       $link_data = array
+                       (
+                               'menuaction'    => 
$this->currentapp.'.uipricebook.activity_vendor',
+                                               'sort'                  => 
$this->sort,
+                                               'order'                 => 
$this->order,
+                                               'cat_id'                => 
$this->cat_id,
+                                               'filter'                => 
$this->filter,
+                                               'query'                 => 
$this->query,
+                                               'activity_id'   => $activity_id
+                       );
+ 
+ 
+                       
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
+                                               'vendor_id'             => ''));
+ 
+ 
+                       if(!$this->allrows)
+                       {
+                               $record_limit   = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+                       }
+                       else
+                       {
+                               $record_limit   = $this->bo->total_records;
+                       }
+ 
+                       $data = array
+                       (
+                               'error'                                         
        => $receipt['error'],
+                               'message'                                       
        => $receipt['message'],
+                               'activity_id'                                   
=> $activity_id,
+                               'vendor_data'                                   
=> $vendor_data,
+                               'error'                                         
        => $receipt['error'],
+                               'message'                                       
        => $receipt['message'],
+                               'links'                                         
        => $links,
+                               'allrows'                                       
        => $this->allrows,
+                               'allow_allrows'                                 
=> true,
+                               'start_record'                                  
=> $this->start,
+                               'record_limit'                                  
=> $record_limit,
+                               'num_records'                                   
=> count($pricebook_list),
+                               'all_records'                                   
=> $this->bo->total_records,
+                               'link_url'                                      
        => $GLOBALS['phpgw']->link('/index.php',$link_data),
+                               'img_path'                                      
        => $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
+                               'appname'                                       
        => lang($this->currentapp),
+                               'function_msg'                                  
=> lang('list vendors per activity'),
+                               'lang_no_cat'                                   
=> lang('select agreement'),
+                               'lang_cat_statustext'                   => 
lang('Select the agreement the pricebook belongs to. To do not use a category 
select NO CATEGORY'),
+                               'select_action'                                 
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+                               'lang_searchfield_statustext'   => lang('Enter 
the search string. To show all entries, empty this field and press the SUBMIT 
button again'),
+                               'lang_searchbutton_statustext'  => lang('Submit 
the search string'),
+                               'query'                                         
        => $this->query,
+                               'lang_submit'                                   
=> lang('submit'),
+                               'table_header_activity_vendor'  => 
$table_header,
+                               'values_activity_vendor'                => 
$content,
+                               'lang_done_statustext'                  => 
lang('Back to the list'),
+                               'lang_save_statustext'                  => 
lang('Add this vendor to this activity'),
+                               'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity&cat_id='
 . $values['cat_id']),
+                               'lang_save'                                     
        => lang('save'),
+                               'lang_done'                                     
        => lang('done'),
+ 
+                       );
+ 
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_activity_vendor' => 
$data));
+                       $this->save_sessiondata();
+               }
+ 
                function edit_activity()
                {
!                       $activity_id            = 
get_var('activity_id',array('POST','GET'));
!                       $agreement = get_var('agreement',array('GET'));
!                       $values                         = 
get_var('values',array('POST','GET'));
!                       $values['ns3420_id']= 
get_var('ns3420_id',array('POST','GET'));
  
!                       if(!$values['cat_id'])
!                       {
!                               $values['cat_id']       = $agreement;
!                       }
! 
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
  
                        if ($values['save'])
                        {
!                               if(!$values['num'])
                                {
!                                       
$receipt['error'][]=array('msg'=>lang('Please enter an activity code !'));
                                        $error_id=true;
                                }
+                               if(!$values['cat_id'])
+                               {
+                                       
$receipt['error'][]=array('msg'=>lang('Please select an agreement !'));
+                               }
  
!                               if(!$values['branch_id'])
                                {
!                                       
$receipt['error'][]=array('msg'=>lang('Please select a branch !'));
                                }
  
!                               if($values['num']  && !$activity_id)
                                {
!                                       
if($this->bo->check_category_num($values['num']))
                                        {
!                                               
$receipt['error'][]=array('msg'=>lang('This activity code is already 
registered!') . '[ '.$values['num'] .' ]');
                                                $error_id=true;
                                        }
                                }
  
!                               if($activity_id)
                                {
!                                       $values['activity_id']=$activity_id;
                                        $action='edit';
                                }
                                else
                                {
!                                       $activity_id =  $values['activity_id'];
                                }
  
                                if(!$receipt['error'])
                                {
!                                       $receipt = 
$this->bo->save_activity($values,$action);
                                }
+ 
                        }
                        else
                        {
!                               $values['activity_id']= $activity_id;
!                               if($activity_id)
!                               {
!                                       $values = 
$this->bo->read_single_activity($activity_id);
!                               }
                        }
  
! //_debug_array($values);
!                       if ($activity_id)
                        {
!                               $function_msg = lang('edit activity');
                        }
                        else
                        {
!                               $function_msg = lang('add activity');
                        }
  
***************
*** 451,552 ****
                        }
  
!                       if($error_property_id)
                        {
!                               unset($values['property_id']);
!                       }
!                       if($error_building_id)
!                       {
!                               unset($values['building_id']);
                        }
  
                        $link_data = array
                        (
!                               'menuaction'    => 
$this->currentapp.'.uibuilding.edit',
!                               'property_id'   => $property_id,
!                               'building_id'   => $building_id
                        );
  
-                       if($values['building_id'])
-                       {
-                               $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>true,'type'=>location,'type_id'=>2,'id'=>$property_id
 . '-' . $building_id));
-                               $attributes_header[]    = array
-                               (
-                                       'lang_name'             => lang('Name'),
-                                       'lang_descr'    => lang('Description'),
-                                       'lang_datatype' => lang('Datatype'),
-                                       'lang_value'    => lang('Value')
-                                       );
-                               $location_type='view';
-                       }
-                       else
-                       {
-                               $location_type='form';
-                       }
- 
-                       
$location_data=$this->bocommon->initiate_ui_location(array(
-                                               'location_type' => 
$location_type,
-                                               'property_id'   => 
$values['property_id'],
-                                               'property_name' => 
$values['property_name']));
- 
                        $data = array
                        (
!                               'location_type'                                 
=> $location_type,
!                               'location_data'                                 
=> $location_data,
!                               'lang_attributes'                               
=> lang('Attributes'),
!                               'attributes_header'                             
=> $attributes_header,
!                               'attributes_values'                             
=> $attributes_values,
!                               'appname'                                       
        => lang('building'),
                                'function_msg'                                  
=> $function_msg,
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
!                               'lang_building_id'                              
=> lang('Building ID'),
!                               'lang_name'                                     
        => lang('name'),
!                               'lang_general_address'                  => 
lang('General Address'),
!                               'lang_category'                                 
=> lang('category'),
!                               'lang_access'                                   
=> lang('private'),
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
!                               'lang_remark'                                   
=> lang('remark'),
!                               'value_building_id'                             
=> $values['building_id'],
!                               'value_name'                                    
=> $values['name'],
                                'value_general_address'                 => 
$values['general_address'],
                                'value_access'                                  
=> $values['access'],
!                               'value_remark'                                  
=> $values['remark'],
                                'error'                                         
        => $receipt['error'],
-                               'error_flag'                                    
=> $error_id,
                                'message'                                       
        => $receipt['message'],
!                               'lang_name_statustext'                  => 
lang('Enter the name of the building'),
!                               'lang_building_id_statustext'   => lang('Enter 
Building ID'),
!                               'lang_general_address_statustext'=> lang('Enter 
the general address'),
                                'lang_done_statustext'                  => 
lang('Back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the building'),
!                               'lang_access_off_statustext'    => lang('The 
building is public. If the building should be private, check this box'),
!                               'lang_access_on_statustext'             => 
lang('The building is private. If the building should be public, uncheck this 
box'),
!                               'lang_no_cat'                                   
=> lang('no category'),
!                               'lang_cat_statustext'                   => 
lang('Select the category the building belongs to. To do not use a category 
select NO CATEGORY'),
                                'select_name'                                   
=> 'values[cat_id]',
!                               'lang_remark_statustext'                => 
lang('Enter any remarks regarding this building'),
!                               'cat_list'                                      
        => $this->bo->get_agreement_list('select',$agreement)
                        );
  
!                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
                }
  
                function delete()
                {
!                       $property_id = get_var('property_id',array('GET'));
!                       $building_id = 
get_var('building_id',array('POST','GET'));
!                       $confirm        = get_var('confirm',array('POST'));
  
!                       $link_data = array
!                       (
!                               'menuaction' => 
$this->currentapp.'.uibuilding.index'
!                       );
  
!                       if (get_var('confirm',array('POST')))
                        {
!                               $this->bo->delete($property_id,$building_id);
!                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                        }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete',
--- 770,904 ----
                        }
  
!                       if($error_id)
                        {
!                               unset($values['num']);
                        }
  
                        $link_data = array
                        (
!                               'menuaction'    => 
$this->currentapp.'.uipricebook.edit_activity',
!                               'activity_id'   => $activity_id,
!                               'agreement'             => $agreement
                        );
  
                        $data = array
                        (
!                               'appname'                                       
        => lang('Pricebook'),
                                'function_msg'                                  
=> $function_msg,
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity&cat_id='
 . $values['cat_id']),
!                               'lang_activity_id'                              
=> lang('Activity ID'),
!                               'lang_num'                                      
        => lang('Activity code'),
!                               'lang_category'                                 
=> lang('Agreement'),
!                               'lang_unit'                                     
        => lang('Unit'),
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
!                               'lang_descr'                                    
=> lang('description'),
!                               'lang_base_descr'                               
=> lang('Base description'),
!                               'value_activity_id'                             
=> $values['activity_id'],
!                               'value_num'                                     
        => $values['num'],
                                'value_general_address'                 => 
$values['general_address'],
                                'value_access'                                  
=> $values['access'],
!                               'value_descr'                                   
=> $values['descr'],
!                               'value_base_descr'                              
=> $values['base_descr'],
                                'error'                                         
        => $receipt['error'],
                                'message'                                       
        => $receipt['message'],
!                               'lang_num_statustext'                   => 
lang('A unique code for this activity'),
                                'lang_done_statustext'                  => 
lang('Back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the building'),
!                               'lang_no_cat'                                   
=> lang('Select agreement'),
!                               'lang_cat_statustext'                   => 
lang('Select the agreement this activity belongs to.'),
                                'select_name'                                   
=> 'values[cat_id]',
!                               'lang_descr_statustext'                 => 
lang('Enter the description for this activity'),
!                               'lang_base_descr_statustext'    => lang('Enter 
a description for prerequisitions for this activity - if any'),
!                               'cat_list'                                      
        => $this->bo->get_agreement_list('select',$values['cat_id']),
! 
!                               'lang_dim_d'                                    
=> lang('Dim D'),
!                               'dim_d_list'                                    
=> $this->bo->get_dim_d_list($values['dim_d']),
!                               'select_dim_d'                                  
=> 'values[dim_d]',
!                               'lang_no_dim_d'                                 
=> lang('No Dim D'),
!                               'lang_dim_d_statustext'                 => 
lang('Select the Dim D for this activity. To do not use Dim D -  select NO DIM 
D'),
! 
!                               'lang_unit'                                     
        => lang('Unit'),
!                               'unit_list'                                     
        => $this->bo->get_unit_list($values['unit']),
!                               'select_unit'                                   
=> 'values[unit]',
!                               'lang_no_unit'                                  
=> lang('Select Unit'),
!                               'lang_unit_statustext'                  => 
lang('Select the unit for this activity.'),
! 
!                               'lang_branch'                                   
=> lang('Branch'),
!                               'branch_list'                                   
=> $this->bo->get_branch_list($values['branch_id']),
!                               'select_branch'                                 
=> 'values[branch_id]',
!                               'lang_no_branch'                                
=> lang('Select branch'),
!                               'lang_branch_statustext'                => 
lang('Select the branch for this activity.'),
! 
!                               'ns3420_link'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.ns3420'),
!                               'lang_ns3420'                                   
=> lang('NS3420'),
!                               'value_ns3420_id'                               
=> $values['ns3420_id'],
!                               'lang_ns3420_statustext'                => 
lang('Select a standard-code from the norwegian standard'),
                        );
  
!                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_activity' => $data));
                }
  
                function delete()
                {
!                       $method                 = 
get_var('method',array('GET'));
!                       $activity_id    = get_var('activity_id',array('GET'));
!                       $vendor_id              = 
get_var('vendor_id',array('GET'));
!                       $index_count            = 
get_var('index_count',array('GET'));
!                       $confirm                = 
get_var('confirm',array('POST'));
  
!                       if($method=='activity_vendor')
!                       {
!                               $link_data = array
!                               (
!                                       'menuaction' => 
$this->currentapp.'.uipricebook.activity_vendor',
!                                       'activity_id' => $activity_id
!                               );
  
!                               $function_msg   =lang('delete vendor activity');
!                               $delete_action  = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
 . $method . '&activity_id=' . $activity_id . '&vendor_id=' . $vendor_id);
! 
!                               if (get_var('confirm',array('POST')))
!                               {
!                                       
$this->bo->delete_activity_vendor($activity_id,$vendor_id);
!                                       Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
!                               }
!                       }
!                       elseif($method=='activity')
                        {
!                               $link_data = array
!                               (
!                                       'menuaction' => 
$this->currentapp.'.uipricebook.activity'
!                               );
! 
!                               $function_msg   =lang('delete activity');
!                               $delete_action  = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
 . $method . '&activity_id=' . $activity_id);
! 
!                               if (get_var('confirm',array('POST')))
!                               {
!                                       
$this->bo->delete_activity($activity_id);
!                                       Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
!                               }
                        }
+                       elseif($method=='prize')
+                       {
+                               $link_data = array
+                               (
+                                       'menuaction' => 
$this->currentapp.'.uipricebook.prizing',
+                                       'activity_id' => $activity_id,
+                                       'vendor_id' => $vendor_id
+                               );
+ 
+                               $function_msg   =lang('delete prize-index');
+                               $delete_action  = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
 . $method . '&activity_id=' . $activity_id . '&vendor_id=' . $vendor_id . 
'&index_count=' . $index_count);
+ 
+                               if (get_var('confirm',array('POST')))
+                               {
+                                       
$this->bo->delete_prize_index($activity_id,$vendor_id,$index_count);
+                                       Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
+                               }
+                       }
+ 
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete',
***************
*** 555,562 ****
                        $data = array
                        (
!                               'appname'                               => 
lang('building'),
!                               'function_msg'                  => lang('delete 
building'),
                                'done_action'                   => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'delete_action'                 => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&property_id='
 . $property_id.'&building_id=' . $building_id),
                                'lang_confirm_msg'              => lang('do you 
really want to delete this entry'),
                                'lang_yes'                              => 
lang('yes'),
--- 907,914 ----
                        $data = array
                        (
!                               'appname'                               => 
lang('pricebook'),
!                               'function_msg'                  => 
$function_msg,
                                'done_action'                   => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'delete_action'                 => 
$delete_action,
                                'lang_confirm_msg'              => lang('do you 
really want to delete this entry'),
                                'lang_yes'                              => 
lang('yes'),
***************
*** 569,626 ****
                }
  
-               function view()
-               {
-                       $property_id = get_var('property_id',array('GET'));
-                       $building_id = get_var('building_id',array('GET'));
- 
-                       
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
- 
-                       $values = 
$this->bo->read_single($property_id,$building_id);
- 
-                       $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>true,'type'=>location,'type_id'=>2,'id'=>$property_id
 . '-' . $building_id));
-                       $attributes_header[]    = array
-                               (
-                                       'lang_name'             => lang('Name'),
-                                       'lang_descr'    => lang('Description'),
-                                       'lang_datatype' => lang('Datatype'),
-                                       'lang_value'    => lang('Value')
-                                       );
-                       $location_type='view';
- 
-                       
$location_data=$this->bocommon->initiate_ui_location(array(
-                                               'location_type' => 
$location_type,
-                                               'property_id'   => 
$values['property_id'],
-                                               'property_name' => 
$values['property_name']));
- 
-                       $data = array
-                       (
-                               'location_type'                                 
=> $location_type,
-                               'location_data'                                 
=> $location_data,
-                               'lang_attributes'                               
=> lang('Attributes'),
-                               'attributes_header'                             
=> $attributes_header,
-                               'attributes_values'                             
=> $attributes_values,
-                               'appname'                                       
        => lang('building'),
-                               'function_msg'                                  
=> lang('view building'),
-                               'value_building_id'                             
=> $values['building_id'],
-                               'value_name'                                    
=> $values['name'],
-                               'value_general_address'                 => 
$values['general_address'],
-                               'value_access'                                  
=> $values['access'],
-                               'value_remark'                                  
=> $values['remark'],
-                               'lang_remark'                                   
=> lang('remark'),
-                               'value_category'                                
=> $this->bo->read_category_name($values['cat_id']),
-                               'lang_building_id'                              
=> lang('Building ID'),
-                               'lang_name'                                     
        => lang('name'),
-                               'lang_general_address'                  => 
lang('General Address'),
-                               'lang_category'                                 
=> lang('category'),
-                               'lang_done'                                     
=> lang('done'),
-                               'lang_edit'                                     
=> lang('Edit'),
-                               'edit_action'                           => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.edit&property_id='
 . $property_id . '&building_id=' . $building_id),
-                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
-                               'lang_done_statustext'          => lang('Back 
to the list'),
-                               'lang_edit_statustext'          => lang('Edit 
this entry equipment'),
-                       );
- 
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
-               }
        }
  ?>
--- 921,924 ----

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** hook_admin.inc.php  27 Feb 2003 19:40:01 -0000      1.18
--- hook_admin.inc.php  4 Mar 2003 10:48:52 -0000       1.19
***************
*** 38,41 ****
--- 38,42 ----
                                'Workorders status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=workorder_status'),
                                'Equipment status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=equipment_status'),
+                               'Unit'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=unit'),
                                'Request status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_status'),
                                'Request type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_type'),





reply via email to

[Prev in Thread] Current Thread [Next in Thread]