[Phpgroupware-cvs] CVS: property add_workorder.php,1.9,1.10 edit_workorder.php,1.8,1.9 invoice_paid.php,1.7,1.8 list_power_meter.php,1.4,1.5

[Sigurd Nes <address@hidden>]

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

Modified Files:
        add_workorder.php edit_workorder.php invoice_paid.php 
        list_power_meter.php 
Log Message:
no message

Index: add_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_workorder.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** add_workorder.php   26 Oct 2002 09:03:38 -0000      1.9
--- add_workorder.php   8 Nov 2002 19:00:08 -0000       1.10
***************
*** 499,503 ****
                $to_approval_from_email = $prefs['email']['address'];
                $field_size= strlen($to_approval_from_email)+3;
!               $t->set_var('to_approval_from_email','<input type="text" 
size="'. $field_size .'" name="coordinator_email" value="' 
.$to_approval_from_email .'">');
  
  //            echo 'to: '.$to_approval_from_email .'<BR>';
--- 499,503 ----
                $to_approval_from_email = $prefs['email']['address'];
                $field_size= strlen($to_approval_from_email)+3;
!               $t->set_var('to_approval_from_email','<input type="text" 
size="'. $field_size .'" name="to_approval_from_email" value="' 
.$to_approval_from_email .'">');
  
  //            echo 'to: '.$to_approval_from_email .'<BR>';

Index: edit_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_workorder.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** edit_workorder.php  26 Oct 2002 09:03:38 -0000      1.8
--- edit_workorder.php  8 Nov 2002 19:00:08 -0000       1.9
***************
*** 75,78 ****
--- 75,109 ----
                        $num = create_wrkorderid($year);
                }
+ 
+               if ($need_approval)
+               {
+                       
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
+                       
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
+                       $headers = "Return-Path: <". $coordinator_email 
.">\r\n";
+                       $headers .= "From: " . $coordinator_name . "<" . 
$coordinator_email .">\r\n";
+                       $headers .= "Bcc: " . $coordinator_name . "<" . 
$coordinator_email .">\r\n";
+                       $headers .= "Content-type: text/plain; 
charset=iso-8859-1\r\n";
+ 
+                       $subject = lang(Approval).": ".$num;
+                       $message = lang(Workorder) . " " .$num ." ". 
lang(needs_approval);
+ 
+                       $mail_method= $config->config_data['fmwrkorder_mail'];
+                       if ($mail_method=='smtp'):
+                       {
+                               $bcc = $coordinator_email;
+                               $send = CreateObject('phpgwapi.send');
+                               $rcpt = $send->msg('email', 
$to_approval_from_email, $subject, stripslashes($message), '', $cc, $bcc, 
$coordinator_email, $coordinator_name, 'plain');
+                       }
+                       elseif ($mail_method=='sendmail'):
+                       {
+                               
$rcpt=mail($to_approval_from_email,$subject,$message, $headers);
+                       }
+                       else:
+                       {
+                               $error[$errorcount++] = lang('Mailing method is 
not chosen! ("admin" section)');
+                       }
+                       endif;
+               }
+ 
                if (!$num)
                {
***************
*** 575,581 ****
        $t->set_var('account_id',$account_id);
  
!       $t->set_var('lang_need_approval','');
!       $t->set_var('need_approval','');
!       $t->set_var('to_approval_from_email','');
  
        $charge_tenant  = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('charge_tenant'));
--- 606,637 ----
        $t->set_var('account_id',$account_id);
  
!       
$approval_from_id=$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_approval_from'];
!       $workorder_approval = $config->config_data['workorder_approval'];
! 
!       if ($approval_from_id && ($workorder_approval=='yes'))
!       {
!               $t->set_var('lang_need_approval',lang('Need Approval:'));
!               $approval_from_lid=     
$GLOBALS['phpgw']->accounts->id2name($approval_from_id);
! 
!               $prefs = 
$GLOBALS['phpgw']->preferences->create_email_preferences($approval_from_id);
!               $to_approval_from_email = $prefs['email']['address'];
!               $field_size= strlen($to_approval_from_email)+3;
!               $t->set_var('to_approval_from_email','<input type="text" 
size="'. $field_size .'" name="to_approval_from_email" value="' 
.$to_approval_from_email .'">');
! 
! //            echo 'to: '.$to_approval_from_email .'<BR>';
! 
!               if ($need_approval)
!               {
!                       $checked_need_approval='checked';
!               }
! 
!               $t->set_var('need_approval','<input type="checkbox" 
name="need_approval" ' .$checked_need_approval .'>');
!       }
!       else
!       {
!               $t->set_var('need_approval','');
!               $t->set_var('to_approval_from_email','');
!               $t->set_var('lang_need_approval','');
!       }
  
        $charge_tenant  = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('charge_tenant'));

Index: invoice_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_paid.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** invoice_paid.php    26 Oct 2002 09:03:38 -0000      1.7
--- invoice_paid.php    8 Nov 2002 19:00:08 -0000       1.8
***************
*** 347,350 ****
--- 347,351 ----
        $t->set_var('lang_supervisor',lang('Supervisor'));
        $t->set_var('lang_budget_responsible',lang('B - responsible'));
+       $t->set_var('lang_sum',lang('Sum'));
        $t->set_var('lang_none',lang('None'));
        $t->set_var('lang_period',lang('Period'));
***************
*** 728,732 ****
  
                $belop=$bilag[$i]['belop'];
!               if (! $belop)  $belop  = '&nbsp;';
  
                $godkjentbelop=$bilag[$i]['godkjentbelop'];
--- 729,733 ----
  
                $belop=$bilag[$i]['belop'];
!               $sum=$sum+$belop;
  
                $godkjentbelop=$bilag[$i]['godkjentbelop'];
***************
*** 763,766 ****
--- 764,768 ----
                                                'period' => $period,
                                                'belop' => 
sprintf("%01.2f",$belop),
+                                               'sum' => sprintf("%01.2f",$sum),
                                                'godkjentbelop' => 
$godkjentbelop,
                                                'underbilag' => $underbilag,

Index: list_power_meter.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_power_meter.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** list_power_meter.php        16 Oct 2002 15:27:09 -0000      1.4
--- list_power_meter.php        8 Nov 2002 19:00:08 -0000       1.5
***************
*** 73,77 ****
        if ($query)
        {
!               $querymethod = " where (span_pmlocread.bms_sys_adr_code like 
'%$query%' or address_1 like '%$query%' or point_name like '%$query%' )";
        }
  
--- 73,77 ----
        if ($query)
        {
!               $querymethod = " where (fm_bms.id like '%$query%' or 
beskrivelse like '%$query%' or point_name like '%$query%' )";
        }