[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7077] Merge 7074:7076 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7077] Merge 7074:7076 from trunk |
|
Date: |
Mon, 07 Mar 2011 14:30:58 +0000 |
Revision: 7077
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7077
Author: sigurdne
Date: 2011-03-07 14:30:57 +0000 (Mon, 07 Mar 2011)
Log Message:
-----------
Merge 7074:7076 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.boworkorder.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/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/js/yahoo/project.edit.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.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
+
/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
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -477,6 +477,7 @@
$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]['budget']=number_format($workorder_data[$i]['budget'],
2, ',', '');
$values['workorder_budget'][$i]['calculation']=number_format($workorder_data[$i]['calculation']*$tax,
2, ',', '');
$values['workorder_budget'][$i]['charge_tenant'] =
$workorder_data[$i]['charge_tenant'];
Modified: branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -212,6 +212,12 @@
'name'=> lang('billable hours'),
'sortable' => true
);
+ $columns['contract_sum'] = array
+ (
+ 'id' => 'contract_sum',
+ 'name'=> lang('contract sum'),
+ 'sortable' => true
+ );
return $columns;
}
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -644,7 +644,7 @@
{
$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,"
+ $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}");
while ($this->db->next_record())
@@ -661,6 +661,7 @@
'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'),
);
}
return $budget;
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -197,7 +197,8 @@
$cols_return[] =
'end_date';
$cols.= ",fm_workorder.ecodimb";
$cols_return[] =
'ecodimb';
-
+ $cols.= ",fm_workorder.contract_sum";
+ $cols_return[] =
'contract_sum';
/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'entry_date';
@@ -675,6 +676,7 @@
'cat_id'
=> $this->db->f('category'),
'grants'
=> (int)$this->grants[$this->db->f('user_id')],
'billable_hours'
=> $this->db->f('billable_hours'),
+ 'contract_sum'
=> $this->db->f('contract_sum'),
);
}
@@ -923,13 +925,14 @@
$this->account,
$workorder['ecodimb'],
$workorder['cat_id'],
- $workorder['billable_hours']
+ $workorder['billable_hours'],
+ $workorder['contract_sum']
);
$values = $this->bocommon->validate_db_insert($values);
$this->db->query("INSERT INTO fm_workorder
(id,num,project_id,title,access,entry_date,start_date,end_date,status,"
- .
"descr,budget,combined_cost,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,user_id,ecodimb,category,billable_hours
$cols) "
+ .
"descr,budget,combined_cost,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,user_id,ecodimb,category,billable_hours,contract_sum
$cols) "
. "VALUES ( $values $vals)",__LINE__,__FILE__);
$this->db->query("INSERT INTO fm_orders (id,type)
VALUES ({$id},'workorder')");
@@ -1039,7 +1042,8 @@
'vendor_id' =>
$workorder['vendor_id'],
'ecodimb' =>
$workorder['ecodimb'],
'category' =>
$workorder['cat_id'],
- 'billable_hours'=>
$workorder['billable_hours']
+ 'billable_hours'=>
$workorder['billable_hours'],
+ 'contract_sum' =>
$workorder['contract_sum'],
);
if($workorder['status'] == 'closed')
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -1554,6 +1554,7 @@
'values' =>
json_encode(array( array('key' =>
'workorder_id','label'=>lang('Workorder'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
array('key' =>
'title','label'=>lang('title'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'b_account_id','label'=>lang('Budget
account'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
+
array('key' =>
'contract_sum','label'=>lang('contract
sum'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
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'),
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -1595,6 +1595,8 @@
'lang_calculation'
=> lang('Calculation'),
'value_calculation'
=>
(isset($values['calculation'])?$values['calculation']:''),
'value_sum_estimated_cost'
=> $sum_estimated_cost,
+
+ 'value_contract_sum'
=> $values['contract_sum'],
'actual_cost'
=>
(isset($values['actual_cost'])?$values['actual_cost']:''),
'lang_actual_cost'
=> lang('Actual cost'),
Modified: branches/Version-1_0-branch/property/js/yahoo/project.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2011-03-07 14:30:57 UTC (rev 7077)
@@ -42,6 +42,7 @@
tmp_sum1 = getSumPerPage('budget',2,paginator,datatable);
tmp_sum2 = getSumPerPage('calculation',2,paginator,datatable);
tmp_sum3 = getSumPerPage('actual_cost',2,paginator,datatable);
+ tmp_sum4 = getSumPerPage('contract_sum',2,paginator,datatable);
if(typeof(tableYUI)=='undefined')
{
@@ -58,6 +59,7 @@
td_sum('Sum');
td_empty(2);
+ td_sum(tmp_sum4);
td_sum(tmp_sum1);
td_sum(tmp_sum2);
td_sum(tmp_sum3);
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-03-07
14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-03-07
14:30:57 UTC (rev 7077)
@@ -354,6 +354,7 @@
content property no innhold
contractual obligations property no regnskap
contracts property no Kontrakter
+contract sum property no Kontrakt sum
conversion property no format
coordination property no Koordinering
coordinator property no Koordinator
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2011-03-07
14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2011-03-07
14:30:57 UTC (rev 7077)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.611';
+ $setup_info['property']['version'] = '0.9.17.612';
$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_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -519,7 +519,8 @@
'contact_phone' => array('type' =>
'varchar','precision' => '20','nullable' => True),
'paid_percent' => array('type' =>
'int','precision' => 4,'nullable' => True,'default' => 0),
'event_id' => array('type' => 'int','precision'
=> 4,'nullable' => True),
- 'billable_hours' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True)
+ 'billable_hours' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True),
+ 'contract_sum' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-03-07 14:30:57 UTC (rev 7077)
@@ -5088,6 +5088,28 @@
}
/**
+ * Update property version from 0.9.17.611 to 0.9.17.612
+ * Add contract sum to orders
+ *
+ */
+
+ $test[] = '0.9.17.611';
+ function property_upgrade0_9_17_611()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_workorder','contract_sum',array('type'
=> 'decimal','precision' => '20','scale' => '2','nullable' => True,'default'
=> '0.00'));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.612';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
+
+
+ /**
* Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
*
Modified: branches/Version-1_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/workorder.xsl
2011-03-07 14:29:47 UTC (rev 7076)
+++ branches/Version-1_0-branch/property/templates/base/workorder.xsl
2011-03-07 14:30:57 UTC (rev 7077)
@@ -703,6 +703,16 @@
<tr>
<td valign="top">
+ <xsl:value-of
select="php:function('lang', 'contract sum')" />
+ </td>
+ <td>
+ <input type="text"
name="values[contract_sum]" value="{value_contract_sum}" >
+ </input>
+ <xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
<xsl:value-of select="lang_budget"/>
</td>
<td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7077] Merge 7074:7076 from trunk,
Sigurd Nes <=