[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17165] Stable: Merge 17163:17164 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17165] Stable: Merge 17163:17164 from trunk |
|
Date: |
Wed, 18 Oct 2017 09:37:10 -0400 (EDT) |
Revision: 17165
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17165
Author: sigurdne
Date: 2017-10-18 09:37:10 -0400 (Wed, 18 Oct 2017)
Log Message:
-----------
Stable: Merge 17163:17164 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
branches/Version-2_0-branch/property/inc/class.soproject.inc.php
branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/js/portico/project.edit.js
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/templates/base/project.xsl
branches/Version-2_0-branch/property/templates/base/workorder.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch 2017-10-18 13:37:10 UTC (rev 17165)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
2017-10-18 13:37:10 UTC (rev 17165)
@@ -539,11 +539,11 @@
if ($direction == 'income')
{
- $filtermethod_direction = "fm_b_account.id
{$this->like} '3%'";
+ $filtermethod_direction = "AND fm_b_account.id
{$this->like} '3%'";
}
- else
+ else if($direction == 'expenses')
{
- $filtermethod_direction = "fm_b_account.id NOT
{$this->like} '3%'";
+ $filtermethod_direction = "AND fm_b_account.id
NOT {$this->like} '3%'";
}
/* 0 => cancelled, 1 => obligation , 2 => paid */
@@ -653,7 +653,7 @@
. " {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id"
. " {$_join_district}"
. " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.id"
- . " {$filtermethod_order}{$filtermethod}
{$querymethod} {$where} {$filtermethod_direction}"
+ . " {$filtermethod_order}{$filtermethod}
{$querymethod} {$filtermethod_direction}"
. " ORDER BY fm_workorder.id ASC";
// _debug_array($sql);
@@ -695,7 +695,7 @@
. " {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id"
. " {$_join_district}"
. " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.id"
- . " {$filtermethod_payment}{$filtermethod}
{$querymethod} {$where} {$filtermethod_direction}"
+ . " {$filtermethod_payment}{$filtermethod}
{$querymethod} {$filtermethod_direction}"
. " ORDER BY fm_workorder.id ASC";
$this->db->query($sql, __LINE__, __FILE__);
@@ -829,7 +829,7 @@
. " FROM fm_tts_tickets"
. " {$this->join} fm_b_account ON
fm_tts_tickets.b_account_id = fm_b_account.id "
. " {$this->join} fm_location1 ON
fm_tts_tickets.loc1 = fm_location1.loc1 "
- . " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.id $filtermethod $filtermethod2
$querymethod {$where} {$filtermethod_direction} GROUP BY
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
+ . " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.id $filtermethod $filtermethod2
$querymethod {$filtermethod_direction} GROUP BY
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
//_debug_array($sql);die();
$this->db->query($sql . $ordermethod, __LINE__,
__FILE__);
@@ -855,7 +855,7 @@
. " FROM fm_tts_tickets"
. " {$this->join} fm_b_account ON
fm_tts_tickets.b_account_id = fm_b_account.id "
. " {$this->join} fm_location1 ON
fm_tts_tickets.loc1 = fm_location1.loc1 "
- . " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.id {$filtermethod}
{$querymethod} {$where} {$filtermethod_direction} GROUP BY
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
+ . " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.id {$filtermethod}
{$querymethod} {$filtermethod_direction} GROUP BY
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
$sql = str_replace('budget', 'actual_cost', $sql);
@@ -927,13 +927,13 @@
if ($details)
{
$sql = "SELECT budget_cost,b_account_id as
b_account_field,district_id,ecodimb FROM fm_budget"
- . " {$this->join} fm_b_account ON
fm_budget.b_account_id =fm_b_account.id WHERE year={$year} AND revision =
'$revision' $filtermethod {$where} {$filtermethod_direction}"
+ . " {$this->join} fm_b_account ON
fm_budget.b_account_id =fm_b_account.id WHERE year={$year} AND revision =
'$revision' $filtermethod {$filtermethod_direction}"
. " GROUP BY
budget_cost,b_account_id,district_id,ecodimb";
}
else
{
$sql = "SELECT sum(budget_cost) as budget_cost
,fm_b_account.category as b_account_field,district_id,ecodimb FROM fm_budget"
- . " $this->join fm_b_account ON
fm_budget.b_account_id =fm_b_account.id WHERE year={$year} AND revision =
'$revision' $filtermethod {$where} {$filtermethod_direction}"
+ . " $this->join fm_b_account ON
fm_budget.b_account_id =fm_b_account.id WHERE year={$year} AND revision =
'$revision' $filtermethod {$filtermethod_direction}"
. " GROUP BY
fm_b_account.category,district_id,ecodimb";
}
//_debug_array($sql);
@@ -986,7 +986,7 @@
. " FROM fm_s_agreement"
. " {$this->join} fm_s_agreement_budget ON
fm_s_agreement.id = fm_s_agreement_budget.agreement_id"
. " $this->join fm_b_account ON
fm_s_agreement_budget.budget_account = fm_b_account.id "
- . " WHERE $filtermethod $querymethod {$where}
{$filtermethod_direction} GROUP BY
fm_b_account.{$b_account_field},fm_s_agreement_budget.ecodimb";
+ . " WHERE $filtermethod $querymethod
{$filtermethod_direction} GROUP BY
fm_b_account.{$b_account_field},fm_s_agreement_budget.ecodimb";
//_debug_array($sql);die();
$this->db->query($sql . $ordermethod, __LINE__,
__FILE__);
@@ -1014,7 +1014,7 @@
. " {$this->join} fm_b_account ON
fm_ecobilagoverf.spbudact_code =fm_b_account.id"
. " {$this->join} fm_s_agreement ON
fm_ecobilagoverf.pmwrkord_code = fm_s_agreement.id"
. " {$this->join} fm_s_agreement_budget ON
fm_s_agreement.id = fm_s_agreement_budget.agreement_id"
- . " WHERE periode >= $start_periode AND periode
<= $end_periode AND {$filtermethod} {$where} {$filtermethod_direction}"
+ . " WHERE periode >= $start_periode AND periode
<= $end_periode AND {$filtermethod} {$filtermethod_direction}"
. " GROUP BY fm_b_account.{$b_account_field},
ecodimb, periode";
//_debug_array($sql);
$this->db->query($sql, __LINE__, __FILE__);
@@ -1073,7 +1073,7 @@
. " {$this->join} fm_b_account ON
fm_ecobilag.spbudact_code =fm_b_account.id"
. " {$this->join} fm_s_agreement ON
fm_ecobilag.pmwrkord_code = fm_s_agreement.id"
. " {$this->join} fm_s_agreement_budget ON
fm_s_agreement.id = fm_s_agreement_budget.agreement_id"
- . " {$filtermethod} {$where}
{$filtermethod_direction}"
+ . " {$filtermethod} {$filtermethod_direction}"
. " GROUP BY fm_b_account.{$b_account_field},
ecodimb, periode";
//_debug_array($sql);
$this->db->query($sql, __LINE__, __FILE__);
Modified: branches/Version-2_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2017-10-18 13:37:10 UTC (rev 17165)
@@ -1082,7 +1082,14 @@
$this->db->next_record();
$this->total_records = (int)$this->db->f('cnt');
- $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $results);
+ if($results < 0)
+ {
+ $this->db->query($sql, __LINE__, __FILE__);
+ }
+ else
+ {
+ $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $results);
+ }
$_orders = array();
@@ -1104,6 +1111,7 @@
'budget' => 0,
'obligation' => 0,
'actual_cost' => 0,
+ 'year' => $year ? $year : ''
);
$_orders[] = $this->db->f('workorder_id');
}
Modified: branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
2017-10-18 13:37:10 UTC (rev 17165)
@@ -433,6 +433,12 @@
'id' => 'income',
'name' => lang('income'),
'selected' => $this->direction ==
'income' ? 1 : 0
+ ),
+ array
+ (
+ 'id' => 'both',
+ 'name' => lang('both'),
+ 'selected' => $this->direction ==
'both' ? 1 : 0
)
);
$combos[] = array
Modified: branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2017-10-18 13:37:10 UTC (rev 17165)
@@ -1776,36 +1776,58 @@
(
array('key' => 'workorder_id', 'label' =>
lang('Workorder'), 'sortable' => true,
'formatter' => 'formatLink',
'value_footer' => lang('Sum')),
+ array('key' => 'year', 'label' => lang('year'),
'sortable' => true),
array('key' => 'title', 'label' =>
lang('title'), 'sortable' => true),
array('key' => 'b_account_id', 'label' =>
lang('Budget account'), 'sortable' => true,
'className' => 'right'),
- array('key' => 'budget', 'label' =>
lang('budget'), 'sortable' => false, 'className' => 'right',
+ array('key' => 'budget', 'label' =>
lang('budget'), 'sortable' => true, 'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0'),
- array('key' => 'cost', 'label' => lang('cost'),
'sortable' => false, 'className' => 'right',
+ array('key' => 'cost', 'label' => lang('cost'),
'sortable' => true, 'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0'),
- array('key' => 'addition_percentage', 'label'
=> '%', 'sortable' => false, 'className' => 'right'),
- array('key' => 'obligation', 'label' =>
lang('sum orders'), 'sortable' => false,
+ array('key' => 'addition_percentage', 'label'
=> '%', 'sortable' => true, 'className' => 'right'),
+ array('key' => 'obligation', 'label' =>
lang('sum orders'), 'sortable' => true,
'className' => 'right', 'formatter' =>
'JqueryPortico.FormatterAmount0'),
- array('key' => 'actual_cost', 'label' =>
lang('actual cost'), 'sortable' => false,
+ array('key' => 'actual_cost', 'label' =>
lang('actual cost'), 'sortable' => true,
'className' => 'right', 'formatter' =>
'JqueryPortico.FormatterAmount0'),
- array('key' => 'diff', 'label' =>
lang('difference'), 'sortable' => false, 'className' => 'right',
+ array('key' => 'diff', 'label' =>
lang('difference'), 'sortable' => true, 'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0'),
- array('key' => 'vendor_name', 'label' =>
lang('Vendor'), 'sortable' => false),
+ array('key' => 'vendor_name', 'label' =>
lang('Vendor'), 'sortable' => true),
array('key' => 'status', 'label' =>
lang('Status'), 'sortable' => true),
array('key' => 'send_order', 'label' =>
lang('send workorder'), 'sortable' => false,
'className' => 'center')
);
+ $order_data = $this->bo->get_orders(array(
+ 'start' => 0,
+ 'project_id' => $id,
+ 'year' => date('Y'),
+ 'order' => 'workorder_id',
+ 'sort' => 'desc',
+ 'results' => -1,
+ 'query' => '',
+ )
+ );
+ foreach ($order_data as & $_order_entry)
+ {
+ $_order_entry['send_order'] = '';
+ if (isset($_order_entry['mail_recipients'][0])
&& $_order_entry['mail_recipients'][0])
+ {
+ $_title = implode(';',
$_order_entry['mail_recipients']);
+ $_order_entry['send_order'] = "<input
type='checkbox' name='values[send_order][]'
value='{$_order_entry['workorder_id']}' title='{$_title}'>";
+ }
+ }
+
$datatable_def[] = array
(
'container' => 'datatable-container_1',
- 'requestUrl' =>
json_encode(self::link(array('menuaction' => 'property.uiproject.get_orders',
- 'project_id' => $id, 'year' =>
date('Y'), 'phpgw_return_as' => 'json'))),
- 'data' => json_encode(array()),
+// 'requestUrl' =>
json_encode(self::link(array('menuaction' => 'property.uiproject.get_orders',
+// 'project_id' => $id, 'year' =>
date('Y'), 'phpgw_return_as' => 'json'))),
+ 'requestUrl' => "''",
+ 'data' => json_encode($order_data),
'ColumnDefs' => $orders_def,
'config' => array(
// array('disableFilter' => true),
- // array('disablePagination' => true)
+ array('disablePagination' => true)
)
);
@@ -2256,20 +2278,10 @@
return $this->jquery_results($result_data);
}
- $year = phpgw::get_var('year', 'int');
- $draw = phpgw::get_var('draw', 'int');
- $order = phpgw::get_var('order');
- $columns = phpgw::get_var('columns');
- $search = phpgw::get_var('search');
-
$values = $this->bo->get_orders(array(
- 'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
'project_id' => $project_id,
- 'year' => $year,
- 'order' =>
$columns[$order[0]['column']]['data'],
- 'sort' => $order[0]['dir'],
- 'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
- 'query' => $search['value'],
+ 'year' =>phpgw::get_var('year', 'int'),
+ 'results' => -1,
)
);
foreach ($values as & $_order_entry)
@@ -2287,7 +2299,7 @@
$result_data = array('results' => $values);
$result_data['total_records'] = $total_records;
- $result_data['draw'] = $draw;
+ $result_data['draw'] = phpgw::get_var('draw', 'int');
return $this->jquery_results($result_data);
}
Modified: branches/Version-2_0-branch/property/js/portico/project.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-10-18 13:37:10 UTC (rev 17165)
@@ -79,7 +79,7 @@
i : 0;
};
- var columns = ["3", "4", "6", "7", "8"];
+ var columns = ["4", "5", "7", "8", "9"];
columns.forEach(function (col)
{
@@ -171,7 +171,7 @@
$("#order_time_span").change(function ()
{
- var oArgs1 = {menuaction: 'property.uiproject.get_orders',
project_id: project_id, year: $(this).val()};
+ var oArgs1 = {menuaction: 'property.uiproject.get_orders',
project_id: project_id, year: $(this).val(), results: -1};
var requestUrl1 = phpGWLink('index.php', oArgs1, true);
JqueryPortico.updateinlineTableHelper(oTable1, requestUrl1);
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-10-18
13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-10-18
13:37:10 UTC (rev 17165)
@@ -2242,4 +2242,5 @@
deadline for start property no Frist for oppstart
deadline for execution property no Frist for ferdigstillelse
outside contract property no Utenfor rammeavtale
-refund property no Refusjon
\ No newline at end of file
+refund property no Refusjon
+both property no Begge
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl
2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl
2017-10-18 13:37:10 UTC (rev 17165)
@@ -521,7 +521,7 @@
<label for="name">
<xsl:value-of
select="php:function('lang', 'move')"/>
</label>
- <input type="text"
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}"
name="values[new_project_id]" value="">
+ <input type="text"
data-validation="number" name="values[new_project_id]" value="">
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'move budget and orders to another
project')"/>
</xsl:attribute>
@@ -540,7 +540,7 @@
</label>
<div class="pure-custom">
<div>
- <input
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}" type="text"
name="values[budget]" value="{value_budget}">
+ <input
data-validation="number" data-validation-allowing="float,negative"
data-validation-decimal-separator="{$decimal_separator}" type="text"
name="values[budget]" value="{value_budget}">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Enter the budget')"/>
</xsl:attribute>
@@ -694,7 +694,7 @@
<label
for="name">
<xsl:value-of select="lang_reserve"/>
</label>
- <input
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}" type="text"
name="values[reserve]" value="{value_reserve}">
+ <input
data-validation="number" data-validation-allowing="float,negative"
data-validation-decimal-separator="{$decimal_separator}" type="text"
name="values[reserve]" value="{value_reserve}">
<xsl:attribute name="title">
<xsl:value-of select="lang_reserve_statustext"/>
</xsl:attribute>
Modified: branches/Version-2_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-10-18 13:36:13 UTC (rev 17164)
+++ branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-10-18 13:37:10 UTC (rev 17165)
@@ -926,7 +926,7 @@
<label for="name">
<xsl:value-of
select="php:function('lang', 'contract sum')"/>
</label>
- <input type="text"
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}"
id="field_contract_sum" name="values[contract_sum]"
value="{value_contract_sum}">
+ <input type="text"
data-validation="number" data-validation-allowing="float,negative"
data-validation-decimal-separator="{$decimal_separator}"
id="field_contract_sum" name="values[contract_sum]"
value="{value_contract_sum}">
<xsl:attribute
name="data-validation">
<xsl:text>budget</xsl:text>
</xsl:attribute>
@@ -954,7 +954,7 @@
<label for="name">
<xsl:value-of
select="lang_budget"/>
</label>
- <input type="text"
data-validation="number"
data-validation-decimal-separator="{$decimal_separator}" id='field_budget'
name="values[budget]" value="{value_budget}">
+ <input type="text"
data-validation="number" data-validation-allowing="float,negative"
data-validation-decimal-separator="{$decimal_separator}" id='field_budget'
name="values[budget]" value="{value_budget}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_budget_statustext"/>
</xsl:attribute>
@@ -972,7 +972,7 @@
<label for="name">
<xsl:value-of
select="lang_addition_rs"/>
</label>
- <input type="text"
data-validation="number" data-validation-allowing="float"
data-validation-decimal-separator="{$decimal_separator}"
name="values[addition_rs]" value="{value_addition_rs}">
+ <input type="text"
data-validation="number" data-validation-allowing="float,negative"
data-validation-decimal-separator="{$decimal_separator}"
name="values[addition_rs]" value="{value_addition_rs}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_addition_rs_statustext"/>
</xsl:attribute>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17165] Stable: Merge 17163:17164 from trunk,
sigurdne <=