|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [7358] property: optional branch in tickets, show vendor |
| Date: | Tue, 07 Jun 2011 13:14:04 +0000 |
Revision: 7358
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7358
Author: sigurdne
Date: 2011-06-07 13:14:03 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
property: optional branch in tickets, show vendor
Modified Paths:
--------------
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/hook_settings.inc.php
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2011-06-07 13:00:37 UTC (rev
7357)
+++ trunk/property/inc/class.uitts.inc.php 2011-06-07 13:14:03 UTC (rev
7358)
@@ -2541,11 +2541,18 @@
// -------- start order section
- if($access_order)
+ if($order_read || $access_order)
{
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
'vendor_id' =>
$ticket['vendor_id'],
- 'vendor_name' =>
$ticket['vendor_name']));
+ 'vendor_name' =>
$ticket['vendor_name'],
+ 'type' =>
$order_read && !$access_order ? 'view' : 'form'
+ ));
+
+ }
+
+ if($access_order)
+ {
$b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array
(
@@ -3092,7 +3099,7 @@
'order_cat_list'
=> $order_catetory,
'building_part_list'
=> array('options' => $this->bocommon->select_category_list(array('type'=>
'building_part','selected' =>$ticket['building_part'], 'order' => 'id',
'id_in_name' => 'num' ))),
'order_dim1_list'
=> array('options' =>
$this->bocommon->select_category_list(array('type'=> 'order_dim1','selected'
=>$ticket['order_dim1'], 'order' => 'id', 'id_in_name' => 'num' ))),
- 'branch_list'
=> array('options' =>
execMethod('property.boproject.select_branch_list', $values['branch_id'])),
+ 'branch_list'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list']==1
? array('options' => execMethod('property.boproject.select_branch_list',
$values['branch_id'])) :'',
);
//---datatable settings--------------------
Modified: trunk/property/inc/hook_settings.inc.php
===================================================================
--- trunk/property/inc/hook_settings.inc.php 2011-06-07 13:00:37 UTC (rev
7357)
+++ trunk/property/inc/hook_settings.inc.php 2011-06-07 13:14:03 UTC (rev
7358)
@@ -278,6 +278,8 @@
}
}
+
+ create_select_box('branch TTS','tts_branch_list',$yes_and_no,'enable
branch in TTS-orders');
create_select_box('Default vendor
type','default_vendor_category',$_categories_vendor,'which agreement');
create_input_box('With of textarea','textareacols','With of textarea in
forms');
create_input_box('Height of textarea','textarearows','Height of
textarea in forms');
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2011-06-07 13:00:37 UTC (rev
7357)
+++ trunk/property/templates/base/tts.xsl 2011-06-07 13:14:03 UTC (rev
7358)
@@ -1207,24 +1207,28 @@
</select>
</td>
</tr>
+ <xsl:choose>
+ <xsl:when
test="branch_list!=''">
+ <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/options"/>
+
</select>
+
</td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
<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/options"/>
-
</select>
- </td>
- </tr>
- <tr>
- <td>
<xsl:value-of select="php:function('lang', 'order_dim1')" />
</td>
<td>
@@ -1353,6 +1357,21 @@
</xsl:when>
</xsl:choose>
</xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="value_order_id!=''">
+ <tr class="th">
+ <td class="th_text">
+ <xsl:value-of
select="php:function('lang', 'order id')" />
+ </td>
+ <td>
+ <xsl:value-of
select="value_order_id"/>
+ </td>
+ </tr>
+ <xsl:call-template
name="vendor_view"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:otherwise>
</xsl:choose>
</table>
</div>
| [Prev in Thread] | Current Thread | [Next in Thread] |