[Phpgroupware-cvs] CVS: property investment_value_history.php,1.1,1.1.2.1 list_investment_value.php,1.1,1.1.2.1

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv24926

Modified Files:
      Tag: Version-0_9_14-branch
        investment_value_history.php list_investment_value.php 
Log Message:
no message

Index: investment_value_history.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/investment_value_history.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** investment_value_history.php        30 Sep 2002 16:28:47 -0000      1.1
--- investment_value_history.php        12 Dec 2002 18:17:57 -0000      1.1.2.1
***************
*** 242,246 ****
                $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
  
!               $this_index = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('this_index'));
  
                $initial_value = $GLOBALS['phpgw']->db->f('initial_value');
--- 242,246 ----
                $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
  
!               $this_index = $GLOBALS['phpgw']->db->f('this_index');
  
                $initial_value = $GLOBALS['phpgw']->db->f('initial_value');
***************
*** 314,318 ****
  
  
!               if (!$this_index)
                {
                        $new_index= '<input type="hidden" name="new_index" 
value="1" size="5" readonly >';
--- 314,318 ----
  
  
!               if (!$initial_value)
                {
                        $new_index= '<input type="hidden" name="new_index" 
value="1" size="5" readonly >';

Index: list_investment_value.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/list_investment_value.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** list_investment_value.php   30 Sep 2002 16:28:47 -0000      1.1
--- list_investment_value.php   12 Dec 2002 18:17:57 -0000      1.1.2.1
***************
*** 247,256 ****
        if ($entity_type=='property')
        {
!               $sql = "SELECT boei_objekt.objekt_id as entity_id, 
fm_investment.descr as descr, fm_investment_value.invest_id,initial_value, 
boei_objekt.navn, boei_bydel.omraade_id, boei_bydel.bydel,"
                . " fm_investment_value.value, fm_investment_value.date, 
fm_investment_value.this_index, "
                . " fm_investment_value.index_count, fm_investment_value.date "
                . " FROM boei_objekt $join "
                . " boei_bydel ON boei_objekt.bydel_id = boei_bydel.bydel_id 
$join "
!               . " fm_investment_value ON boei_objekt.objekt_id = 
fm_investment_value.entity_id $join "
                . " fm_investment ON fm_investment_value.entity_id = 
fm_investment.entity_id AND "
                . " fm_investment_value.invest_id = fm_investment.invest_id "
--- 247,256 ----
        if ($entity_type=='property')
        {
!               $sql = "SELECT fm_investment.entity_id as entity_id, 
fm_investment.descr as descr, fm_investment_value.invest_id,initial_value, 
boei_objekt.navn, boei_bydel.omraade_id, boei_bydel.bydel,"
                . " fm_investment_value.value, fm_investment_value.date, 
fm_investment_value.this_index, "
                . " fm_investment_value.index_count, fm_investment_value.date "
                . " FROM boei_objekt $join "
                . " boei_bydel ON boei_objekt.bydel_id = boei_bydel.bydel_id 
$join "
!               . " fm_investment_value ON boei_objekt.objekt_id = 
left(fm_investment_value.entity_id,4) $join "
                . " fm_investment ON fm_investment_value.entity_id = 
fm_investment.entity_id AND "
                . " fm_investment_value.invest_id = fm_investment.invest_id "