[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8191] voucher handling
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [8191] voucher handling |
Date: |
Thu, 24 Nov 2011 09:51:31 +0000 |
Revision: 8191
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8191
Author: sigurdne
Date: 2011-11-24 09:51:30 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
voucher handling
Modified Paths:
--------------
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2011-11-24 09:36:13 UTC (rev
8190)
+++ trunk/property/inc/class.soinvoice.inc.php 2011-11-24 09:51:30 UTC (rev
8191)
@@ -1474,11 +1474,12 @@
$sql = "SELECT "
. "spbudact_code as art,"
. "sum(belop) as belop,"
- . "dimb as kostnadssted"
+ . "dimb as kostnadssted,"
+ . "currency"
. ' FROM fm_workorder'
. " {$this->join} fm_project ON
(fm_workorder.project_id = fm_project.id)"
. " {$this->join} fm_ecobilag ON (fm_workorder.id =
fm_ecobilag.pmwrkord_code)"
- . " GROUP BY kostnadssted, art ORDER BY kostnadssted,
art ASC";
+ . " GROUP BY kostnadssted, art, currency ORDER BY
kostnadssted, art, currency ASC";
$this->db->query($sql,__LINE__,__FILE__);
$values = array();
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2011-11-24 09:36:13 UTC (rev
8190)
+++ trunk/property/inc/class.uiproject.inc.php 2011-11-24 09:51:30 UTC (rev
8191)
@@ -1642,6 +1642,7 @@
array('key' =>
'invoice_id','label'=>lang('invoice
number'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'vendor','label'=>lang('vendor'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budsjettsigndato','label'=>lang('budsjettsigndato'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'transfer_time','label'=>lang('transfer
time'),'sortable'=>false,'resizeable'=>true),
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2011-11-24 09:36:13 UTC
(rev 8190)
+++ trunk/property/inc/class.uiworkorder.inc.php 2011-11-24 09:51:30 UTC
(rev 8191)
@@ -1172,6 +1172,7 @@
}
}
+
if($id)
{
$record_history =
$this->bo->read_record_history($id);
@@ -1478,7 +1479,7 @@
'transfer_time' =>
$entry['transfer_time'] ?
$GLOBALS['phpgw']->common->show_date(strtotime($entry['transfer_time']),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
: '',
);
}
-
+//_debug_array($content_invoice);
$datavalues[2] = array
(
'name'
=> "2",
@@ -1497,6 +1498,7 @@
array('key' =>
'invoice_id','label'=>lang('invoice
number'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'vendor','label'=>lang('vendor'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budsjettsigndato','label'=>lang('budsjettsigndato'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'transfer_time','label'=>lang('transfer
time'),'sortable'=>false,'resizeable'=>true),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8191] voucher handling,
Sigurd Nes <=