[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8962] property: claim
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [8962] property: claim |
Date: |
Mon, 05 Mar 2012 19:21:01 +0000 |
Revision: 8962
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8962
Author: sigurdne
Date: 2012-03-05 19:21:00 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
property: claim
Modified Paths:
--------------
trunk/property/inc/class.uitenant_claim.inc.php
Modified: trunk/property/inc/class.uitenant_claim.inc.php
===================================================================
--- trunk/property/inc/class.uitenant_claim.inc.php 2012-03-02 11:17:19 UTC
(rev 8961)
+++ trunk/property/inc/class.uitenant_claim.inc.php 2012-03-05 19:21:00 UTC
(rev 8962)
@@ -669,7 +669,7 @@
//_debug_array($values);
- $project_values =
$this->boproject->read_single($values['project_id']);
+ $project_values =
$this->boproject->read_single($values['project_id'], array(), true);
$soinvoice = CreateObject('property.soinvoice');
@@ -683,7 +683,9 @@
else
{
$vouchers =
$soinvoice->read_invoice(array('workorder_id' => $workorder['workorder_id'],
'user_lid' => 'all'));
+
$workorder['voucher_id'] =
isset($vouchers[0]['voucher_id']) ? $vouchers[0]['voucher_id'] : '';
+ $workorder['actual_cost'] =
isset($vouchers[0]['approved_amount']) ? $vouchers[0]['approved_amount'] : '';
}
}
@@ -823,10 +825,10 @@
'values' =>
json_encode(array( array('key' => 'workorder_id', 'label'=>'Workorder',
'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
array('key' => 'budget',
'label'=>'Budget', 'sortable'=>true,'resizeable'=>true),
array('key' => 'calculation',
'label'=>'Calculation', 'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'actual_cost','label'=>lang('actual cost'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'vendor_name','label'=>'Vendor','sortable'=>true,'resizeable'=>true),
array('key' =>
'charge_tenant','label'=>'Charge tenant','sortable'=>true,'resizeable'=>true),
array('key' =>
'status','label'=>'Status','sortable'=>true,'resizeable'=>true),
-
array('key' =>
'actual_cost','label'=>lang('actual cost'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'voucher_id','label'=>lang('voucher'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'selected','label'=>'select', 'sortable'=>false,'resizeable'=>false)))
);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8962] property: claim,
Sigurd Nes <=