[Phpgroupware-cvs] CVS: property/inc functions.inc.php,1.2,1.3 header.inc.php,1.2,1.3

[Sigurd Nes <address@hidden>]

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

Modified Files:
        functions.inc.php header.inc.php 
Log Message:
no message

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/functions.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** functions.inc.php   2 Sep 2002 15:22:23 -0000       1.2
--- functions.inc.php   2 Sep 2002 22:54:31 -0000       1.3
***************
*** 626,629 ****
--- 626,691 ----
  //------------------------------------------------------
  
+       function select_district_list($district = '')
+       {
+               $selected = $district;
+               echo 'selected: '.$selected .'<BR>';
+ 
+               $district_list .= '<option value="all"';
+               if($selected == 'all')
+               {
+                       $district_list .= ' selected';
+               }
+               $district_list .= '>' .lang('All'). '</option>' . "\n";
+ 
+               $GLOBALS['phpgw']->db->query("SELECT * from boei_omraade where 
omraade_id != '0'");
+                       while ($GLOBALS['phpgw']->db->next_record())
+                       {
+                               $district_list .= '<option value="' . 
$GLOBALS['phpgw']->db->f('omraade_id') . '"';
+                               for ($i=0;$i<count($selected);$i++)
+                               {
+                                       if($selected == 
$GLOBALS['phpgw']->db->f('omraade_id'))
+                                       {
+                                               $district_list .= ' selected';
+                                       }
+                               }
+                               $district_list .= '>' . 
lang($GLOBALS['phpgw']->db->f('omraade'));
+ 
+ 
+                               $district_list .= '</option>' . "\n";
+               }
+               return $district_list;
+       }
+ //------------------------------------------------------
+       function select_b_account_class_list($account_class = '')
+       {
+               $selected = $account_class;
+ 
+               $b_account_class_list .= '<option value=""';
+               if($selected == '')
+               {
+                       $b_account_class_list .= ' selected';
+               }
+               $b_account_class_list .= '>' .lang('All'). '</option>' . "\n";
+ 
+               $GLOBALS['phpgw']->db->query("SELECT  distinct 
left(account_id,2) as account_class from fm_wo_accounts ");
+                       while ($GLOBALS['phpgw']->db->next_record())
+                       {
+                               $b_account_class_list .= '<option value="' . 
$GLOBALS['phpgw']->db->f('account_class') . '"';
+                               for ($i=0;$i<count($selected);$i++)
+                               {
+                                       if($selected == 
$GLOBALS['phpgw']->db->f('account_class'))
+                                       {
+                                               $b_account_class_list .= ' 
selected';
+                                       }
+                               }
+                               $b_account_class_list .= '>' . 
$GLOBALS['phpgw']->db->f('account_class');
+ 
+ 
+                               $b_account_class_list .= '</option>' . "\n";
+               }
+               return $b_account_class_list;
+       }
+ //------------------------------------------------------
+ 
        function create_voucherid($year)
        {

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/header.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** header.inc.php      1 Sep 2002 19:43:49 -0000       1.2
--- header.inc.php      2 Sep 2002 22:54:31 -0000       1.3
***************
*** 124,130 ****
--- 124,132 ----
                
$t->set_var('sub_invoice_paid',$phpgw->link('/property/invoice_paid.php','sub=p_invoice'));
                
$t->set_var('sub_invoice_powermeter',$phpgw->link('/property/list_power_meter.php','sub=p_invoice'));
+               
$t->set_var('sub_invoice_consume',$phpgw->link('/property/invoice_consume.php','sub=p_invoice'));
                $t->set_var('sublang_invoice_list',lang('Invoice'));
                $t->set_var('sublang_invoice_paid',lang('Paid'));
                $t->set_var('sublang_invoice_powermeter',lang('Power meter'));
+               $t->set_var('sublang_invoice_consume',lang('consume'));
                $t->set_var('tr_color2',$phpgw_info['theme']['row_off']);
                $admin_info = lang('Invoice');