[Fmsystem-commits] [10982] property:save workorder before calculate

[Sigurd Nes]

Revision: 10982
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10982
Author:   sigurdne
Date:     2013-03-13 09:26:29 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
property:save workorder before calculate

Modified Paths:
--------------
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/templates/base/workorder.xsl

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2013-03-13 09:18:32 UTC 
(rev 10981)
+++ trunk/property/inc/class.uiworkorder.inc.php        2013-03-13 09:26:29 UTC 
(rev 10982)
@@ -1305,6 +1305,14 @@
                                        );
                                }
 
+                               if( phpgw::get_var('calculate_workorder', 
'bool') && !$receipt['error'])
+                               {
+                                       
$GLOBALS['phpgw']->redirect_link('/index.php',array(
+                                               'menuaction'    
=>'property.uiwo_hour.index',
+                                               'workorder_id'  => $id,
+                                               )
+                                       );
+                               }
 
                                if( phpgw::get_var('phpgw_return_as') == 'json' 
)
                                {
@@ -1967,7 +1975,7 @@
                                'value_origin'                                  
                => isset($values['origin']) ? $values['origin'] : '',
                                'value_origin_type'                             
                => isset($origin)?$origin:'',
                                'value_origin_id'                               
                => isset($origin_id)?$origin_id:'',
-                               'calculate_action'                              
                => $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiwo_hour.index')),
+
                                'lang_calculate'                                
                => lang('Calculate Workorder'),
                                'lang_calculate_statustext'                     
        => lang('Calculate workorder by adding items from vendors prizebook or 
adding general hours'),
 

Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2013-03-13 09:18:32 UTC (rev 
10981)
+++ trunk/property/templates/base/workorder.xsl 2013-03-13 09:26:29 UTC (rev 
10982)
@@ -82,7 +82,8 @@
                <script type="text/javascript">
                        function calculate_workorder()
                        {
-                               document.calculate_workorder_form.submit();
+                               
document.getElementsByName("calculate_workorder")[0].value = 1;
+                               document.form.submit();
                        }
                        function send_workorder()
                        {
@@ -167,7 +168,9 @@
                        <xsl:value-of select="form_action"/>
                </xsl:variable>
                <form ENCTYPE="multipart/form-data" method="post" 
id='workorder_edit' name="form" action="{$form_action}">
-                       <input type="hidden" id='send_workorder' 
name="send_workorder" value=""/>
+                       <input type="hidden" name="send_workorder" value=""/>
+                       <input type="hidden" name='calculate_workorder'  
value=""/>
+
                        <input type="hidden" name="tab" value=""/>
                        <div class="yui-navset" id="workorder_tabview">
                                <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
@@ -945,13 +948,6 @@
                        </tr>
                </table>
                <hr noshade="noshade" width="100%" align="center" size="1"/>
-               <xsl:choose>
-                       <xsl:when test="mode='edit'">
-                               <xsl:variable 
name="calculate_action"><xsl:value-of 
select="calculate_action"/>&amp;workorder_id=<xsl:value-of 
select="value_workorder_id"/></xsl:variable>
-                               <form method="post" 
name="calculate_workorder_form" action="{$calculate_action}">
-                               </form>
-                       </xsl:when>
-               </xsl:choose>
        </xsl:template>
 
        <!-- New template-->