[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16715] Stable: Merge 16713:16714 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16715] Stable: Merge 16713:16714 from trunk |
|
Date: |
Tue, 9 May 2017 10:29:28 -0400 (EDT) |
Revision: 16715
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16715
Author: sigurdne
Date: 2017-05-09 10:29:27 -0400 (Tue, 09 May 2017)
Log Message:
-----------
Stable: Merge 16713:16714 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/property/inc/class.botts.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/js/portico/condition_survey.js
branches/Version-2_0-branch/property/js/portico/custom.edit.js
branches/Version-2_0-branch/property/js/portico/invoice.list_sub.js
branches/Version-2_0-branch/property/js/portico/project.edit.js
branches/Version-2_0-branch/property/js/portico/request.edit.js
branches/Version-2_0-branch/property/js/portico/tenant_claim.edit.js
branches/Version-2_0-branch/property/js/portico/tts.view.js
branches/Version-2_0-branch/property/js/portico/wo_hour.deviation.js
branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch 2017-05-09 14:29:27 UTC (rev 16715)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-05-09
14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-05-09
14:29:27 UTC (rev 16715)
@@ -489,7 +489,7 @@
}
try
{
- window['local_DrawCallback' + num](oTable);
+ window['local_DrawCallback' + num](container);
}
catch (err)
{
Modified: branches/Version-2_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-05-09 14:29:27 UTC (rev 16715)
@@ -1959,7 +1959,8 @@
*/
if(isset($fullmakter[0]))
{
- if($amount > 5000 && $amount <= 100000)
+// if($amount > 5000 && $amount <= 100000)
+ if($amount > 50000 && $amount <= 100000)
{
$supervisor_lid =
strtolower($fullmakter[0]['inntil100k']);
}
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-05-09 14:29:27 UTC (rev 16715)
@@ -2203,6 +2203,12 @@
$need_approval =
isset($this->bo->config->config_data['workorder_approval']) ?
$this->bo->config->config_data['workorder_approval'] : '';
+
+ //temporary
+ $test_user = $this->acl->check('.ticket.order',
16, 'property');
+
+ $need_approval = $need_approval && $test_user ?
true : false;
+
// approval
}
Modified: branches/Version-2_0-branch/property/js/portico/condition_survey.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/condition_survey.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/condition_survey.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -19,9 +19,9 @@
$(api.column(i).footer()).html("<div align=\"right\">" + amount +
"</div>");
};
-this.local_DrawCallback3 = function (oTable)
+this.local_DrawCallback2 = function (container)
{
- var api = oTable2.api();
+ var api = $("#" + container).dataTable().api();
for (i = 0; i < columns2.length; i++)
{
Modified: branches/Version-2_0-branch/property/js/portico/custom.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/custom.edit.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/custom.edit.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -11,9 +11,9 @@
i : 0;
};
-this.local_DrawCallback1 = function (oTable)
+this.local_DrawCallback1 = function (container)
{
- var oTable = $('#datatable-container_0').dataTable();
+ var oTable = $("#" + container).dataTable();
// var api = oTable.api();
// api.columns('.sorting').order('asc');
oTable.fnSort([[2, 'asc']]);
Modified: branches/Version-2_0-branch/property/js/portico/invoice.list_sub.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/invoice.list_sub.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/invoice.list_sub.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -1,6 +1,7 @@
-this.local_DrawCallback1 = function ()
+this.local_DrawCallback0 = function (container)
{
- var api = oTable0.api();
+ var api = $("#" + container).dataTable().api();
+
var data = api.ajax.json();
for (i = 0; i < columns0.length; i++)
Modified: branches/Version-2_0-branch/property/js/portico/project.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -67,9 +67,9 @@
}
};
-this.local_DrawCallback1 = function ()
+this.local_DrawCallback1 = function (container)
{
- var api = oTable1.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
@@ -95,9 +95,9 @@
});
}
-this.local_DrawCallback2 = function ()
+this.local_DrawCallback2 = function (container)
{
- var api = oTable2.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
Modified: branches/Version-2_0-branch/property/js/portico/request.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/request.edit.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/request.edit.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -1,7 +1,7 @@
-this.local_DrawCallback2 = function ()
+this.local_DrawCallback2 = function (container)
{
- var api = oTable2.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
Modified: branches/Version-2_0-branch/property/js/portico/tenant_claim.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/tenant_claim.edit.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/tenant_claim.edit.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -12,16 +12,16 @@
};
-this.local_DrawCallback1 = function (oTable)
+this.local_DrawCallback0 = function (container)
{
- var api = oTable.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
// var columns = ["6"];
// $(api.column(5).footer()).html("<div align=\"right\">Sum</div>");
- for (i = 0; i < columns.length; i++)
+ for (i = 0; i < columns0.length; i++)
{
- if (columns[i]['data'] === 'budget')
+ if (columns0[i]['data'] === 'budget' || columns0[i]['data'] ===
'actual_cost')
{
data = api.column(i, {page: 'current'}).data();
pageTotal = data.length ?
@@ -30,7 +30,7 @@
return intVal(a) + intVal(b);
}) : 0;
- $(api.column(i).footer()).html("<div align=\"right\">"
+ pageTotal + "</div>");
+ $(api.column(i).footer()).html("<div align=\"right\">"
+ $.number(pageTotal, 0, ',', '.') + "</div>");
}
}
Modified: branches/Version-2_0-branch/property/js/portico/tts.view.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/tts.view.js 2017-05-09
14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/tts.view.js 2017-05-09
14:29:27 UTC (rev 16715)
@@ -2,10 +2,9 @@
var vendor_id = 0;
var amount = 0;
-this.local_DrawCallback4 = function ()
+this.local_DrawCallback4 = function (container)
{
- //console.log(oTable4);
- var api = oTable4.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
@@ -31,10 +30,9 @@
});
};
-this.local_DrawCallback5 = function ()
+this.local_DrawCallback5 = function (container)
{
- //console.log(oTable4);
- var api = oTable5.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
Modified: branches/Version-2_0-branch/property/js/portico/wo_hour.deviation.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/wo_hour.deviation.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/wo_hour.deviation.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -7,13 +7,13 @@
i : 0;
};
-this.local_DrawCallback1 = function (oTable)
+this.local_DrawCallback0 = function (container)
{
- var api = oTable.api();
+ var api = $("#" + container).dataTable().api();
- for (i = 0; i < columns.length; i++)
+ for (i = 0; i < columns0.length; i++)
{
- if (columns[i]['data'] === 'amount')
+ if (columns0[i]['data'] === 'amount')
{
data = api.column(i, {page: 'current'}).data();
pageTotal = data.length ?
Modified: branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
2017-05-09 14:24:29 UTC (rev 16714)
+++ branches/Version-2_0-branch/property/js/portico/wo_hour.index.js
2017-05-09 14:29:27 UTC (rev 16715)
@@ -1,6 +1,6 @@
-this.local_DrawCallback2 = function (oTable)
+this.local_DrawCallback0 = function (container)
{
- var api = oTable.api();
+ var api = $("#" + container).dataTable().api();
var data = api.ajax.json();
$('#value_sum_calculation').html($.number(data.table_sum.value_sum_calculation,
2, ',', '.'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16715] Stable: Merge 16713:16714 from trunk,
sigurdne <=