[Phpgroupware-cvs] property/inc/class.soinvestment.inc.php, 1.2.2.1

[nomail]

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

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

Log Message:
no message
=====================================================================
Index: property/inc/class.soinvestment.inc.php
diff -u property/inc/class.soinvestment.inc.php:1.2 
property/inc/class.soinvestment.inc.php:1.2.2.1
--- property/inc/class.soinvestment.inc.php:1.2 Wed Jun  2 18:54:28 2004
+++ property/inc/class.soinvestment.inc.php     Mon Nov  8 22:54:27 2004
@@ -102,7 +102,7 @@
                        if ($cat_id=='property')
                        {
                                $sql = "SELECT fm_investment.entity_id as 
entity_id, fm_investment.descr as descr, 
fm_investment_value.invest_id,initial_value, fm_location1.loc1_name as name, 
fm_part_of_town.district_id, fm_part_of_town.name as part_of_town,"
-                               . " fm_investment_value.value, 
fm_investment_value.date, fm_investment_value.this_index, "
+                               . " fm_investment_value.value, 
fm_investment_value.index_date, fm_investment_value.this_index, "
                                . " fm_investment_value.index_count"
                                . " FROM (((fm_investment $this->join 
fm_investment_value ON ( fm_investment.entity_id = 
fm_investment_value.entity_id) AND "
                                . " (fm_investment.invest_id = 
fm_investment_value.invest_id )) "
@@ -114,7 +114,7 @@
                        else
                        {
                                $sql = "SELECT 
fm_investment.location_code,fm_investment.entity_id, fm_investment.descr as 
descr, fm_investment_value.invest_id,initial_value, 
fm_part_of_town.district_id, fm_part_of_town.name as part_of_town,"
-                               . " fm_investment_value.value, 
fm_investment_value.date, 
fm_investment_value.this_index,fm_entity_category.name as entity_name, "
+                               . " fm_investment_value.value, 
fm_investment_value.index_date, 
fm_investment_value.this_index,fm_entity_category.name as entity_name, "
                                . " fm_investment_value.index_count "
                                . " FROM ((((fm_investment $this->join "
                                . " fm_entity_category ON 
(fm_investment.p_entity_id = fm_entity_category.entity_id AND 
fm_investment.p_cat_id = fm_entity_category.id)) $this->join "
@@ -154,7 +154,7 @@
                                $investment[$i]['value']                        
= $this->db->f('value');
                                $investment[$i]['this_index']           = 
$this->db->f('this_index');
                                $investment[$i]['index_count']          = 
$this->db->f('index_count');
-                               $investment[$i]['date']                         
= $this->db->f('date');
+                               $investment[$i]['date']                         
= $this->db->f('index_date');
                                if ($cat_id=='property')
                                {
                                        $investment[$i]['entity_name']  = 
$this->db->f('name');
@@ -232,7 +232,7 @@
                        $this->db->query("insert into fm_investment (entity_id, 
invest_id,entity_type,location_code,writeoff_year, descr $cols) "
                        . " values ('$entity_id', 
'$next_invest_id','$entity_type','$location_code','$period','$descr' $vals )");
 
-                       $this->db->query("insert into fm_investment_value 
(entity_id, invest_id, index_count, this_index, current_index, 
value,initial_value, date) "
+                       $this->db->query("insert into fm_investment_value 
(entity_id, invest_id, index_count, this_index, current_index, 
value,initial_value, index_date) "
                        . " values ('$entity_id', '$next_invest_id','1', '0', 
'1','$initial_value','$initial_value','$date')");
 
 
@@ -273,7 +273,7 @@
                                        $insert = 
$this->bocommon->validate_db_insert($insert);
 
 
-                                       $this->db->query("insert into 
fm_investment_value (entity_id, invest_id, index_count, this_index, 
value,initial_value, date,current_index) "
+                                       $this->db->query("insert into 
fm_investment_value (entity_id, invest_id, index_count, this_index, 
value,initial_value, index_date,current_index) "
                                        . " values ($insert)");
                                }
                                $this->db->transaction_commit();
@@ -288,7 +288,7 @@
                        }
 
 
-                       $sql = "SELECT index_count, 
this_index,current_index,value, initial_value, date  "
+                       $sql = "SELECT index_count, 
this_index,current_index,value, initial_value, index_date  "
                        . " FROM fm_investment_value Where entity_id= 
'$entity_id' and invest_id= '$investment_id' order by index_count";
 
                        $this->db2->query($sql,__LINE__,__FILE__);
@@ -312,7 +312,7 @@
                                $investment[$i]['this_index']           = 
$this->db->f('this_index');
                                $investment[$i]['current_index']        = 
$this->db->f('current_index');
                                $investment[$i]['index_count']          = 
$this->db->f('index_count');
-                               $investment[$i]['date']                         
= $this->db->f('date');
+                               $investment[$i]['date']                         
= $this->db->f('index_date');
                                $investment[$i]['this_write_off']       = 
round(($this->db->f('this_index') * $this->db->f('initial_value')),2);
                                $i++;
                        }
@@ -341,7 +341,7 @@
                        $this->db->transaction_begin();
                        if ($index_count==1)
                        {
-                               $this->db->query("update fm_investment_value 
set current_index = '0', this_index=Null, 
value=Null,initial_value=Null,date=Null  where entity_id='$entity_id' and 
invest_id= '$invest_id' and index_count= '1'");
+                               $this->db->query("update fm_investment_value 
set current_index = '0', this_index=Null, 
value=Null,initial_value=Null,index_date=Null  where entity_id='$entity_id' and 
invest_id= '$invest_id' and index_count= '1'");
                        }
                        else
                        {