[Fmsystem-commits] [11300] bkbooking: stavanger bugfix

[Kjell Arne Espedal]

Revision: 11300
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11300
Author:   kjell
Date:     2013-09-18 10:43:56 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
bkbooking: stavanger bugfix

Modified Paths:
--------------
    
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php
    
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export_file.inc.php
    branches/stavangerkommune/booking/templates/base/account_code_dimension.xsl

Modified: 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
--- 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php
  2013-09-18 10:37:15 UTC (rev 11299)
+++ 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php
  2013-09-18 10:43:56 UTC (rev 11300)
@@ -290,7 +290,7 @@
             {
                 $export_format = 'csv';
             }
-            elseif ($config->config_data['external_format'] == 'AGGRESSO')
+            elseif ($config->config_data['external_format'] == 'AGRESSO')
             {
                        $export_format = 'agresso';
                        } 
@@ -315,7 +315,7 @@
                                                
$this->format_csv($internal_reservations, $account_codes, $number_generator)
                                                );
                     }
-                    elseif ($config->config_data['external_format'] == 
'AGGRESSO')
+                    elseif ($config->config_data['external_format'] == 
'AGRESSO')
                     {
                                                return 
$this->build_export_result(
                                                $export_format,
@@ -349,7 +349,7 @@
             {
                 $export_format = 'csv';
             }
-            elseif ($config->config_data['internal_format'] == 'AGGRESSO')
+            elseif ($config->config_data['internal_format'] == 'AGRESSO')
             {
                        $export_format = 'agresso';
                        } 
@@ -373,7 +373,7 @@
                                                
$this->format_csv($internal_reservations, $account_codes, $number_generator)
                                                );
                         }
-                        elseif ($config->config_data['internal_format'] == 
'AGGRESSO')
+                        elseif ($config->config_data['internal_format'] == 
'AGRESSO')
                         {
                                                return 
$this->build_export_result(
                                                $export_format,

Modified: 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
--- 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export_file.inc.php
     2013-09-18 10:37:15 UTC (rev 11299)
+++ 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export_file.inc.php
     2013-09-18 10:43:56 UTC (rev 11300)
@@ -43,7 +43,7 @@
                 {
                     return 'csv';
                 }
-                elseif ($config->config_data['internal_format'] == 'AGGRESSO')
+                elseif ($config->config_data['internal_format'] == 'AGRESSO')
                 {
                            return 'txt';
                 }
@@ -56,7 +56,7 @@
                 {
                     return 'csv';
                 }
-                elseif ($config->config_data['external_format'] == 'AGGRESSO')
+                elseif ($config->config_data['external_format'] == 'AGRESSO')
                 {
                            return 'txt';
                 }

Modified: 
branches/stavangerkommune/booking/templates/base/account_code_dimension.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/account_code_dimension.xsl 
2013-09-18 10:37:15 UTC (rev 11299)
+++ branches/stavangerkommune/booking/templates/base/account_code_dimension.xsl 
2013-09-18 10:43:56 UTC (rev 11300)
@@ -80,11 +80,11 @@
             <dt><label for="field_external_format"><xsl:value-of 
select="php:function('lang', 'External customer output format')"/></label></dt>
                        <dd>
                                <select id="field_external_format" 
name="external_format">
-                    <option value="AGGRESSO">
-                        <xsl:if test="config_data/external_format='AGGRESSO'">
+                    <option value="AGRESSO">
+                        <xsl:if test="config_data/external_format='AGRESSO'">
                             <xsl:attribute 
name="selected">checked</xsl:attribute>
                         </xsl:if>
-                        AGGRESSO
+                        AGRESSO
                     </option>
                     <option value="CSV">
                         <xsl:if test="config_data/external_format='CSV'">
@@ -118,11 +118,11 @@
             <dt><label for="field_internal_format"><xsl:value-of 
select="php:function('lang', 'Internal customer output format')"/></label></dt>
                        <dd>
                                <select id="field_internal_format" 
name="internal_format">
-                    <option value="AGGRESSO">
-                        <xsl:if test="config_data/internal_format='AGGRESSO'">
+                    <option value="AGRESSO">
+                        <xsl:if test="config_data/internal_format='AGRESSO'">
                             <xsl:attribute 
name="selected">checked</xsl:attribute>
                         </xsl:if>
-                        AGGRESSO
+                        AGRESSO
                     </option>
                     <option value="CSV">
                         <xsl:if test="config_data/internal_format='CSV'">
@@ -160,7 +160,7 @@
         <div class="clr"/>
 
        <dl class="form">
-               <dt class="heading"><xsl:value-of select="php:function('lang', 
'Export aggresso')"/></dt>
+               <dt class="heading"><xsl:value-of select="php:function('lang', 
'Export agresso')"/></dt>
        </dl>
 
        <p><xsl:value-of select="php:function('lang', 'export_help_text')"/></p>