[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8716] property: project budgetting
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [8716] property: project budgetting |
Date: |
Mon, 30 Jan 2012 12:35:48 +0000 |
Revision: 8716
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8716
Author: sigurdne
Date: 2012-01-30 12:35:47 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
property: project budgetting
Modified Paths:
--------------
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.uiproject.inc.php
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2012-01-30 12:08:59 UTC (rev
8715)
+++ trunk/property/inc/class.boproject.inc.php 2012-01-30 12:35:47 UTC (rev
8716)
@@ -515,6 +515,7 @@
$values['workorder_budget'][$i]['status'] =
$workorder_data[$i]['status'];
$values['workorder_budget'][$i]['actual_cost']
= $workorder_data[$i]['act_mtrl_cost']+$workorder_data[$i]['act_vendor_cost'];
$values['workorder_budget'][$i]['b_account_id']
= $workorder_data[$i]['b_account_id'];
+ $values['workorder_budget'][$i]['paid_percent']
= (int)$workorder_data[$i]['paid_percent'];
if(isset($workorder_data[$i]['vendor_id']) &&
$workorder_data[$i]['vendor_id'])
{
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2012-01-30 12:08:59 UTC (rev
8715)
+++ trunk/property/inc/class.soproject.inc.php 2012-01-30 12:35:47 UTC (rev
8716)
@@ -716,8 +716,8 @@
$project_id = (int) $project_id;
$budget = array();
$this->db->query("SELECT fm_workorder.title,
act_mtrl_cost, act_vendor_cost, budget, fm_workorder.id as
workorder_id,contract_sum,"
- ." vendor_id,
calculation,rig_addition,addition,deviation,charge_tenant,fm_workorder_status.descr
as status, fm_workorder.account_id as b_account_id"
- ." FROM fm_workorder $this->join
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id WHERE
project_id={$project_id}");
+ ." vendor_id,
calculation,rig_addition,addition,deviation,charge_tenant,fm_workorder_status.descr
as status, fm_workorder.account_id as b_account_id,paid_percent"
+ ." FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id WHERE
project_id={$project_id}");
while ($this->db->next_record())
{
$budget[] = array(
@@ -733,6 +733,7 @@
'status' =>
$this->db->f('status'),
'b_account_id' =>
$this->db->f('b_account_id'),
'contract_sum' =>
(int)$this->db->f('contract_sum'),
+ 'paid_percent' =>
(int)$this->db->f('paid_percent')
);
}
return $budget;
@@ -1315,14 +1316,17 @@
}
}
- $sql = "SELECT EXTRACT(YEAR from
to_timestamp(start_date) ) as year, sum(calculation) as calculation,
sum(budget) as budget, sum(contract_sum) as contract_sum FROM fm_workorder"
+ $sql = "SELECT EXTRACT(YEAR from
to_timestamp(start_date) ) as year, sum(calculation) as calculation,
sum(budget) as budget,"
+ . " sum(contract_sum) as contract_sum ,paid_percent"
+ . " FROM fm_workorder"
. " {$this->join} fm_workorder_status ON
fm_workorder.status = fm_workorder_status.id"
- . " WHERE project_id = {$project_id} AND
fm_workorder_status.closed IS NULL"
- . " GROUP BY fm_workorder.id,
fm_workorder.start_date";// ORDER BY start_date ASC";
+ . " WHERE project_id = {$project_id} AND
(fm_workorder_status.closed IS NULL OR fm_workorder_status.closed != 1)"
+ . " GROUP BY fm_workorder.id, paid_percent,
fm_workorder.start_date ORDER BY start_date ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
+ $paid_percent =
(int)$this->db->f('paid_percent');
$year = $this->db->f('year');
if($this->db->f('contract_sum') > 0)
@@ -1341,10 +1345,11 @@
{
$_sum = 0;
}
+_debug_array((100 - $paid_percent)/100);
+ $_sum = $_sum * (100 - $paid_percent)/100;
$cost_info[$year]['sum_orders'] += $_sum;
}
-
$sort_year = array();
$values = array();
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2012-01-30 12:08:59 UTC (rev
8715)
+++ trunk/property/inc/class.uiproject.inc.php 2012-01-30 12:35:47 UTC (rev
8716)
@@ -1637,6 +1637,7 @@
array('key' =>
'budget','label'=>lang('Budget'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'calculation','label'=>lang('Calculation'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'actual_cost','label'=>lang('actual
cost'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
+
array('key' =>
'paid_percent','label'=>lang('paid
percent'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
// array('key' =>
'charge_tenant','label'=>lang('charge
tenant'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'vendor_name','label'=>lang('Vendor'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'status','label'=>lang('Status'),'sortable'=>true,'resizeable'=>true)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8716] property: project budgetting,
Sigurd Nes <=