[Fmsystem-commits] [9192] bkbooking: bugfixes for event , schedule. js and new error message in event

[Kjell Arne Espedal]

Revision: 9192
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9192
Author:   kjell
Date:     2012-04-20 13:04:29 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
bkbooking: bugfixes for event , schedule.js and new error message in event

Modified Paths:
--------------
    trunk/booking/inc/class.uievent.inc.php
    trunk/booking/js/booking/schedule.js
    trunk/booking/setup/phpgw_no.lang

Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php     2012-04-20 10:57:00 UTC (rev 
9191)
+++ trunk/booking/inc/class.uievent.inc.php     2012-04-20 13:04:29 UTC (rev 
9192)
@@ -390,7 +390,10 @@
 
                                if ($_POST['cost'] != 0 and 
!$event['customer_organization_number'] and !$event['customer_ssn']) {
                                        $errors['invoice_data'] = lang('There 
is set a cost, but no invoice data is filled inn');
-                               } 
+                               }
+                               if(($_POST['organization_name'] != '' or 
$_POST['org_id2'] != '') and isset($errors['contact_name'])) {
+                                       $errors['contact_name'] = 
lang('Organization is missing booking charge');
+                               }
                                if(!$errors['event'] && !$errors['from_'] && 
!$errors['time'] && !$errors['invoice_data'] && !$errors['resource_number'] && 
!$errors['organization_number'] && !$errors['contact_name'] && !$errors['cost'])
                                {
                                        if (!$_POST['application_id'])
@@ -648,6 +651,7 @@
                                                                }
                                                                
$comment_text_log = $comment_text_log.' sitt arrangement i 
'.$event['building_name'].' '.date('d-m-Y H:i', strtotime($event['from_']))." 
har blitt kansellert.\n For mer opplysinger slå opp i AktivBy.\n\n";
                                                                
$comment_text_log .= phpgw::get_var('mail', 'POST');
+                                                               
$comment_text_log = html_entity_decode($comment_text_log);                      
                                                                $sendt = 0;
                                                                $mail_sendt_to 
= '';
 

Modified: trunk/booking/js/booking/schedule.js
===================================================================
--- trunk/booking/js/booking/schedule.js        2012-04-20 10:57:00 UTC (rev 
9191)
+++ trunk/booking/js/booking/schedule.js        2012-04-20 13:04:29 UTC (rev 
9192)
@@ -34,7 +34,7 @@
 YAHOO.booking.frontendScheduleColorFormatter = function(elCell, oRecord, 
oColumn, booking) { 
        if(booking) {
                if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color50';
+                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color60';
                }
                var color = colorMap[booking.name];
                YAHOO.util.Dom.addClass(elCell, 'info');
@@ -103,7 +103,7 @@
 YAHOO.booking.backendScheduleColorFormatter = function(elCell, oRecord, 
oColumn, booking) { 
        if(booking) {
                if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color50';
+                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color60';
                }
                var color = colorMap[booking.name];
                YAHOO.util.Dom.addClass(elCell, color);
@@ -118,7 +118,7 @@
 YAHOO.booking.scheduleColorFormatter = function(elCell, oRecord, oColumn, 
booking) { 
        if(booking) {
                if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color50';
+                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color60';
                }
                var color = colorMap[booking.name];
                YAHOO.util.Dom.addClass(elCell, color);

Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang   2012-04-20 10:57:00 UTC (rev 9191)
+++ trunk/booking/setup/phpgw_no.lang   2012-04-20 13:04:29 UTC (rev 9192)
@@ -549,3 +549,4 @@
 Current external billing sequence number       booking no      Nåværende 
sekvensnummer for ekstern fakturering 
 Billing sequence numbers       booking no      Sekvensnummer for fakturering
 Do not change these values unless you know what they are.      booking no      
Ikke endre disse verdiene med mindre du vet hva de er.
+Organization is missing booking charge booking no      Organisasjonen mangler 
bookingansvarlig