[Phpgroupware-cvs] property/inc/class.bos_agreement.inc.php, 1.7

[nomail]

Update of /property/inc
Modified Files:
        Branch: 
          class.bos_agreement.inc.php

date: 2004/06/30 13:24:55;  author: sigurdne;  state: Exp;  lines: +7 -2

Log Message:
no message
=====================================================================
Index: property/inc/class.bos_agreement.inc.php
diff -u property/inc/class.bos_agreement.inc.php:1.6 
property/inc/class.bos_agreement.inc.php:1.7
--- property/inc/class.bos_agreement.inc.php:1.6        Tue Jun 29 22:04:51 2004
+++ property/inc/class.bos_agreement.inc.php    Wed Jun 30 13:24:55 2004
@@ -262,7 +262,7 @@
                {
                        $boalarm                = 
CreateObject($this->currentapp.'.boalarm');
                        $event  = $this->so->read_single($data);
-                       $event['alarm_date']=$event['end_date'];
+                       $event['alarm_date']=$event['termination_date'];
                        $event['alarm'] = 
$boalarm->read_alarms($type='s_agreement',$data['s_agreement_id']);
                        return $event;
                }
@@ -273,6 +273,10 @@
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
                        $s_agreement['start_date']              = 
$GLOBALS['phpgw']->common->show_date($s_agreement['start_date'],$dateformat);
                        $s_agreement['end_date']                = 
$GLOBALS['phpgw']->common->show_date($s_agreement['end_date'],$dateformat);
+                       if($s_agreement['termination_date'])
+                       {
+                               $s_agreement['termination_date']= 
$GLOBALS['phpgw']->common->show_date($s_agreement['termination_date'],$dateformat);
+                       }
 
                        $s_agreement = $this->convert_attribute($s_agreement);
 
@@ -443,6 +447,7 @@
 
                        $values['start_date']   = 
$this->bocommon->date_to_timestamp($values['start_date']);
                        $values['end_date']     = 
$this->bocommon->date_to_timestamp($values['end_date']);
+                       $values['termination_date']     = 
$this->bocommon->date_to_timestamp($values['termination_date']);
 
                        $values_attribute = 
$this->convert_attribute_save($values_attribute);