[Phpgroupware-cvs] property/inc/class.sopricebook.inc.php, 1.6.2.2

[nomail]

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

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

Log Message:
no message
=====================================================================
Index: property/inc/class.sopricebook.inc.php
diff -u property/inc/class.sopricebook.inc.php:1.6.2.1 
property/inc/class.sopricebook.inc.php:1.6.2.2
--- property/inc/class.sopricebook.inc.php:1.6.2.1      Tue Nov  2 09:54:55 2004
+++ property/inc/class.sopricebook.inc.php      Mon Nov  8 22:54:27 2004
@@ -31,7 +31,7 @@
 
                function 
add_activity_first_prize($m_cost,$w_cost,$total_cost,$activity_id,$vendor_id,$date)
                {
-                       $this->db->query("update fm_activity_price_index  set 
index_count='1',this_index='1', 
m_cost='$m_cost',w_cost='$w_cost',total_cost='$total_cost',date='$date',current_index='1'
 where activity_id='$activity_id' and vendor_id= '$vendor_id' and index_count= 
'1'",__LINE__,__FILE__);
+                       $this->db->query("update fm_activity_price_index  set 
index_count='1',this_index='1', 
m_cost='$m_cost',w_cost='$w_cost',total_cost='$total_cost',index_date='$date',current_index='1'
 where activity_id='$activity_id' and vendor_id= '$vendor_id' and index_count= 
'1'",__LINE__,__FILE__);
 
                        $receipt['message'][] = array('msg'=>lang('First entry 
is added!'));
 
@@ -49,7 +49,7 @@
                                $this->db->query("update 
fm_activity_price_index set current_index = Null"
                                . " WHERE activity_id='" . 
$update[$i]['activity_id'] . "' and vendor_id='" . $update[$i]['vendor_id'] . 
"'",__LINE__,__FILE__);
 
-                               $this->db->query("insert into 
fm_activity_price_index (activity_id, vendor_id, index_count, this_index, 
m_cost, w_cost, total_cost, date,current_index) "
+                               $this->db->query("insert into 
fm_activity_price_index (activity_id, vendor_id, index_count, this_index, 
m_cost, w_cost, total_cost, index_date,current_index) "
                                . " values ('" .
                                        $update[$i]['activity_id'] . "','" .
                                        $update[$i]['vendor_id'] . "','" .
@@ -402,7 +402,7 @@
                                $querymethod = " AND (fm_activities.descr LIKE 
'%$query%' or fm_activities.num LIKE '%$query%')";
                        }
 
-                       $sql = "SELECT 
index_count,this_index,current_index,m_cost,w_cost,total_cost,date"
+                       $sql = "SELECT 
index_count,this_index,current_index,m_cost,w_cost,total_cost,index_date"
                                . " FROM fm_activity_price_index $this->join 
fm_agreement on fm_activity_price_index.agreement_id = fm_agreement.id "
                                . " Where activity_id= '$activity_id' and 
vendor_id= '$vendor_id'";
 
@@ -429,7 +429,7 @@
                                        'm_cost'                        => 
$this->db->f('m_cost'),
                                        'w_cost'                        => 
$this->db->f('w_cost'),
                                        'total_cost'            => 
$this->db->f('total_cost'),
-                                       'date'                          => 
$this->db->f('date')
+                                       'date'                          => 
$this->db->f('index_date')
                                );
                        }
 //             _debug_array($pricebook);
@@ -724,7 +724,7 @@
                {
                        if ($index_count==1)
                        {
-                               $this->db->query("update 
fm_activity_price_index set index_count = '1', current_index = '0', 
this_index=Null, m_cost=Null,w_cost=Null,total_cost=Null,date=Null  where 
activity_id='$activity_id' and vendor_id= '$vendor_id' and index_count= 
'1'",__LINE__,__FILE__);
+                               $this->db->query("update 
fm_activity_price_index set index_count = '1', current_index = '0', 
this_index=Null, m_cost=Null,w_cost=Null,total_cost=Null,index_date=Null  where 
activity_id='$activity_id' and vendor_id= '$vendor_id' and index_count= 
'1'",__LINE__,__FILE__);
                        }
                        else
                        {