[Fmsystem-commits] [10455]

[Torstein]

Revision: 10455
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10455
Author:   vator
Date:     2012-11-04 16:13:35 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/templates/base/activity/add_activity_item.xsl

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 16:08:21 UTC (rev 
10454)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 16:13:35 UTC (rev 
10455)
@@ -390,6 +390,9 @@
                                        $activity->set_parent_id( 
$parent_activity_id );
                                        $parent_activity = 
$this->so->get_single( $parent_activity_id );
                                        $activity->set_project_id( 
$parent_activity->get_project_id() );
+                                       
+                                       
$activity->set_start_date($parent_activity->get_start_date());
+                                       
$activity->set_end_date($parent_activity->get_end_date());
                                }
                                else
                                {

Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-04 16:08:21 UTC (rev 10454)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-04 16:13:35 UTC (rev 10455)
@@ -38,9 +38,9 @@
                                                <xsl:when test="(editable) and 
(parent_activity/id &gt; 0)">
                                                        <dt>            
                                                                        <div 
style="margin-bottom: 1em;">
-                                                                               
<label style="display:block;">Velg en annen hovedaktivitet</label>
+                                                                               
<label style="display:block;">Velg en annen hovedaktivitet for denne 
underaktiviteten</label>
                                                                                
<select id="select_parent_activity" name="parent_activity_id">
-                                                                               
        <option>Velg aktivitet</option>
+                                                                               
        <option>Velg annen hovedaktivitet</option>
                                                                                
        <xsl:for-each select="activities">
                                                                        <option 
value="{id}">
                                                                                
<xsl:if test="activity/parent_id = id">
@@ -60,7 +60,7 @@
                                                                        <div 
style="margin-bottom: 1em;">
                                                                                
<label style="display:block;">Velg et annet prosjekt for aktiviteten </label>
                                                                                
<select id="select_project" name="select_project">
-                                                                               
        <option>Velg prosjekt</option>
+                                                                               
        <option>Velg annet prosjekt</option>
                                                                                
        <xsl:for-each select="projects">
                                                                        <option 
value="{id}">
                                                                                
<xsl:if test="project/id = project_id">