[Phpgroupware-cvs] property/inc/class.soagreement.inc.php, 1.3.2.3

[nomail]

Update of /property/inc
Modified Files:
        Branch: proposed-0_9_18-branch
          class.soagreement.inc.php

date: 2004/11/08 22:54:27;  author: sigurdne;  state: Exp;  lines: +11 -11

Log Message:
no message
=====================================================================
Index: property/inc/class.soagreement.inc.php
diff -u property/inc/class.soagreement.inc.php:1.3.2.2 
property/inc/class.soagreement.inc.php:1.3.2.3
--- property/inc/class.soagreement.inc.php:1.3.2.2      Tue Nov  2 10:40:46 2004
+++ property/inc/class.soagreement.inc.php      Mon Nov  8 22:54:27 2004
@@ -389,7 +389,7 @@
 
                        $cols = "fm_activities.*, 
$entity_table.m_cost,$entity_table.w_cost,"
                                . " 
$entity_table.total_cost,$entity_table.index_count,"
-                               . " 
$entity_table.date,$entity_table.activity_id,"
+                               . " 
$entity_table.index_date,$entity_table.activity_id,"
                                . " 
$entity_table.this_index,$entity_table.agreement_id";
 
 
@@ -420,7 +420,7 @@
                        $uicols['name'][]                       = 'index_count';
                        $uicols['descr'][]                      = 
lang('index_count');
 
-                       $uicols['name'][]                       = 'date';
+                       $uicols['name'][]                       = 'index_date';
                        $uicols['descr'][]                      = lang('Date');
 
                        if ($order)
@@ -504,7 +504,7 @@
                                        'total_cost'            => 
$this->db->f('total_cost'),
                                        'this_index'            => 
$this->db->f('this_index'),
                                        'index_count'           => 
$this->db->f('index_count'),
-                                       'date'                          => 
$GLOBALS['phpgw']->common->show_date($this->db->f('date'),$dateformat)
+                                       'date'                          => 
$GLOBALS['phpgw']->common->show_date($this->db->f('index_date'),$dateformat)
                                );
                        }
 //html_print_r($details);
@@ -522,7 +522,7 @@
                        $entity_table = 'fm_activity_price_index';
 
                        $cols = 
"fm_activity_price_index.m_cost,fm_activity_price_index.w_cost,fm_activity_price_index.total_cost,"
-                               . " 
fm_activity_price_index.index_count,fm_activity_price_index.date,fm_activity_price_index.activity_id,fm_activity_price_index.this_index";
+                               . " 
fm_activity_price_index.index_count,fm_activity_price_index.index_date,fm_activity_price_index.activity_id,fm_activity_price_index.this_index";
 
                        $cols_return[]                  = 'activity_id';
                        $uicols['input_type'][]         = 'text';
@@ -564,9 +564,9 @@
                        $uicols['descr'][]                      = 
lang('index_count');
                        $uicols['statustext'][]         = lang('index_count');
 
-                       $cols_return[]                  = 'date';
+                       $cols_return[]                  = 'index_date';
                        $uicols['input_type'][]         = 'text';
-                       $uicols['name'][]                       = 'date';
+                       $uicols['name'][]                       = 'index_date';
                        $uicols['descr'][]                      = lang('date');
                        $uicols['statustext'][]         = lang('date');
 
@@ -800,7 +800,7 @@
 
                        $sql = "UPDATE fm_activity_price_index SET "
                                . " index_count = 1,current_index = 
1,this_index = 1,"
-                               . " m_cost = $m_cost,w_cost = $w_cost 
,total_cost = $total_cost ,date = $start_date,"
+                               . " m_cost = $m_cost,w_cost = $w_cost 
,total_cost = $total_cost ,index_date = $start_date,"
                                . " entry_date = $entry_date ,user_id =" . 
$this->account . " WHERE agreement_id = $agreement_id AND activity_id = 
$activity_id AND index_count = -1";
 
                        $this->db->query($sql);
@@ -855,7 +855,7 @@
                        $this->db->query("UPDATE $table set entry_date='" . 
time() . "', category='"
                                                        . $values['cat_id'] . 
"', start_date=" . intval($values['start_date']) . ", end_date=" . 
intval($values['end_date']) . ", termination_date=" . 
intval($values['termination_date']) . "$value_set WHERE id=" . 
intval($values['agreement_id']));
 
-                       $this->db->query("UPDATE fm_activity_price_index set 
date=" . intval($values['start_date']) . " WHERE index_count=1 AND 
agreement_id= " . intval($values['agreement_id']));
+                       $this->db->query("UPDATE fm_activity_price_index set 
index_date=" . intval($values['start_date']) . " WHERE index_count=1 AND 
agreement_id= " . intval($values['agreement_id']));
 
                        $receipt['agreement_id']= $values['agreement_id'];
                        $receipt['message'][] = array('msg'=>lang('agreement %1 
has been edited',$values['agreement_id']));
@@ -898,7 +898,7 @@
                                {
                                        $this->db->query("UPDATE 
fm_activity_price_index set current_index = NULL WHERE agreement_id=" . 
intval($values['agreement_id']) . ' AND activity_id=' . intval($activity_id));
 
-                                       $this->db->query("INSERT INTO 
fm_activity_price_index 
(agreement_id,activity_id,index_count,current_index,this_index,m_cost,w_cost,total_cost,date,entry_date,user_id)"
+                                       $this->db->query("INSERT INTO 
fm_activity_price_index 
(agreement_id,activity_id,index_count,current_index,this_index,m_cost,w_cost,total_cost,index_date,entry_date,user_id)"
                                                . "VALUES (" . 
$values['agreement_id'] . "," . $activity_id ."," . 
($values['id'][$activity_id]+1) .",1,'" . $values['new_index'] . "','" . 
($values['m_cost'][$activity_id] * $values['new_index']) . "','" . 
($values['w_cost'][$activity_id] * $values['new_index']) . "','" . 
($values['total_cost'][$activity_id] * $values['new_index'])  . "'," . 
(int)$values['date'] . "," . time()
                                                . "," . $this->account . ")");
 
@@ -942,7 +942,7 @@
                        {
                                $sql = "UPDATE fm_activity_price_index SET "
                                        . " index_count = -1,current_index = 
1,this_index = 1,"
-                                       . " m_cost = NULL,w_cost = NULL 
,total_cost = NULL ,date = NULL,"
+                                       . " m_cost = NULL,w_cost = NULL 
,total_cost = NULL ,index_date = NULL,"
                                        . " entry_date = NULL ,user_id =" . 
$this->account . " WHERE agreement_id = $agreement_id AND activity_id = 
$activity_id";
 
                                $this->db->query($sql);
@@ -1510,7 +1510,7 @@
 
                                foreach($values['select'] as $activity_id)
                                {
-                                       $this->db->query("INSERT INTO 
fm_activity_price_index ( agreement_id, 
activity_id,index_count,current_index,date,entry_date,user_id) "
+                                       $this->db->query("INSERT INTO 
fm_activity_price_index ( agreement_id, 
activity_id,index_count,current_index,index_date,entry_date,user_id) "
                                        . "VALUES 
($agreement_id,$activity_id,-1,1,$date," . time() . "," . $this->account . ")");
                                }