[Phpgroupware-cvs] property/templates/default project.xsl, 1.10 workorder.xsl, 1.6

[sigurdne]

Update of property/templates/default

Modified Files:
     Branch: MAIN
            project.xsl lines: +20 -22
            workorder.xsl lines: +9 -9

Log Message:
no message

====================================================
Index: property/templates/default/project.xsl
diff -u property/templates/default/project.xsl:1.9 
property/templates/default/project.xsl:1.10
--- property/templates/default/project.xsl:1.9  Mon Sep 12 08:19:02 2005
+++ property/templates/default/project.xsl      Wed Sep 14 10:21:49 2005
@@ -329,16 +329,6 @@
                                </td>
                        </tr>
                        <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="lang_actual_cost"/>
-                               </td>
-                               <td>
-                                       <xsl:value-of 
select="sum_workorder_actual_cost"/>
-                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                               </td>
-                       </tr>
-
-                       <tr>
                                <td class="th_text" valign="top">
                                        <xsl:value-of 
select="lang_workorder_id"/>
                                </td>
@@ -371,7 +361,15 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </tr>
-
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of 
select="lang_actual_cost"/>
+                               </td>
+                               <td>
+                                       <xsl:value-of 
select="sum_workorder_actual_cost"/>
+                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
+                               </td>
+                       </tr>
                        <tr>
                                <td>
                                        <xsl:value-of 
select="lang_coordinator"/>
@@ -838,16 +836,6 @@
                        </tr>

                        <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="lang_actual_cost"/>
-                               </td>
-                               <td>
-                                       <xsl:value-of 
select="sum_workorder_actual_cost"/>
-                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                               </td>
-                       </tr>
-
-                       <tr>
                                <td class="th_text" valign="top">
                                        <xsl:value-of 
select="lang_workorder_id"/>
                                </td>
@@ -879,6 +867,16 @@
                                        </td>
                                        </xsl:otherwise>
                                </xsl:choose>
+                       </tr>
+
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of 
select="lang_actual_cost"/>
+                               </td>
+                               <td>
+                                       <xsl:value-of 
select="sum_workorder_actual_cost"/>
+                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
+                               </td>
                        </tr>

                        <tr>

====================================================
Index: property/templates/default/workorder.xsl
diff -u property/templates/default/workorder.xsl:1.5 
property/templates/default/workorder.xsl:1.6
--- property/templates/default/workorder.xsl:1.5        Tue Sep 13 11:38:05 2005
+++ property/templates/default/workorder.xsl    Wed Sep 14 10:21:50 2005
@@ -1002,15 +1002,6 @@
                                </td>
                        </tr>
                        <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="lang_actual_cost"/>
-                               </td>
-                               <td>
-                                       <xsl:value-of select="actual_cost"/>
-                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
-                               </td>
-                       </tr>
-                       <tr>
                                <td>
                                        <xsl:value-of select="lang_status"/>
                                </td>
@@ -1087,6 +1078,15 @@
                                        <table>
                                                <xsl:call-template 
name="hour_data_view"/>
                                        </table>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of 
select="lang_actual_cost"/>
+                               </td>
+                               <td>
+                                       <xsl:value-of select="actual_cost"/>
+                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
                                </td>
                        </tr>
                        <tr height="50">