[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12092] property: refine actual cost at tickets
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12092] property: refine actual cost at tickets |
|
Date: |
Mon, 15 Sep 2014 09:10:15 +0000 |
Revision: 12092
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12092
Author: sigurdne
Date: 2014-09-15 09:10:13 +0000 (Mon, 15 Sep 2014)
Log Message:
-----------
property: refine actual cost at tickets
Modified Paths:
--------------
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.sotts.inc.php
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2014-09-14 12:09:11 UTC (rev
12091)
+++ trunk/property/inc/class.botts.inc.php 2014-09-15 09:10:13 UTC (rev
12092)
@@ -260,12 +260,6 @@
'name'=> lang('actual cost')
);
- $columns['actual_cost_year'] = array
- (
- 'id' => 'actual_cost_year',
- 'name'=> lang('year')
- );
-
$columns['difference'] = array
(
'id' => 'difference',
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2014-09-14 12:09:11 UTC (rev
12091)
+++ trunk/property/inc/class.sotts.inc.php 2014-09-15 09:10:13 UTC (rev
12092)
@@ -390,11 +390,28 @@
$where = 'AND';
}
+ $actual_cost_field = 'fm_tts_tickets.actual_cost';
if ($start_date)
{
- $end_date = $end_date + 3600 * 16 +
phpgwapi_datetime::user_timezone();
- $start_date = $start_date - 3600 * 8 +
phpgwapi_datetime::user_timezone();
- $filtermethod .= " $where
fm_tts_tickets.entry_date >= $start_date AND fm_tts_tickets.entry_date <=
$end_date ";
+ $order_add =
$GLOBALS['phpgw']->acl->check('.ticket.order', PHPGW_ACL_ADD, 'property');
+ $order_edit =
$GLOBALS['phpgw']->acl->check('.ticket.order', PHPGW_ACL_EDIT, 'property');
+
+ if($order_add || $order_edit)
+ {
+ $end_date = date('Ym', $end_date);
+ $start_date = date('Ym',
$start_date);
+ $filtermethod .= " $where
fm_tts_payments.period >= $start_date AND fm_tts_payments.period <= $end_date ";
+ $date_join = " LEFT OUTER JOIN
fm_tts_payments ON fm_tts_tickets.id=fm_tts_payments.ticket_id";
+ $actual_cost_field =
'SUM(fm_tts_payments.amount) AS actual_cost';
+ }
+ else
+ {
+ $end_date = $end_date + 3600 * 16
+ phpgwapi_datetime::user_timezone();
+ $start_date = $start_date - 3600 *
8 + phpgwapi_datetime::user_timezone();
+ $filtermethod .= " $where
fm_tts_tickets.entry_date >= $start_date AND fm_tts_tickets.entry_date <=
$end_date ";
+ $date_join = '';
+ }
+
$where= 'AND';
}
@@ -458,8 +475,8 @@
$return_fields =
"fm_tts_tickets.id,fm_tts_tickets.assignedto,fm_tts_tickets.status,fm_tts_tickets.user_id,"
.
"fm_tts_tickets.subject,fm_tts_tickets.address,fm_tts_tickets.location_code,fm_tts_tickets.priority,fm_tts_tickets.cat_id,fm_tts_tickets.group_id,"
- .
"fm_tts_tickets.entry_date,fm_tts_tickets.modified_date,fm_tts_tickets.finnish_date,fm_tts_tickets.finnish_date2,fm_tts_tickets.order_id,fm_tts_tickets.vendor_id,fm_tts_tickets.actual_cost,"
- .
"fm_tts_tickets.actual_cost_year,fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr
as district,fm_tts_views.id as
view,fm_location1.loc1_name,fm_tts_tickets.ecodimb {$result_order_field}";
+ .
"fm_tts_tickets.entry_date,fm_tts_tickets.modified_date,fm_tts_tickets.finnish_date,fm_tts_tickets.finnish_date2,fm_tts_tickets.order_id,fm_tts_tickets.vendor_id,"
+ .
"fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr as
district,fm_tts_views.id as view,fm_location1.loc1_name,fm_tts_tickets.ecodimb
{$result_order_field}";
$custom_cols = $this->custom->find('property',
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
@@ -468,11 +485,11 @@
$return_fields .=
",fm_tts_tickets.{$custom_col['column_name']}";
}
- $sql = "SELECT DISTINCT {$return_fields} FROM
fm_tts_tickets"
+ $sql = "SELECT DISTINCT
{$return_fields},{$actual_cost_field} FROM fm_tts_tickets"
. " {$this->left_join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
. " {$this->left_join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
. " {$this->left_join} fm_district ON
fm_district.id = fm_part_of_town.district_id"
- . " {$order_join}"
+ . " {$order_join}{$date_join}"
. " LEFT OUTER JOIN fm_tts_views ON
(fm_tts_tickets.id = fm_tts_views.id AND
fm_tts_views.account_id='{$this->account}')";
if(isset($custom_filter['joinmethod_datatype']) &&
$custom_filter['joinmethod_datatype'])
@@ -483,13 +500,14 @@
}
}
- $sql .= " {$filtermethod} {$querymethod}";
+ $group_fields = str_ireplace(array('fm_district.descr
as district', 'fm_tts_views.id as view'),
array('fm_district.descr','fm_tts_views.id'), $return_fields);
+ $sql .= " {$filtermethod} {$querymethod} GROUP BY
{$group_fields}";
- $sql_cnt = "SELECT DISTINCT fm_tts_tickets.budget
,fm_tts_tickets.actual_cost, fm_tts_tickets.id FROM fm_tts_tickets"
+ $sql_cnt = "SELECT DISTINCT fm_tts_tickets.budget
,{$actual_cost_field}, fm_tts_tickets.id FROM fm_tts_tickets"
. " {$this->left_join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
. " {$this->left_join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
. " {$this->left_join} fm_district ON
fm_district.id = fm_part_of_town.district_id"
- . " $order_join"
+ . " {$order_join}{$date_join}"
. " LEFT OUTER JOIN fm_tts_views ON
(fm_tts_tickets.id = fm_tts_views.id AND
fm_tts_views.account_id='{$this->account}')";
if(isset($custom_filter['joinmethod_datatype']) &&
$custom_filter['joinmethod_datatype'])
@@ -512,7 +530,7 @@
if(!$cache_info)
{
- $sql2 = "SELECT count(*) as cnt, sum(budget) as
sum_budget, sum(actual_cost) as sum_actual_cost FROM ({$sql_cnt}) as t";
+ $sql2 = "SELECT count(*) as cnt, sum(budget) as
sum_budget, sum(actual_cost) as sum_actual_cost FROM ({$sql_cnt} GROUP BY
fm_tts_tickets.id, fm_tts_tickets.budget) as t";
$this->db->query($sql2,__LINE__,__FILE__);
$this->db->next_record();
unset($sql2);
@@ -537,7 +555,7 @@
}
$filter_closed = "{$where}
fm_tts_tickets.status NOT IN ('" . implode("','", $closed_status) . "')";
- $sql2 = "SELECT (sum(budget) -
sum(actual_cost)) as sum_difference FROM ({$sql_cnt} {$filter_closed}) as t";
+ $sql2 = "SELECT (SUM(budget) -
SUM(actual_cost)) as sum_difference FROM ({$sql_cnt} {$filter_closed} GROUP BY
fm_tts_tickets.id, fm_tts_tickets.budget) as t";
$this->db->query($sql2,__LINE__,__FILE__);
$this->db->next_record();
unset($sql2);
@@ -601,7 +619,6 @@
'order_id'
=> $this->db->f('order_id'),
'vendor_id'
=> $this->db->f('vendor_id'),
'actual_cost'
=> $this->db->f('actual_cost'),
- 'actual_cost_year'
=> $this->db->f('actual_cost_year'),
'estimate'
=> $this->db->f('budget'),
'new_ticket'
=> $this->db->f('view') ? false : true,
'billable_hours'
=> $this->db->f('billable_hours'),
@@ -693,7 +710,6 @@
$ticket['ecodimb'] =
$this->db->f('ecodimb');
$ticket['budget'] =
$this->db->f('budget');
$ticket['actual_cost'] =
$this->db->f('actual_cost');
- $ticket['actual_cost_year'] =
$this->db->f('actual_cost_year');
$ticket['order_cat_id'] =
$this->db->f('order_cat_id');
$ticket['building_part'] =
$this->db->f('building_part',true);
$ticket['order_dim1'] =
$this->db->f('order_dim1');
@@ -1495,7 +1511,6 @@
$value_set['b_account_id'] =
$ticket['b_account_id'];
$value_set['order_descr'] =
$this->db->db_addslashes($ticket['order_descr']);
$value_set['ecodimb'] =
$ticket['ecodimb'];
- $value_set['actual_cost_year'] =
$ticket['actual_cost_year'];
$value_set['branch_id'] =
$ticket['branch_id'];
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12092] property: refine actual cost at tickets,
Sigurd Nes <=