[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11744] property: more on percent of used funding
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11744] property: more on percent of used funding |
Date: |
Mon, 24 Feb 2014 18:36:55 +0000 |
Revision: 11744
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11744
Author: sigurdne
Date: 2014-02-24 18:36:54 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
property: more on percent of used funding
Modified Paths:
--------------
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2014-02-24 13:22:36 UTC
(rev 11743)
+++ trunk/property/inc/class.boworkorder.inc.php 2014-02-24 18:36:54 UTC
(rev 11744)
@@ -822,7 +822,12 @@
$receipt['message'] =
array_merge($receipt['message'] , $receipt_claim['message']);
}
}
-
+ if ($workorder['id'])
+ {
+ //temporary
+
execMethod('property.soXport.update_actual_cost_from_archive',array($workorder['id']
=> true));
+
$this->notify_coordinator_on_consumption($workorder['id']);
+ }
return $receipt;
}
@@ -874,7 +879,8 @@
$prefs_coordinator =
$this->bocommon->create_preferences('property',$coordinator);
if(isset($prefs_coordinator['email']) &&
$prefs_coordinator['email'])
{
- $toarray[] = $prefs_coordinator['email'];
+// $toarray[] = $prefs_coordinator['email'];
+ $toarray[] = 'address@hidden';
}
if ($toarray)
@@ -896,8 +902,8 @@
$from_email =
"{$from_name}<address@hidden>";
}
- $subject = "Bestilling # {$order_id}
har disponert {$percent} prosent av budsjsett";
-
+ $subject = "Bestilling # {$order_id}
har disponert {$percent} prosent av budsjsettet";
+ _debug_array($subject);die();
$to = implode(';',$toarray);
$body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.edit','id'=> $order_id),false,true).'">' .
lang('workorder %1 has been edited',$order_id) .'</a>' . "\n";
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2014-02-24 13:22:36 UTC
(rev 11743)
+++ trunk/property/inc/class.uiworkorder.inc.php 2014-02-24 18:36:54 UTC
(rev 11744)
@@ -1136,12 +1136,6 @@
}
$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));
- }
$function_msg = lang('Edit Workorder');
//----------files
$bofiles =
CreateObject('property.bofiles');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11744] property: more on percent of used funding,
Sigurd Nes <=