[Fmsystem-commits] [14740] Merge 14738:14739 from trunk

[Sigurd Nes]

Revision: 14740
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14740
Author:   sigurdne
Date:     2016-02-16 08:48:58 +0000 (Tue, 16 Feb 2016)
Log Message:
-----------
Merge 14738:14739 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739

Modified: branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php  
2016-02-16 08:44:28 UTC (rev 14739)
+++ branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php  
2016-02-16 08:48:58 UTC (rev 14740)
@@ -1168,7 +1168,7 @@
                                {
                                        self::message_set($this->receipt);
                                        self::redirect(array(
-                                               'menuaction' => 
'property.uiproject.edit',
+                                               'menuaction' => 
'property.uiworkorder.edit',
                                                'id' => $id));
                                }
                                $this->edit($values);