diff --git a/config/version.php b/config/version.php
index 4ef034057280..b2f6d0d70078 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
'6.4.15',
+ 'appVersion' => '6.4.16',
'patchVersion' => '2022.08.26',
'lib_roundcube' => '0.3.1',
];
diff --git a/languages/en-US/ServiceContracts.json b/languages/en-US/ServiceContracts.json
index a2e23e34bb81..add2c50ef37f 100644
--- a/languages/en-US/ServiceContracts.json
+++ b/languages/en-US/ServiceContracts.json
@@ -48,13 +48,5 @@
"LBL_STATUS": "Status",
"LBL_CONDITIONS": "Conditions",
"LBL_TIMES": "Times"
- },
- "js": {
- "JS_POLICY_NAME": "Policy name",
- "JS_OPERATIONAL_HOURS": "Operational hours",
- "JS_REACTION_TIME": "Reaction time",
- "JS_IDLE_TIME": "Idle time",
- "JS_RESOLVE_TIME": "Resolve time",
- "JS_BUSINESS_HOURS": "Business hours"
}
}
diff --git a/layouts/basic/modules/ServiceContracts/CustomConditions.tpl b/layouts/basic/modules/ServiceContracts/CustomConditions.tpl
index 0c8712c631b2..f8d49d9198cf 100644
--- a/layouts/basic/modules/ServiceContracts/CustomConditions.tpl
+++ b/layouts/basic/modules/ServiceContracts/CustomConditions.tpl
@@ -1,67 +1,60 @@
{**}
{strip}
-
-
-
- {include file=\App\Layout::getTemplatePath('ConditionBuilder.tpl', $MODULE_NAME) ADVANCE_CRITERIA=[]}
-
-
- {foreach item=ROW from=$SLA_POLICY_ROWS key=$ROW_INDEX}
- {if $ROW['policy_type']===2}
-
-
-
-
-
-
- {assign var=ROW_HOURS value=explode(',', $ROW['business_hours'])}
-
-
-
-
+ {foreach item=ROW from=$SLA_POLICY_ROWS key=$ROW_INDEX}
+ {if $ROW['policy_type']===2}
+
+
+
+
+
+
+ {assign var=ROW_HOURS value=explode(',', $ROW['business_hours'])}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
- {include file=\App\Layout::getTemplatePath('ConditionBuilder.tpl', $MODULE_NAME) ADVANCE_CRITERIA=\App\Json::decode($ROW['conditions'])}
+
+
+
+
-
-
-
+
+
+
+
+
+ {include file=\App\Layout::getTemplatePath('ConditionBuilder.tpl', $MODULE_NAME) ADVANCE_CRITERIA=\App\Json::decode($ROW['conditions'])}
+
- {/if}
- {/foreach}
-
+
+ {/if}
+ {/foreach}
{/strip}
diff --git a/layouts/basic/modules/ServiceContracts/SlaPolicy.tpl b/layouts/basic/modules/ServiceContracts/SlaPolicy.tpl
index 6fd34c0484c9..6ebe0d72d51e 100644
--- a/layouts/basic/modules/ServiceContracts/SlaPolicy.tpl
+++ b/layouts/basic/modules/ServiceContracts/SlaPolicy.tpl
@@ -25,7 +25,9 @@
diff --git a/layouts/basic/modules/ServiceContracts/SlaPolicyCustom.tpl b/layouts/basic/modules/ServiceContracts/SlaPolicyCustom.tpl
new file mode 100644
index 000000000000..c7539f5d42fa
--- /dev/null
+++ b/layouts/basic/modules/ServiceContracts/SlaPolicyCustom.tpl
@@ -0,0 +1,41 @@
+{**}
+{strip}
+
+
+
+{/strip}
diff --git a/layouts/basic/modules/ServiceContracts/SlaPolicyTemplate.tpl b/layouts/basic/modules/ServiceContracts/SlaPolicyTemplate.tpl
new file mode 100644
index 000000000000..bb99edbfcb08
--- /dev/null
+++ b/layouts/basic/modules/ServiceContracts/SlaPolicyTemplate.tpl
@@ -0,0 +1,31 @@
+{**}
+{strip}
+
+
+
+{/strip}
diff --git a/layouts/basic/modules/Settings/SlaPolicy/EditViewBlocks.tpl b/layouts/basic/modules/Settings/SlaPolicy/EditViewBlocks.tpl
index acbc0f029723..dcfcbdda3619 100644
--- a/layouts/basic/modules/Settings/SlaPolicy/EditViewBlocks.tpl
+++ b/layouts/basic/modules/Settings/SlaPolicy/EditViewBlocks.tpl
@@ -21,7 +21,7 @@