[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9274] Merge 9270:9273 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9274] Merge 9270:9273 from trunk |
|
Date: |
Fri, 04 May 2012 08:33:52 +0000 |
Revision: 9274
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9274
Author: sigurdne
Date: 2012-05-04 08:33:51 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Merge 9270:9273 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/js/yahoo/project.edit.js
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/workorder.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273
Modified: branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-05-04 08:33:51 UTC (rev 9274)
@@ -266,8 +266,8 @@
$ticket = array
(
- 'origin' => $location_id,
- 'origin_id' =>
$check_list_id,
+ 'origin_id' => $location_id,
+ 'origin_item_id' => $check_list_id,
'location_code' => $location_code,
'cat_id' =>
$message_cat_id,
'priority' => $priority,
//valgfri (1-3)
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2012-05-04 08:33:51 UTC (rev 9274)
@@ -511,21 +511,22 @@
for ($i=0;$i<count($workorder_data);$i++)
{
- $sum_workorder_budget=
$sum_workorder_budget+$workorder_data[$i]['budget'];
- $sum_deviation=
$sum_deviation+$workorder_data[$i]['deviation'];
- $sum_workorder_calculation=
$sum_workorder_calculation+$workorder_data[$i]['calculation'];
- $sum_workorder_actual_cost=
$sum_workorder_actual_cost+$workorder_data[$i]['act_mtrl_cost']+$workorder_data[$i]['act_vendor_cost'];
+ $sum_workorder_budget+=
$workorder_data[$i]['budget'];
+ $sum_deviation+=
$workorder_data[$i]['deviation'];
+ $sum_workorder_calculation+=
$workorder_data[$i]['calculation'];
+ $sum_workorder_actual_cost+=
$workorder_data[$i]['actual_cost'];
$values['workorder_budget'][$i]['title']=$workorder_data[$i]['title'];
$values['workorder_budget'][$i]['workorder_id']=$workorder_data[$i]['workorder_id'];
-
$values['workorder_budget'][$i]['contract_sum']=number_format($workorder_data[$i]['contract_sum'],
2, ',', '');
+
$values['workorder_budget'][$i]['contract_sum']=(float)number_format($workorder_data[$i]['contract_sum']
* (1+(((int)$workorder_data[$i]['addition_percentage'])/100)), 2, ',', '');
$values['workorder_budget'][$i]['budget']=
$workorder_data[$i]['budget'];
-
$values['workorder_budget'][$i]['calculation']=number_format($workorder_data[$i]['calculation']*$tax,
2, ',', '');
+
$values['workorder_budget'][$i]['calculation']=(float)number_format($workorder_data[$i]['calculation']*$tax,
2, ',', '');
$values['workorder_budget'][$i]['charge_tenant'] =
$workorder_data[$i]['charge_tenant'];
$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]['actual_cost']
= (float)number_format($workorder_data[$i]['actual_cost'] ?
$workorder_data[$i]['actual_cost'] : 0, 2, ',', '');
$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'];
+
$values['workorder_budget'][$i]['addition_percentage'] =
$workorder_data[$i]['addition_percentage'];
if(isset($workorder_data[$i]['vendor_id']) &&
$workorder_data[$i]['vendor_id'])
{
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-05-04 08:33:51 UTC (rev 9274)
@@ -253,8 +253,6 @@
$uicols['classname'][] = 'rightClasss';
$uicols['sortable'][] = '';
-// $cols .= ',(sum(fm_workorder.act_mtrl_cost) +
sum(fm_workorder.act_vendor_cost)) as actual_cost';
-// $cols_return[] = 'actual_cost';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'actual_cost';
$uicols['descr'][] =
lang('Actual cost');
@@ -386,9 +384,6 @@
case 'project_id':
$ordermethod = "ORDER BY
fm_project.id {$sort}";
break;
- case 'actual_cost':
- $order_field =
',fm_workorder.act_mtrl_cost + fm_workorder.act_vendor_cost as actual_cost';
- break;
case 'combined_cost':
$order_field =
',sum(fm_workorder.combined_cost) as combined_cost';
break;
@@ -668,10 +663,11 @@
$project['actual_cost'] = 0;
$project['billable_hours'] = 0;
- $sql_workder = 'SELECT contract_sum,
calculation, budget,'
- . ' (fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost) as actual_cost,'
+ $sql_workder = 'SELECT contract_sum,
addition, calculation, budget,'
+ . '
fm_orders_actual_cost_view.actual_cost,'
. ' billable_hours,closed'
. " FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
+ . " {$this->left_join}
fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id"
. " WHERE project_id =
'{$project['project_id']}'";
$this->db->query($sql_workder);
@@ -685,7 +681,7 @@
}
else
if($this->db->f('contract_sum') > 0)
{
- $_sum =
$this->db->f('contract_sum');
+ $_sum =
$this->db->f('contract_sum') * ( 1 + ((int)$this->db->f('addition')/100));
}
else
if($this->db->f('calculation') > 0)
{
@@ -850,9 +846,13 @@
{
$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}");
+ $this->db->query("SELECT fm_workorder.title,
fm_orders_actual_cost_view.actual_cost, fm_workorder.budget, fm_workorder.id as
workorder_id,fm_workorder.contract_sum,"
+ . " fm_workorder.vendor_id,
fm_workorder.calculation,fm_workorder.rig_addition,fm_workorder.addition,fm_workorder.deviation,fm_workorder.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"
+ . " {$this->left_join}
fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id"
+ . " WHERE project_id={$project_id}");
+
while ($this->db->next_record())
{
$budget[] = array(
@@ -861,13 +861,13 @@
'budget' =>
(int)$this->db->f('budget'),
'deviation' =>
$this->db->f('deviation'),
'calculation' =>
$this->db->f('calculation'),
+ 'actual_cost' =>
$this->db->f('actual_cost'),
'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'),
'charge_tenant' =>
$this->db->f('charge_tenant'),
'status' =>
$this->db->f('status'),
'b_account_id' =>
$this->db->f('b_account_id'),
- 'contract_sum' =>
(int)$this->db->f('contract_sum')
+ 'contract_sum' =>
(int)$this->db->f('contract_sum'),
+ 'addition_percentage' =>
(int)$this->db->f('addition')
);
}
return $budget;
@@ -1552,7 +1552,7 @@
$config->read();
$tax = 1+(($config->config_data['fm_tax'])/100);
- $sql = "SELECT fm_workorder.id, EXTRACT(YEAR from
to_timestamp(start_date) ) as year, sum(calculation) as calculation,
sum(budget) as budget, sum(contract_sum) as contract_sum"
+ $sql = "SELECT fm_workorder.id, EXTRACT(YEAR from
to_timestamp(start_date) ) as year, sum(calculation) as calculation,
sum(budget) as budget, sum(contract_sum) as contract_sum, fm_workorder.addition"
. " 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 OR fm_workorder_status.closed != 1)"
@@ -1567,7 +1567,7 @@
if($this->db->f('contract_sum') > 0)
{
- $_amount = $this->db->f('contract_sum');
+ $_amount = $this->db->f('contract_sum')
* ( 1 + ((int)$this->db->f('addition')/100));
}
else if($this->db->f('calculation') > 0)
{
@@ -1828,18 +1828,26 @@
break;
case 'workorder':
+
+ $table = 'fm_workorder';
+ $status_table = 'fm_workorder_status';
+ $title_field = 'fm_workorder.title';
+
+ $join_method = "{$this->join}
{$status_table} ON {$table}.status = {$status_table}.id";
if($paid)
{
- $filter .= " AND (act_mtrl_cost
> 0 OR act_vendor_cost > 0)";
+ $join_method .= "
{$this->join} fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id";
}
+ else
+ {
+ $join_method .= "
{$this->left_join} fm_orders_actual_cost_view ON fm_workorder.id =
fm_orders_actual_cost_view.order_id";
+ }
- $table = 'fm_workorder';
- $status_table = 'fm_workorder_status';
- $title_field = 'fm_workorder.title';
- $actual_cost = ',(act_mtrl_cost +
act_vendor_cost) as actual_cost';
+ $actual_cost =
',fm_orders_actual_cost_view.actual_cost';
$this->_update_status_workorder($execute, $status_new, $ids);
$sql = "SELECT {$table}.id,
$status_table.descr as status ,{$title_field},start_date {$actual_cost} FROM
{$table}"
- . " {$this->join} {$status_table} ON
{$table}.status = {$status_table}.id WHERE ({$table}.start_date >
{$start_date} AND {$table}.start_date < {$end_date} {$filter}) OR start_date is
NULL"
+ . " {$join_method}"
+ . " WHERE ({$table}.start_date >
{$start_date} AND {$table}.start_date < {$end_date} {$filter}) OR start_date is
NULL"
. " ORDER BY {$table}.id DESC";
break;
default:
@@ -1857,7 +1865,7 @@
'id' =>
$this->db->f('id'),
'title' =>
htmlspecialchars_decode($this->db->f('title',true)),
'status' =>
$this->db->f('status',true),
- 'actual_cost' =>
$this->db->f('actual_cost'),
+ 'actual_cost' =>
(float)$this->db->f('actual_cost'),
'start_date' =>
$GLOBALS['phpgw']->common->show_date($this->db->f('start_date'),$dateformat),
'num_open' =>
(int)$this->db->f('num_open'),
);
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-05-04 08:33:51 UTC (rev 9274)
@@ -274,6 +274,9 @@
$joinmethod .= " {$this->join}
fm_workorder_status ON (fm_workorder.status = fm_workorder_status.id))";
$paranthesis .='(';
+ $joinmethod .= " {$this->left_join}
fm_orders_actual_cost_view ON (fm_workorder.id =
fm_orders_actual_cost_view.order_id))";
+ $paranthesis .='(';
+
$cols .= ',fm_vendor.org_name';
$cols_return[] = 'org_name';
$uicols['input_type'][] = 'hidden';
@@ -300,7 +303,8 @@
$uicols['classname'][] = 'rightClasss';
$uicols['sortable'][] = true;
- $cols .= ',fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost as actual_cost';
+// $cols .= ',fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost as actual_cost';
+// $cols .=
',fm_orders_actual_cost_view.actual_cost';
$cols_return[] = 'actual_cost';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'actual_cost';
@@ -311,7 +315,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
- $uicols['sortable'][] = true;
+ $uicols['sortable'][] = false;
$joinmethod .= " {$this->left_join} fm_vendor
ON (fm_workorder.vendor_id = fm_vendor.id))";
$paranthesis .='(';
@@ -414,7 +418,7 @@
$ordermethod = " ORDER BY
fm_workorder.id {$sort}";
break;
case 'actual_cost':
- $order_field =
',fm_workorder.act_mtrl_cost + fm_workorder.act_vendor_cost as actual_cost';
+ $order_field =
',fm_orders_actual_cost_view.actual_cost';
break;
case 'address':
if(isset($GLOBALS['phpgw']->config->config_data['location_at_workorder']) &&
$GLOBALS['phpgw']->config->config_data['location_at_workorder'])
@@ -504,7 +508,7 @@
{
$filtermethod .= " $where
fm_wo_hours_category.id=$wo_hour_cat_id ";
$where= 'AND';
- $group_method = " group by
fm_project.id,{$location_table}.location_code,fm_workorder.id,workorder_id,title,fm_workorder.status,fm_workorder.entry_date,user_lid,fm_workorder.vendor_id,project_owner,{$location_table}.address,fm_vendor.org_name,fm_workorder.combined_cost,fm_workorder.act_mtrl_cost,fm_workorder.act_vendor_cost";
+ $group_method = " group by
fm_project.id,{$location_table}.location_code,fm_workorder.id,workorder_id,title,fm_workorder.status,fm_workorder.entry_date,user_lid,fm_workorder.vendor_id,project_owner,{$location_table}.address,fm_vendor.org_name,fm_workorder.combined_cost,fm_orders_actual_cost_view.actual_cost,fm_workorder.act_vendor_cost";
}
if ($b_group)
@@ -752,8 +756,8 @@
'b_account_id'
=> (int)$this->db->f('account_id'),
'addition_percentage' =>
(int)$this->db->f('addition'),
'addition_rs'
=> (int)$this->db->f('rig_addition'),
- 'act_mtrl_cost'
=> $this->db->f('act_mtrl_cost'),
- 'act_vendor_cost'
=> $this->db->f('act_vendor_cost'),
+ // 'act_mtrl_cost'
=> $this->db->f('act_mtrl_cost'),
+ // 'act_vendor_cost'
=> $this->db->f('act_vendor_cost'),
'user_id'
=> $this->db->f('user_id'),
'vendor_id'
=> $this->db->f('vendor_id'),
// 'coordinator'
=> $this->db->f('coordinator'),
@@ -1119,7 +1123,8 @@
if ( abs((int)$workorder['contract_sum']) > 0)
{
- $combined_cost =
(int)$workorder['contract_sum'];
+ $addition = 1 +
((int)$workorder['addition_percentage']/100);
+ $combined_cost =
(int)$workorder['contract_sum'] * $addition;
}
else if ($this->db->f('calculation') > 0)
{
@@ -1131,7 +1136,7 @@
}
else
{
- $combined_cost = $workorder['budget'];
+ $combined_cost = (int)$workorder['budget'];
}
$this->db->query("SELECT bilagsnr FROM fm_ecobilag
WHERE pmwrkord_code ='{$workorder['id']}'",__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-05-04 08:33:51 UTC (rev 9274)
@@ -1661,6 +1661,7 @@
array('key' =>
'delete_year','label'=>lang('Delete'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))
);
+//_debug_array($values['workorder_budget']);die();
$datavalues[1] = array
(
'name'
=> "1",
@@ -1679,7 +1680,8 @@
array('key' =>
'b_account_id','label'=>lang('Budget
account'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'budget','label'=>lang('Budget'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
array('key' =>
'calculation','label'=>lang('Calculation'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
-
array('key' =>
'contract_sum','label'=>lang('contract
sum'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
+
array('key' =>
'contract_sum','label'=>lang('contract
sum'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
+
array('key' => 'addition_percentage','label'=>
'%','sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'actual_cost','label'=>lang('actual
cost'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
// array('key' =>
'charge_tenant','label'=>lang('charge
tenant'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'vendor_name','label'=>lang('Vendor'),'sortable'=>true,'resizeable'=>true),
Modified: branches/Version-1_0-branch/property/js/yahoo/project.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2012-05-04 08:33:51 UTC (rev 9274)
@@ -147,6 +147,7 @@
td_sum(tmp_sum1);
td_sum(tmp_sum2);
td_sum(tmp_sum3);
+ td_empty(1);
td_sum(tmp_sum4);
td_empty(5);
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2012-05-04
08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2012-05-04
08:33:51 UTC (rev 9274)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.643';
+ $setup_info['property']['version'] = '0.9.17.644';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-04 08:33:51 UTC (rev 9274)
@@ -6326,3 +6326,27 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.643 to 0.9.17.644
+ * Add view on fm_ecobilag
+ */
+ $test[] = '0.9.17.643';
+ function property_upgrade0_9_17_643()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+ $GLOBALS['phpgw_setup']->oProc->query("UPDATE fm_workorder SET
combined_cost = 0 WHERE combined_cost IS NULL");
+
+ $sql = 'CREATE OR REPLACE VIEW fm_orders_actual_cost_view AS'
+ . ' SELECT fm_orders.id as order_id, sum(godkjentbelop)
AS actual_cost FROM fm_ecobilagoverf join fm_orders ON
fm_ecobilagoverf.pmwrkord_code = fm_orders.id GROUP BY fm_orders.id';
+
+ $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.644';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
Modified: branches/Version-1_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/workorder.xsl
2012-05-04 08:31:01 UTC (rev 9273)
+++ branches/Version-1_0-branch/property/templates/base/workorder.xsl
2012-05-04 08:33:51 UTC (rev 9274)
@@ -535,26 +535,31 @@
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="lang_budget"/>
+
<xsl:value-of select="lang_addition_percentage"/>
</td>
<td>
- <input
type="text" name="values[budget]" value="{value_budget}"
onMouseout="window.status='';return true;"><xsl:attribute
name="title"><xsl:value-of
select="lang_budget_statustext"/></xsl:attribute></input><xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
+ <input
type="text" name="values[addition_percentage]"
value="{value_addition_percentage}" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_addition_percentage_statustext"/>
+
</xsl:attribute>
+ </input>
+
<xsl:text> </xsl:text> [ % ]
</td>
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="lang_addition_rs"/>
+
<xsl:value-of select="lang_budget"/>
</td>
<td>
- <input
type="text" name="values[addition_rs]" value="{value_addition_rs}"
onMouseout="window.status='';return true;"><xsl:attribute
name="title"><xsl:value-of
select="lang_addition_rs_statustext"/></xsl:attribute></input><xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
+ <input
type="text" name="values[budget]" value="{value_budget}"
onMouseout="window.status='';return true;"><xsl:attribute
name="title"><xsl:value-of
select="lang_budget_statustext"/></xsl:attribute></input><xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
</td>
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="lang_addition_percentage"/>
+
<xsl:value-of select="lang_addition_rs"/>
</td>
<td>
- <input
type="text" name="values[addition_percentage]"
value="{value_addition_percentage}" onMouseout="window.status='';return
true;"><xsl:attribute name="title"><xsl:value-of
select="lang_addition_percentage_statustext"/></xsl:attribute></input><xsl:text>
</xsl:text> [ % ]
+ <input
type="text" name="values[addition_rs]" value="{value_addition_rs}"
onMouseout="window.status='';return true;"><xsl:attribute
name="title"><xsl:value-of
select="lang_addition_rs_statustext"/></xsl:attribute></input><xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
</td>
</tr>
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9274] Merge 9270:9273 from trunk,
Sigurd Nes <=