[Fmsystem-commits] [13731] fix add request

[Sigurd Nes]

Revision: 13731
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13731
Author:   sigurdne
Date:     2015-08-17 12:37:47 +0000 (Mon, 17 Aug 2015)
Log Message:
-----------
fix add request

Modified Paths:
--------------
    trunk/property/inc/class.sorequest.inc.php
    trunk/property/inc/class.uirequest.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php  2015-08-16 15:40:22 UTC (rev 
13730)
+++ trunk/property/inc/class.sorequest.inc.php  2015-08-17 12:37:47 UTC (rev 
13731)
@@ -1044,7 +1044,7 @@
                        $value_set['multiplier']                                
= $request['multiplier'] ? (float)$request['multiplier'] : 1;
                        
                
-                       if($request['origin'][0]['location'] == 
'.project.condition_survey' && $request['origin'][0]['data'][0]['id'] && 
!$value_set['condition_survey_id'])
+                       if( (isset($request['origin'][0]['location']) && 
$request['origin'][0]['location'] == '.project.condition_survey') && 
isset($request['origin'][0]['data'][0]['id']) && 
!$value_set['condition_survey_id'])
                        {
                                $value_set['condition_survey_id']       = 
(int)$request['origin'][0]['data'][0]['id'];
                        }

Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php  2015-08-16 15:40:22 UTC (rev 
13730)
+++ trunk/property/inc/class.uirequest.inc.php  2015-08-17 12:37:47 UTC (rev 
13731)
@@ -1717,7 +1717,7 @@
                                        'value_in_progress_date'                
        => $values['in_progress_date'],
                                        'value_delivered_date'                  
        => $values['delivered_date'],
 
-                                       'lang_start_date_statustext'            
=> lang('Select the estimated end date for the request'),
+                                       'lang_start_date_statustext'            
=> lang('Select the estimated start date for the request'),
                                        'lang_start_date'                       
                => lang('request start date'),
                                        'value_start_date'                      
                => $values['start_date'],
 

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2015-08-16 15:40:22 UTC (rev 13730)
+++ trunk/property/setup/phpgw_no.lang  2015-08-17 12:37:47 UTC (rev 13731)
@@ -1597,6 +1597,7 @@
 select the estimated end date for the agreement        property        no      
Angi estimert slutt-dato for avtalen
 select the estimated end date for the project  property        no      Angi 
estimert sluttdato for prosjektet
 select the estimated end date for the request  property        no      Angi 
estimert sluttdato for behovet
+select the estimated start date for the request        property        no      
Angi ønsket startdato for behovet
 select the estimated termination date  property        no      Angi estimert 
terminerings-dato
 select the file to import from property        no      velg fil å importere
 select the filter. to show all entries select show all property        no      
Velg filter. For å vise alle - velg VIS ALLE