[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/class.soproject.inc.php, 1.7
From: |
nomail |
Subject: |
[Phpgroupware-cvs] property/inc/class.soproject.inc.php, 1.7 |
Date: |
Tue, 14 Sep 2004 22:24:14 +0200 |
Update of /property/inc
Modified Files:
Branch:
class.soproject.inc.php
date: 2004/09/14 20:24:14; author: sigurdne; state: Exp; lines: +4 -2
Log Message:
no message
=====================================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.6
property/inc/class.soproject.inc.php:1.7
--- property/inc/class.soproject.inc.php:1.6 Mon Sep 13 07:19:10 2004
+++ property/inc/class.soproject.inc.php Tue Sep 14 20:24:14 2004
@@ -383,7 +383,7 @@
function project_workorder_data($project_id = '')
{
- $this->db->query("select budget, id as workorder_id,
vendor_id, calculation,rig_addition,addition,deviation from fm_workorder where
project_id='$project_id'");
+ $this->db->query("SELECT act_mtrl_cost,
act_vendor_cost, budget, id as workorder_id, vendor_id,
calculation,rig_addition,addition,deviation from fm_workorder where
project_id='$project_id'");
while ($this->db->next_record())
{
$budget[] = array(
@@ -391,7 +391,9 @@
'budget' =>
$this->db->f('budget'),
'deviation' =>
$this->db->f('deviation'),
'calculation' =>
($this->db->f('calculation')*(1+$this->db->f('addition')/100))+$this->db->f('rig_addition'),
- 'vendor_id' =>
$this->db->f('vendor_id')
+ 'vendor_id' =>
$this->db->f('vendor_id'),
+ 'act_mtrl_cost' =>
$this->db->f('act_mtrl_cost'),
+ 'act_vendor_cost' =>
$this->db->f('act_vendor_cost')
);
}
return $budget;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/class.soproject.inc.php, 1.7,
nomail <=