[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10678] property: budget listing
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10678] property: budget listing |
|
Date: |
Wed, 16 Jan 2013 09:06:12 +0000 |
Revision: 10678
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10678
Author: sigurdne
Date: 2013-01-16 09:06:12 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
property: budget listing
Modified Paths:
--------------
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/js/yahoo/workorder.edit.js
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2013-01-16 08:35:25 UTC (rev
10677)
+++ trunk/property/inc/class.soinvoice.inc.php 2013-01-16 09:06:12 UTC (rev
10678)
@@ -560,10 +560,10 @@
}
$groupmethod = "GROUP BY
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,"
- . " currency,budsjettansvarligid,org_name";
+ . "
currency,budsjettansvarligid,org_name,periode";
$sql = "SELECT DISTINCT
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,sum(belop) as belop,
sum(godkjentbelop) as godkjentbelop,"
- . " currency,budsjettansvarligid,org_name"
+ . "
currency,budsjettansvarligid,org_name,periode"
. " FROM $table"
. " {$this->join} fm_ecoart ON fm_ecoart.id =
$table.artid"
. " {$this->join} fm_workorder ON
fm_workorder.id = $table.pmwrkord_code"
@@ -586,6 +586,7 @@
'approved_amount' =>
$this->db->f('godkjentbelop'),
'vendor'
=> $this->db->f('org_name'),
'currency'
=> $this->db->f('currency'),
+ 'period'
=> $this->db->f('periode'),
'budget_responsible' =>
$this->db->f('budsjettansvarligid')
);
}
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2013-01-16 08:35:25 UTC
(rev 10677)
+++ trunk/property/inc/class.uiworkorder.inc.php 2013-01-16 09:06:12 UTC
(rev 10678)
@@ -1678,6 +1678,7 @@
'voucher_id' =>
$entry['transfer_time'] ? -1*$entry['voucher_id'] : $entry['voucher_id'],
'voucher_out_id' =>
$entry['voucher_out_id'],
'status'
=> $entry['status'],
+ 'period'
=> $entry['period'],
'invoice_id' =>
$entry['invoice_id'],
'budget_account' =>
$entry['budget_account'],
'dima'
=> $entry['dima'],
@@ -1723,6 +1724,7 @@
array('key' =>
'vendor','label'=>lang('vendor'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'approved_amount','label'=>lang('approved
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
+
array('key' =>
'period','label'=>lang('period'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'type','label'=>lang('type'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
Modified: trunk/property/js/yahoo/workorder.edit.js
===================================================================
--- trunk/property/js/yahoo/workorder.edit.js 2013-01-16 08:35:25 UTC (rev
10677)
+++ trunk/property/js/yahoo/workorder.edit.js 2013-01-16 09:06:12 UTC (rev
10678)
@@ -134,7 +134,7 @@
td_empty(3);
td_sum(tmp_sum1);
td_sum(tmp_sum2);
- td_empty(5);
+ td_empty(6);
myfoot = tableYUI.createTFoot();
myfoot.setAttribute("id","myfoot");
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2013-01-16 08:35:25 UTC (rev
10677)
+++ trunk/property/templates/base/workorder.xsl 2013-01-16 09:06:12 UTC (rev
10678)
@@ -705,30 +705,26 @@
</input>
</td>
</tr>
- <xsl:choose>
- <xsl:when
test="value_workorder_id!='' and mode='edit'">
-
<xsl:variable name="lang_add_invoice_statustext">
-
<xsl:value-of select="php:function('lang', 'add invoice')"/>
-
</xsl:variable>
- <tr>
-
<td valign="top">
+ <tr>
+ <td >
+
<xsl:choose>
+
<xsl:when test="value_workorder_id!='' and mode='edit'">
+
<xsl:variable name="lang_add_invoice_statustext">
+
<xsl:value-of select="php:function('lang', 'add invoice')"/>
+
</xsl:variable>
<a href="javascript:showlightbox_manual_invoide({value_workorder_id})"
title="{$lang_add_invoice_statustext}">
<xsl:value-of select="php:function('lang', 'add invoice')"/>
</a>
-
</td>
-
<td>
<div id="manual_invoice_lightbox"
style="background-color:#000000;color:#FFFFFF;display:none">
<div class="hd" style="background-color:#000000;color:#000000;
border:0; text-align:center">
<xsl:value-of select="php:function('lang', 'add
invoice')"/>
</div>
<div class="bd" style="text-align:center;"> </div>
</div>
-
</td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <tr>
- <td colspan="2">
+
</xsl:when>
+
</xsl:choose>
+ </td>
+ <td>
<div
id="paging_2"> </div>
<div
id="datatable-container_2"/>
</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10678] property: budget listing,
Sigurd Nes <=