[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16692] formatting
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16692] formatting |
|
Date: |
Thu, 4 May 2017 17:12:55 -0400 (EDT) |
Revision: 16692
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16692
Author: sigurdne
Date: 2017-05-04 17:12:55 -0400 (Thu, 04 May 2017)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/js/portico/project.edit.js
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2017-05-04 20:38:14 UTC (rev
16691)
+++ trunk/property/inc/class.uiproject.inc.php 2017-05-04 21:12:55 UTC (rev
16692)
@@ -1822,8 +1822,8 @@
array('key' => 'vendor', 'label' =>
lang('vendor'), 'sortable' => false),
array('key' => 'amount', 'label' =>
lang('amount'), 'sortable' => true, 'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount2'),
- array('key' => 'approved_amount', 'label' =>
lang('approved amount'), 'sortable' => false,
- 'className' => 'right', 'formatter' =>
'JqueryPortico.FormatterAmount2'),
+// array('key' => 'approved_amount', 'label' =>
lang('approved amount'), 'sortable' => false,
+// 'className' => 'right', 'formatter' =>
'JqueryPortico.FormatterAmount2'),
array('key' => 'period', 'label' =>
lang('period'), 'sortable' => true),
array('key' => 'periodization', 'label' =>
lang('periodization'), 'sortable' => false),
array('key' => 'periodization_start', 'label'
=> lang('periodization start'),
@@ -2319,9 +2319,20 @@
foreach ($invoices as $entry)
{
+
+
if(isset($config->config_data['invoicehandler']) &&
$config->config_data['invoicehandler'] == 2)
+ {
+ $voucher_id = $entry['transfer_time'] ?
-1 * $entry['voucher_id'] : $entry['voucher_id'];
+ }
+ else
+ {
+ $voucher_id =
$entry['external_voucher_id'];
+ }
+
+
$values[] = array
(
- 'voucher_id' => $entry['transfer_time']
? -1 * $entry['voucher_id'] : $entry['voucher_id'],
+ 'voucher_id' => $voucher_id,
'voucher_out_id' =>
$entry['voucher_out_id'],
'workorder_id' =>
$entry['workorder_id'],
'status' => $entry['status'],
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2017-05-04 20:38:14 UTC
(rev 16691)
+++ trunk/property/inc/class.uiworkorder.inc.php 2017-05-04 21:12:55 UTC
(rev 16692)
@@ -1834,6 +1834,7 @@
if ($config->config_data['invoicehandler'] == 2)
{
+ $voucher_id = $entry['transfer_time'] ?
-1 * $entry['voucher_id'] : $entry['voucher_id'];
if ($entry['voucher_id'] > 0)
{
$link_data_invoice2['voucher_id'] = $entry['voucher_id'];
@@ -1849,24 +1850,27 @@
else
{
$_disable_link = true;
- if ($entry['voucher_id'] > 0)
- {
-
$link_data_invoice1['voucher_id'] = $entry['voucher_id'];
- $link_data_invoice1['query'] =
$entry['voucher_id'];
- $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
- }
- else
- {
-
$link_data_invoice1['voucher_id'] = abs($entry['voucher_id']);
- $link_data_invoice1['paid'] =
'true';
- $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
- }
+ $voucher_id =
$entry['external_voucher_id'];
+
+// if ($entry['voucher_id'] > 0)
+// {
+//
$link_data_invoice1['voucher_id'] = $entry['voucher_id'];
+// $link_data_invoice1['query'] =
$entry['voucher_id'];
+// $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
+// }
+// else
+// {
+//
$link_data_invoice1['voucher_id'] = abs($entry['voucher_id']);
+// $link_data_invoice1['paid'] =
'true';
+// $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
+// }
}
+
$link_voucher_id = "<a href='" . $url . "'>" .
$voucher_out_id . "</a>";
$content_invoice[] = array
- (
- 'voucher_id' => ($_disable_link) ?
$entry['voucher_id'] : $link_voucher_id,
+ (
+ 'voucher_id' => ($_disable_link) ?
$voucher_id : $link_voucher_id,
'voucher_out_id' =>
$entry['voucher_out_id'],
'status' => $entry['status'],
'period' => $entry['period'],
@@ -1972,13 +1976,13 @@
'sortable' => true,
'className' => 'right',
'value_footer' =>
number_format($amount, 2, $this->decimal_separator, '.')),
+// array(
+// 'key' => 'approved_amount',
+// 'label' => lang('approved amount'),
+// 'sortable' => true,
+// 'className' => 'right',
+// 'value_footer' =>
number_format($approved_amount, 2, $this->decimal_separator, '.')),
array(
- 'key' => 'approved_amount',
- 'label' => lang('approved amount'),
- 'sortable' => true,
- 'className' => 'right',
- 'value_footer' =>
number_format($approved_amount, 2, $this->decimal_separator, '.')),
- array(
'key' => 'period',
'label' => lang('period'),
'sortable' => true),
Modified: trunk/property/js/portico/project.edit.js
===================================================================
--- trunk/property/js/portico/project.edit.js 2017-05-04 20:38:14 UTC (rev
16691)
+++ trunk/property/js/portico/project.edit.js 2017-05-04 21:12:55 UTC (rev
16692)
@@ -107,7 +107,7 @@
i : 0;
};
- var columns = ["4", "5"];
+ var columns = ["4"];
columns.forEach(function (col)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16692] formatting,
sigurdne <=