[Phpgroupware-cvs] property/inc/class.sos_agreement.inc.php, 1.10.2.4

[nomail]

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

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

Log Message:
no message
=====================================================================
Index: property/inc/class.sos_agreement.inc.php
diff -u property/inc/class.sos_agreement.inc.php:1.10.2.3 
property/inc/class.sos_agreement.inc.php:1.10.2.4
--- property/inc/class.sos_agreement.inc.php:1.10.2.3   Wed Nov  3 12:52:37 2004
+++ property/inc/class.sos_agreement.inc.php    Mon Nov  8 22:54:27 2004
@@ -143,7 +143,7 @@
 
 
 
-                               $cols = "$entity_table.*, 
fm_s_agreement_pricing.cost,fm_s_agreement_pricing.id as 
index_count,fm_s_agreement_pricing.date,fm_s_agreement_pricing.item_id,fm_s_agreement_pricing.this_index";
+                               $cols = "$entity_table.*, 
fm_s_agreement_pricing.cost,fm_s_agreement_pricing.id as 
index_count,fm_s_agreement_pricing.index_date,fm_s_agreement_pricing.item_id,fm_s_agreement_pricing.this_index";
 
                                $cols_return[]                          = 
'agreement_id';
                                $uicols['input_type'][]         = 'hidden';
@@ -199,9 +199,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');
                        }
@@ -447,7 +447,7 @@
 
                        $entity_table = 'fm_s_agreement_pricing';
 
-                       $cols = 
"fm_s_agreement_pricing.cost,fm_s_agreement_pricing.id as 
index_count,fm_s_agreement_pricing.date,fm_s_agreement_pricing.item_id,fm_s_agreement_pricing.this_index";
+                       $cols = 
"fm_s_agreement_pricing.cost,fm_s_agreement_pricing.id as 
index_count,fm_s_agreement_pricing.index_date,fm_s_agreement_pricing.item_id,fm_s_agreement_pricing.this_index";
 
                        $cols_return[]                  = 'item_id';
                        $uicols['input_type'][]         = 'text';
@@ -479,9 +479,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');
 
@@ -767,7 +767,7 @@
                        $start_date     = $this->db->f('start_date');
 
 
-                       $this->db->query("INSERT INTO fm_s_agreement_pricing 
(agreement_id,item_id,id,current_index,this_index,cost,date,entry_date,user_id) 
"
+                       $this->db->query("INSERT INTO fm_s_agreement_pricing 
(agreement_id,item_id,id,current_index,this_index,cost,index_date,entry_date,user_id)
 "
                                . "VALUES (" . $values['s_agreement_id'] . "," 
. $id .",1,1,1," . $this->floatval($values['cost']) . "," . (int)$start_date . 
"," . time()
                                . "," . $this->account . ")");
 
@@ -819,7 +819,7 @@
                        $this->db->query("UPDATE $table set entry_date='" . 
time() . "', category='"
                                                        . $values['cat_id'] . 
"', member_of='" . $values['member_of'] . "', start_date=" . 
intval($values['start_date']) . ", end_date=" . intval($values['end_date']) . 
", termination_date=" . intval($values['termination_date']) . ", account_id=" . 
intval($values['b_account_id']) . "$value_set WHERE id=" . 
intval($values['s_agreement_id']));
 
-                       $this->db->query("UPDATE fm_s_agreement_pricing set 
date=" . intval($values['start_date']) . " WHERE id=1 AND agreement_id= " . 
intval($values['s_agreement_id']));
+                       $this->db->query("UPDATE fm_s_agreement_pricing set 
index_date=" . intval($values['start_date']) . " WHERE id=1 AND agreement_id= " 
. intval($values['s_agreement_id']));
 
                        $receipt['s_agreement_id']= $values['s_agreement_id'];
                        $receipt['message'][] = array('msg'=>lang('s_agreement 
%1 has been edited',$values['s_agreement_id']));
@@ -890,7 +890,7 @@
 
                                $this->db->query("UPDATE fm_s_agreement_pricing 
set current_index = NULL WHERE agreement_id=" . intval($values['agreement_id']) 
. ' AND item_id=' . intval($item_id));
 
-                               $this->db->query("INSERT INTO 
fm_s_agreement_pricing 
(agreement_id,item_id,id,current_index,this_index,cost,date,entry_date,user_id)"
+                               $this->db->query("INSERT INTO 
fm_s_agreement_pricing 
(agreement_id,item_id,id,current_index,this_index,cost,index_date,entry_date,user_id)"
                                        . "VALUES (" . $values['agreement_id'] 
. "," . $item_id ."," . ($values['id'][$item_id]+1) .",1,'" . 
$values['new_index'] . "','" . ($value * $values['new_index'])  . "'," . 
(int)$values['date'] . "," . time()
                                        . "," . $this->account . ")");