[Fmsystem-commits] [10693] property: notification

[Sigurd Nes]

Revision: 10693
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10693
Author:   sigurdne
Date:     2013-01-18 12:32:31 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
property: notification

Modified Paths:
--------------
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2013-01-18 12:32:17 UTC 
(rev 10692)
+++ trunk/property/inc/class.uiworkorder.inc.php        2013-01-18 12:32:31 UTC 
(rev 10693)
@@ -1081,12 +1081,12 @@
                                                $action='add';
                                        }
                                        $receipt = 
$this->bo->save($values,$action);
+                                       $historylog     = 
CreateObject('property.historylog','workorder');
                                        if (! $receipt['error'])
                                        {
                                                $id = $receipt['id'];
                                                //temporary
                                                
execMethod('property.soXport.update_actual_cost_from_archive',array($id => 
true));
-                                               $historylog     = 
CreateObject('property.historylog','workorder');
                                        }
                                        $function_msg = lang('Edit Workorder');
                                        //----------files
@@ -1178,11 +1178,10 @@
                                        $toarray_sms = array();
 
                                        if (isset($receipt['notice_owner']) && 
is_array($receipt['notice_owner'])
-//                                             && 
$config->config_data['mailnotification'])
-                                               && 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner']
-                                       )
+                                               && 
$config->config_data['mailnotification'])
+//                                             && 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['notify_project_owner'])
                                        {
-                                               
if($this->account!=$project['coordinator'] && 
$config->config_data['workorder_approval'])
+                                               
if(!$this->account==$project['coordinator'] && 
$config->config_data['notify_project_owner'])
                                                {
                                                        $prefs_coordinator = 
$this->bocommon->create_preferences('property',$project['coordinator']);
                                                        
if(isset($prefs_coordinator['email']) && $prefs_coordinator['email'])