[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6781] property: add branch to ticket order, prepare
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6781] property: add branch to ticket order, prepare for mandatory actual cost for some status values |
|
Date: |
Fri, 14 Jan 2011 17:05:36 +0000 |
Revision: 6781
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6781
Author: sigurdne
Date: 2011-01-14 17:05:34 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
property: add branch to ticket order, prepare for mandatory actual cost for
some status values
Modified Paths:
--------------
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2011-01-14 14:08:09 UTC (rev
6780)
+++ trunk/property/inc/class.sotts.inc.php 2011-01-14 17:05:34 UTC (rev
6781)
@@ -518,7 +518,7 @@
$ticket['order_dim1'] =
$this->db->f('order_dim1');
$ticket['publish_note'] =
$this->db->f('publish_note');
$ticket['billable_hours'] =
$this->db->f('billable_hours');
-
+ $ticket['branch_id'] =
$this->db->f('branch_id');
$user_id=(int)$this->db->f('user_id');
$ticket['user_name'] =
$GLOBALS['phpgw']->accounts->get($user_id)->__toString();
@@ -1084,6 +1084,7 @@
$value_set['order_descr'] =
$this->db->db_addslashes($ticket['order_descr']);
$value_set['ecodimb'] = $ticket['ecodimb'];
$value_set['budget'] = $ticket['budget'];
+ $value_set['branch_id'] = $ticket['branch_id'];
$value_set =
$this->db->validate_update($value_set);
$this->db->query("UPDATE fm_tts_tickets SET $value_set
WHERE id={$id}",__LINE__,__FILE__);
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2011-01-14 14:08:09 UTC (rev
6780)
+++ trunk/property/inc/class.uitts.inc.php 2011-01-14 17:05:34 UTC (rev
6781)
@@ -2818,6 +2818,7 @@
'order_cat_list'
=> $order_catetory,
'building_part_list'
=> array('status_list' => $this->bocommon->select_category_list(array('type'=>
'building_part','selected' =>$ticket['building_part'], 'order' => 'id',
'id_in_name' => 'num' ))),
'order_dim1_list'
=> array('status_list' =>
$this->bocommon->select_category_list(array('type'=> 'order_dim1','selected'
=>$ticket['order_dim1'], 'order' => 'id', 'id_in_name' => 'num' ))),
+ 'branch_list'
=> array('status_list' =>
execMethod('property.boproject.select_branch_list', $values['branch_id'])),
);
//---datatable settings--------------------
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2011-01-14 14:08:09 UTC (rev 6780)
+++ trunk/property/setup/setup.inc.php 2011-01-14 17:05:34 UTC (rev 6781)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.604';
+ $setup_info['property']['version'] = '0.9.17.605';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2011-01-14 14:08:09 UTC (rev
6780)
+++ trunk/property/setup/tables_current.inc.php 2011-01-14 17:05:34 UTC (rev
6781)
@@ -837,6 +837,7 @@
'approved' => array('type' => 'int','precision'
=> '2','nullable' => True),
'in_progress' => array('type' =>
'int','precision' => '2','nullable' => True),
'delivered' => array('type' =>
'int','precision' => '2','nullable' => True),
+ 'actual_cost' => array('type' =>
'int','precision' => '2','nullable' => True),
'sorting' => array('type' => 'int','precision'
=> '4','nullable' => True)
),
'pk' => array('id'),
@@ -884,7 +885,8 @@
'order_cat_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'building_part'=> array('type' =>
'varchar','precision' => 4,'nullable' => True),
'order_dim1'=> array('type' =>
'int','precision' => 4,'nullable' => True),
- 'publish_note'=> array('type' =>
'int','precision' => 2,'nullable' => True)
+ 'publish_note'=> array('type' =>
'int','precision' => 2,'nullable' => True),
+ 'branch_id' => array('type' =>
'int','precision' => '4','nullable' => True)
),
'pk' => array('id'),
'ix' => array(),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2011-01-14 14:08:09 UTC (rev
6780)
+++ trunk/property/setup/tables_update.inc.php 2011-01-14 17:05:34 UTC (rev
6781)
@@ -4838,7 +4838,7 @@
}
}
/**
- * Update property version from 0.9.17.602 to 0.9.17.603
+ * Update property version from 0.9.17.603 to 0.9.17.604
* convert data for datatype CH: from serialized array to comma
separated list
*
*/
@@ -4922,3 +4922,23 @@
}
}
+ /**
+ * Update property version from 0.9.17.604 to 0.9.17.605
+ * Add columns to table fm_tts_tickets and fm_tts_status
+ *
+ */
+
+ $test[] = '0.9.17.604';
+ function property_upgrade0_9_17_604()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_tts_status','actual_cost',array('type'
=> 'int','precision' => 2,'nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_tts_tickets','branch_id',
array('type' => 'int','precision' => '4','nullable' => True));
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.605';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2011-01-14 14:08:09 UTC (rev
6780)
+++ trunk/property/templates/base/tts.xsl 2011-01-14 17:05:34 UTC (rev
6781)
@@ -1219,6 +1219,22 @@
</tr>
<tr>
<td>
+
<xsl:value-of select="php:function('lang', 'branch')" />
+ </td>
+ <td>
+ <select
name="values[branch_id]" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'select branch')" />
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'select branch')" />
+
</option>
+
<xsl:apply-templates select="branch_list/status_list"/>
+
</select>
+ </td>
+ </tr>
+ <tr>
+ <td>
<xsl:value-of select="php:function('lang', 'order_dim1')" />
</td>
<td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6781] property: add branch to ticket order, prepare for mandatory actual cost for some status values,
Sigurd Nes <=