[Fmsystem-commits] [8509] bkbooking: nsf update org changed to member/group

[Kjell Arne Espedal]

Revision: 8509
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8509
Author:   kjell
Date:     2012-01-06 14:03:49 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
bkbooking: nsf update org changed to member/group

Modified Paths:
--------------
    branches/dev-thomasez/booking/inc/class.customer_identifier.inc.php
    branches/dev-thomasez/booking/setup/phpgw_no.lang
    branches/dev-thomasez/booking/templates/base/customer_identifier.xsl
    branches/dev-thomasez/booking/templates/base/event_edit.xsl
    branches/dev-thomasez/booking/templates/base/event_new.xsl

Modified: branches/dev-thomasez/booking/inc/class.customer_identifier.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.customer_identifier.inc.php 
2012-01-06 13:30:08 UTC (rev 8508)
+++ branches/dev-thomasez/booking/inc/class.customer_identifier.inc.php 
2012-01-06 14:03:49 UTC (rev 8509)
@@ -29,7 +29,7 @@
                                $to_entity[$this->identifier_type_field] = 
$from_entity_customer_identifier;
                 if(intval($from_entity['customer_internal']) == 1)
                 {
-                    if (strlen($from_entity['customer_number']) == 5)          
                
+                    if ((strlen($from_entity['customer_number']) == 4) || 
(strlen($from_entity['customer_number']) == 6))                      
                     {
                        
$to_entity[$this->field_prefix.$from_entity_customer_identifier] = 
$from_entity['customer_number'];
                     }
@@ -163,7 +163,7 @@
                                        if (all_cust_fields[field_type].name == 
'customer_ssn') {
                                                
all_cust_fields[field_type].value = '6 siffer (DDMMÅÅ) eller 11 siffer';
                                        } else if 
(all_cust_fields[field_type].name == 'customer_organization_number') {
-                                               
all_cust_fields[field_type].value = '9 siffer';
+                                               
all_cust_fields[field_type].value = '4 eller 6 siffer';
                                        } else if 
(all_cust_fields[field_type].name == 'customer_address') {
                                                
YAHOO.util.Dom.get('field_customer_street').value = 'Street';
                                                
YAHOO.util.Dom.get('field_customer_zipcode').value = 'Zipcode';

Modified: branches/dev-thomasez/booking/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/booking/setup/phpgw_no.lang   2012-01-06 13:30:08 UTC 
(rev 8508)
+++ branches/dev-thomasez/booking/setup/phpgw_no.lang   2012-01-06 14:03:49 UTC 
(rev 8509)
@@ -150,9 +150,9 @@
 oct    booking no      oktober
 of     booking no      av
 officer        booking no      Saksbehandler
-organization   booking no      Organisasjon
-organization number    booking no      Organisasjonnummer
-organizations  booking no      Organisasjoner
+organization   booking no      Medlem/Gruppe
+organization number    booking no      Medlem/Gruppe nummer
+organizations  booking no      Medlem/Grupper
 other  booking no      Annet
 parent activity        booking no      Overordnet kategori
 parent id      booking no      Overordnet id
@@ -394,7 +394,7 @@
 Your application has now been registered and a confirmation email has been 
sent to you.        booking no      Søknaden har blitt sendt inn, og en 
bekreftelse har blitt sendt til deg på e-post.
 A Case officer will review your application as soon as possible.       booking 
no      En saksbehandler vil behandle søknaden så fort som mulig.
 customer_ssn contains an invalid Norwegian social security number (6 or 11 
digits)     booking no      Fødselsdato/fødselsnummer er ikke gyldig. Nummeret 
må bestå av 6 eller 11 siffer
-customer_organization_number is invalid        booking no      
Organisasjonsnummer er ugyldig
+customer_organization_number is invalid        booking no      Medlem/Gruppe 
nummer er ugyldig
 Select an organization first   booking no      Velg organisasjon først
 Add Resource   booking no      Ny ressurs
 %1 e-mails were sent successfully      booking no      %1 e-poster ble sendt
@@ -404,7 +404,7 @@
 contact_name   booking no      Navn
 customer_identifier_type       booking no      Fakturainformasjon
 group_id       booking no      Gruppe/Lag
-organization_id        booking no      Organisasjon
+organization_id        booking no      Medlem/gruppe nummer
 season_id      booking no      Sesong
 from_  booking no      Fra
 to_    booking no      Til

Modified: branches/dev-thomasez/booking/templates/base/customer_identifier.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/customer_identifier.xsl        
2012-01-06 13:30:08 UTC (rev 8508)
+++ branches/dev-thomasez/booking/templates/base/customer_identifier.xsl        
2012-01-06 14:03:49 UTC (rev 8509)
@@ -6,7 +6,6 @@
                <dt>
                        <xsl:if 
test="not(normalize-space($label))"><xsl:attribute 
name="style">visibility:hidden</xsl:attribute></xsl:if>
                        <xsl:value-of select="php:function('lang', $label)" />
-                       
                </dt>
                
                <dd>

Modified: branches/dev-thomasez/booking/templates/base/event_edit.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/event_edit.xsl 2012-01-06 
13:30:08 UTC (rev 8508)
+++ branches/dev-thomasez/booking/templates/base/event_edit.xsl 2012-01-06 
14:03:49 UTC (rev 8509)
@@ -203,7 +203,7 @@
         </dl>
                <dl class="form-col">
                        <dt class="heading"><xsl:value-of 
select="php:function('lang', 'Invoice information')" /></dt>
-
+<!--
             <dt><label for="field_org"><xsl:value-of 
select="php:function('lang', 'Organization')" /></label></dt>
             <dd>
                 <div class="autocomplete">
@@ -216,7 +216,7 @@
                     <div id="org_container"/>
                 </div>
             </dd>
-
+-->
                        <xsl:copy-of 
select="phpgw:booking_customer_identifier(event, '')"/>
                        
                        <dt><label for="field_customer_internal"><xsl:value-of 
select="php:function('lang', 'Internal Customer')"/></label></dt>

Modified: branches/dev-thomasez/booking/templates/base/event_new.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/event_new.xsl  2012-01-06 
13:30:08 UTC (rev 8508)
+++ branches/dev-thomasez/booking/templates/base/event_new.xsl  2012-01-06 
14:03:49 UTC (rev 8509)
@@ -166,6 +166,7 @@
 
                        <dt class="heading"><xsl:value-of 
select="php:function('lang', 'Invoice information')" /></dt>
 
+<!--
             <dt><label for="field_org"><xsl:value-of 
select="php:function('lang', 'Organization')" /></label></dt>
             <dd>
                 <div class="autocomplete">
@@ -178,7 +179,7 @@
                     <div id="org_container"/>
                 </div>
             </dd>
-
+-->
                        <xsl:copy-of 
select="phpgw:booking_customer_identifier(event, '')"/>