diff --git a/doc/lms.mysql b/doc/lms.mysql
index 22a3790e87..091a84364f 100644
--- a/doc/lms.mysql
+++ b/doc/lms.mysql
@@ -1124,6 +1124,8 @@ CREATE TABLE promotionschemas (
     disabled tinyint(1) DEFAULT '0' NOT NULL,
     deleted tinyint(1)  DEFAULT 0 NOT NULL,
     length tinyint(1)   DEFAULT NULL,
+    datefrom int(11)    DEFAULT 0 NOT NULL,
+    dateto   int(11)    DEFAULT 0 NOT NULL,
     PRIMARY KEY (id),
     UNIQUE KEY promotionid (promotionid, name),
     FOREIGN KEY (promotionid) REFERENCES promotions (id) ON DELETE CASCADE ON UPDATE CASCADE
@@ -4145,4 +4147,4 @@ INSERT INTO netdevicemodels (name, alternative_name, netdeviceproducerid) VALUES
 ('XR7', 'XR7 MINI PCI PCBA', 2),
 ('XR9', 'MINI PCI 600MW 900MHZ', 2);
 
-INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2021100500');
+INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2021101900');
diff --git a/doc/lms.pgsql b/doc/lms.pgsql
index 4cc76c60a7..ef7869cb73 100644
--- a/doc/lms.pgsql
+++ b/doc/lms.pgsql
@@ -980,6 +980,8 @@ CREATE TABLE promotionschemas (
     disabled smallint   DEFAULT 0 NOT NULL,
     deleted smallint    DEFAULT 0 NOT NULL,
     length smallint     DEFAULT NULL,
+    datefrom integer	DEFAULT 0 NOT NULL,
+    dateto integer		DEFAULT 0 NOT NULL,
     PRIMARY KEY (id),
     CONSTRAINT promotionschemas_promotionid_key UNIQUE (promotionid, name)
 );
@@ -4162,6 +4164,6 @@ INSERT INTO netdevicemodels (name, alternative_name, netdeviceproducerid) VALUES
 ('XR7', 'XR7 MINI PCI PCBA', 2),
 ('XR9', 'MINI PCI 600MW 900MHZ', 2);
 
-INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2021100500');
+INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2021101900');
 
 COMMIT;
diff --git a/lib/LMSDB_common.class.php b/lib/LMSDB_common.class.php
index a1b1581784..18c1e390dd 100644
--- a/lib/LMSDB_common.class.php
+++ b/lib/LMSDB_common.class.php
@@ -24,7 +24,7 @@
  *  $Id$
  */
 
-define('DBVERSION', '2021100500'); // here should be always the newest version of database!
+define('DBVERSION', '2021101900'); // here should be always the newest version of database!
 
 /**
  *
diff --git a/lib/locale/pl_PL/strings.php b/lib/locale/pl_PL/strings.php
index 4ce108650c..2ffb778b02 100644
--- a/lib/locale/pl_PL/strings.php
+++ b/lib/locale/pl_PL/strings.php
@@ -3301,6 +3301,7 @@
 $_LANG['New Promotion'] = 'Nowa promocja';
 $_LANG['New Schema'] = 'Nowy schemat';
 $_LANG['Periods:'] = 'Okresy:';
+$_LANG['Periods'] = 'Okresy';
 $_LANG['Promotion:'] = 'Promocja:';
 $_LANG['Promotions'] = 'Promocje';
 $_LANG['Promotions:'] = 'Promocje:';
diff --git a/lib/upgradedb/mysql.2021101900.php b/lib/upgradedb/mysql.2021101900.php
new file mode 100644
index 0000000000..2335a2a8e9
--- /dev/null
+++ b/lib/upgradedb/mysql.2021101900.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * LMS version 1.11-git
+ *
+ *  (C) Copyright 2001-2021 LMS Developers
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License Version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ *  USA.
+ *
+ */
+
+$this->BeginTrans();
+
+$this->Execute("ALTER TABLE promotionschemas ADD COLUMN datefrom int(11) DEFAULT 0 NOT NULL");
+$this->Execute("ALTER TABLE promotionschemas ADD COLUMN dateto int(11) DEFAULT 0 NOT NULL");
+
+$this->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2021101900', 'dbversion'));
+
+$this->CommitTrans();
diff --git a/lib/upgradedb/postgres.2021101900.php b/lib/upgradedb/postgres.2021101900.php
new file mode 100644
index 0000000000..eda7a6b0b2
--- /dev/null
+++ b/lib/upgradedb/postgres.2021101900.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * LMS version 1.11-git
+ *
+ *  (C) Copyright 2001-2021 LMS Developers
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License Version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ *  USA.
+ *
+ */
+
+$this->BeginTrans();
+
+$this->Execute("
+    ALTER TABLE promotionschemas ADD COLUMN datefrom integer DEFAULT 0 NOT NULL;
+    ALTER TABLE promotionschemas ADD COLUMN dateto integer DEFAULT 0 NOT NULL
+");
+
+$this->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2021101900', 'dbversion'));
+
+$this->CommitTrans();
diff --git a/modules/promotionadd.php b/modules/promotionadd.php
index fdd9b48e3a..cec7bb399d 100644
--- a/modules/promotionadd.php
+++ b/modules/promotionadd.php
@@ -3,7 +3,7 @@
 /*
  * LMS version 1.11-git
  *
- *  (C) Copyright 2001-2016 LMS Developers
+ *  (C) Copyright 2001-2021 LMS Developers
  *
  *  Please, see the doc/AUTHORS for more information about authors!
  *
@@ -41,34 +41,16 @@
         $error['name'] = trans('Specified name is in use!');
     }
 
-    if (empty($promotion['datefrom'])) {
-            $promotion['from'] = 0;
-    } else {
-        $from = date_to_timestamp($promotion['datefrom']);
-        if (empty($from)) {
-                $error['datefrom'] = trans('Incorrect effective start time!');
-        }
-    }
-
-    if (empty($promotion['dateto'])) {
-            $promotion['to'] = 0;
-    } else {
-        $to = date_to_timestamp($promotion['dateto']);
-        if (empty($to)) {
-                $error['dateto'] = trans('Incorrect effective start time!');
-        }
-    }
-
-    if ($promotion['to'] != 0 && $promotion['from'] != 0 && $to < $from) {
-            $error['dateto'] = trans('Incorrect date range!');
+    if (!empty($promotion['dateto']) && !empty($promotion['datefrom']) && $promotion['dateto'] < $promotion['from']) {
+        $error['dateto'] = trans('Incorrect date range!');
     }
 
     if (!$error) {
         $args = array(
             'name' => $promotion['name'],
             'description' => $promotion['description'],
-            'datefrom' => $promotion['from'],
-            'dateto' => $promotion['to'],
+            'datefrom' => $promotion['datefrom'] ?: 0,
+            'dateto' => $promotion['dateto'] ? strtotime('tomorrow', $promotion['dateto']) - 1 : 0,
         );
         $DB->Execute('INSERT INTO promotions (name, description, datefrom, dateto)
 			VALUES (?, ?, ?, ?)', array_values($args));
diff --git a/modules/promotionedit.php b/modules/promotionedit.php
index bfb23ac72f..4eb40a6c93 100644
--- a/modules/promotionedit.php
+++ b/modules/promotionedit.php
@@ -3,7 +3,7 @@
 /*
  * LMS version 1.11-git
  *
- *  (C) Copyright 2001-2016 LMS Developers
+ *  (C) Copyright 2001-2021 LMS Developers
  *
  *  Please, see the doc/AUTHORS for more information about authors!
  *
@@ -88,25 +88,7 @@
         $promotion['name'] = $oldpromotion['name'];
     }
 
-    if (empty($promotion['datefrom'])) {
-        $promotion['from'] = 0;
-    } else {
-        $from = date_to_timestamp($promotion['datefrom']);
-        if (empty($from)) {
-            $error['datefrom'] = trans('Incorrect effective start time!');
-        }
-    }
-
-    if (empty($promotion['dateto'])) {
-            $promotion['to'] = 0;
-    } else {
-        $to = date_to_timestamp($promotion['dateto']);
-        if (empty($to)) {
-            $error['dateto'] = trans('Incorrect effective start time!');
-        }
-    }
-
-    if ($promotion['to'] != 0 && $promotion['from'] != 0 && $to < $from) {
+    if (!empty($promotion['dateto']) && !empty($promotion['datefrom']) && $promotion['dateto'] < $promotion['datefrom']) {
         $error['dateto'] = trans('Incorrect date range!');
     }
 
@@ -114,12 +96,16 @@
         $args = array(
             'name' => $promotion['name'],
             'description' => $promotion['description'],
-            'datefrom' => $promotion['from'],
-            'dateto' => $promotion['to'],
+            'datefrom' => $promotion['datefrom'] ?: 0,
+            'dateto' => $promotion['dateto'] ? strtotime('tomorrow', $promotion['dateto']) - 1 : 0,
             SYSLOG::RES_PROMO => $promotion['id']
         );
-        $DB->Execute('UPDATE promotions SET name = ?, description = ?, datefrom = ?, dateto = ?
-			WHERE id = ?', array_values($args));
+        $DB->Execute(
+            'UPDATE promotions
+            SET name = ?, description = ?, datefrom = ?, dateto = ?
+            WHERE id = ?',
+            array_values($args)
+        );
 
         if ($SYSLOG) {
             $SYSLOG->AddMessage(SYSLOG::RES_PROMO, SYSLOG::OPER_UPDATE, $args);
@@ -129,14 +115,6 @@
     }
 } else {
     $promotion = $LMS->getPromotion($promotionid);
-
-    if ($promotion['datefrom']) {
-        $promotion['datefrom'] = date('Y/m/d', $promotion['datefrom']);
-    }
-
-    if ($promotion['dateto']) {
-        $promotion['dateto'] = date('Y/m/d', $promotion['dateto']);
-    }
 }
 
 $layout['pagetitle'] = trans('Promotion Edit: $a', $promotion['name']);
diff --git a/modules/promotioninfo.php b/modules/promotioninfo.php
index 6db9f79974..a3629ad880 100644
--- a/modules/promotioninfo.php
+++ b/modules/promotioninfo.php
@@ -42,7 +42,7 @@
 
 $promotion['schemas'] = $DB->GetAllByKey(
     'SELECT
-        s.name, s.disabled, s.description, s.id, s.deleted,
+        s.name, s.disabled, s.description, s.id, s.deleted, s.datefrom, s.dateto,
         COUNT(a.id) AS assignments
     FROM promotionschemas s
     LEFT JOIN assignments a ON a.promotionschemaid = s.id
diff --git a/modules/promotionschemaadd.php b/modules/promotionschemaadd.php
index 21b46078d1..a2bcb49b54 100644
--- a/modules/promotionschemaadd.php
+++ b/modules/promotionschemaadd.php
@@ -3,7 +3,7 @@
 /*
  * LMS version 1.11-git
  *
- *  (C) Copyright 2001-2016 LMS Developers
+ *  (C) Copyright 2001-2021 LMS Developers
  *
  *  Please, see the doc/AUTHORS for more information about authors!
  *
@@ -46,6 +46,10 @@
         $error['name'] = trans('Specified name is in use!');
     }
 
+    if (!empty($schema['dateto']) && !empty($schema['datefrom']) && $schema['dateto'] < $schema['datefrom']) {
+        $error['dateto'] = trans('Incorrect date range!');
+    }
+
     if (!$error) {
         $length = 0;
         $data = array();
@@ -65,10 +69,12 @@
             'description' => $schema['description'],
             'data' => $data,
             'length' => $length,
+            'datefrom' => $schema['datefrom'] ?: 0,
+            'dateto' => $schema['dateto'] ? strtotime('tomorrow', $schema['dateto']) - 1 : 0,
         );
         $DB->Execute('INSERT INTO promotionschemas (promotionid, name,
-			description, data, length)
-			VALUES (?, ?, ?, ?, ?)', array_values($args));
+			description, data, length, datefrom, dateto)
+			VALUES (?, ?, ?, ?, ?, ?, ?)', array_values($args));
 
         $sid = $DB->GetLastInsertId('promotionschemas');
 
diff --git a/modules/promotionschemaedit.php b/modules/promotionschemaedit.php
index c5cdc4c507..d7ba0248bd 100644
--- a/modules/promotionschemaedit.php
+++ b/modules/promotionschemaedit.php
@@ -3,7 +3,7 @@
 /*
  * LMS version 1.11-git
  *
- *  (C) Copyright 2001-2020 LMS Developers
+ *  (C) Copyright 2001-2021 LMS Developers
  *
  *  Please, see the doc/AUTHORS for more information about authors!
  *
@@ -291,6 +291,10 @@
         }
     }
 
+    if (!empty($schema['dateto']) && !empty($schema['datefrom']) && $schema['dateto'] < $schema['datefrom']) {
+        $error['dateto'] = trans('Incorrect date range!');
+    }
+
     if (!$error && !$warning) {
         $DB->BeginTrans();
 
@@ -299,10 +303,16 @@
             'description' => $schema['description'],
             'data' => empty($oldschema['assignmentcount']) || ConfigHelper::checkPrivilege('superuser') ? implode(';', $data) : $oldschema['data'],
             'length' => $length,
+            'datefrom' => $schema['datefrom'] ?: 0,
+            'dateto' => $schema['dateto'] ? strtotime('tomorrow', $schema['dateto']) - 1 : 0,
             SYSLOG::RES_PROMOSCHEMA => $schema['id'],
         );
-        $DB->Execute('UPDATE promotionschemas SET name = ?, description = ?, data = ?, length = ?
-			WHERE id = ?', array_values($args));
+        $DB->Execute(
+            'UPDATE promotionschemas
+            SET name = ?, description = ?, data = ?, length = ?, datefrom = ?, dateto = ?
+            WHERE id = ?',
+            array_values($args)
+        );
 
         if ($SYSLOG) {
             $args[SYSLOG::RES_PROMO] = $oldschema['promotionid'];
diff --git a/modules/promotionschemainfo.php b/modules/promotionschemainfo.php
index e2264843e7..c2043fa5b7 100644
--- a/modules/promotionschemainfo.php
+++ b/modules/promotionschemainfo.php
@@ -26,7 +26,7 @@
 
 $schema = $DB->GetRow(
     'SELECT
-        s.id, s.name, s.description, s.data, s.disabled, s.deleted, s.length,
+        s.id, s.name, s.description, s.data, s.disabled, s.deleted, s.length, s.datefrom, s.dateto,
         p.id AS pid, p.name AS promotion,
         COUNT(a.id) AS assignments
     FROM promotionschemas s
diff --git a/templates/default/promotion/promotionadd.html b/templates/default/promotion/promotionadd.html
index d2a7e5ea8b..0f88c433e8 100644
--- a/templates/default/promotion/promotionadd.html
+++ b/templates/default/promotion/promotionadd.html
@@ -2,52 +2,82 @@
 {block name=title}LMS: {$layout.pagetitle|striphtml}{/block}
 {block name=module_content}
 <!-- $Id$ -->
-<H1>{$layout.pagetitle}</H1>
-<FORM method="post" name="promotionadd" action="?m=promotionadd">
-<p style="display: none;">
-<INPUT type="submit" class="hiddenbtn">
-</p>
-<TABLE class="lmsbox">
-	<THEAD>
-	<TR>
-		<TD style="width: 1%;">
-			{icon name="money"}
-		</TD>
-		<TD style="width: 1%;" class="bold">
-			{trans("Name:")}
-		</TD>
-		<TD style="width: 98%;">
-			<INPUT type="text" name="promotion[name]" value="{$promotion.name}" size="40" {tip text="Enter promotion name" trigger="name" bold=1}>
-		</TD>
-	</TR>
-	</THEAD>
-	<TBODY>
-	<TR>
-		<TD style="width: 1%;">
-			{icon name="optional-info"}
-		</TD>
-		<TD style="width: 1%;" class="bold">
-			{trans("Description:")}
-		</TD>
-		<TD style="width: 98%;">
-			<TEXTAREA name="promotion[description]" cols="50" rows="5" {tip text="Enter additional information (optional)"}>{$promotion.description}</TEXTAREA>
-		</TD>
-	</TR>
-	<TR>
-		<TD class="lms-ui-box-buttons" colspan="3">
-			{button icon="save" label="Submit" onclick="document.promotionadd.submit();"}
-			{button icon="cancel" label="Cancel" href="?m=promotionlist"}
-			<label>
-				<INPUT type="checkbox" name="promotion[reuse]" value="ON" id="reuse" {if $promotion.reuse} checked{/if}>
-				{trans("Display this form again, when this promotion is saved")}
-			</label>
-		</TD>
-	</TR>
-	</TBODY>
-</TABLE></FORM>
+<h1>{$layout.pagetitle}</h1>
+
+<form method="post" name="promotionadd" id="promotionadd" action="?m=promotionadd">
+</form>
+
+<table class="lmsbox">
+	<colgroup>
+		<col style="width: 1%;">
+		<col style="width: 1%;">
+		<col style="width: 98%;">
+	</colgroup>
+	<thead>
+		<TR>
+			<td>
+				{icon name="money"}
+			</td>
+			<td>
+				<strong>{trans("Name")}</strong>
+			</td>
+			<td>
+				<input type="text" name="promotion[name]" value="{$promotion.name|escape}" size="40" form="promotionadd"
+					{tip text="Enter promotion name" trigger="name" bold=1}
+					required>
+			</td>
+		</TR>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				{icon name="period"}
+			</td>
+			<td>
+				<strong>{trans("Period")}</strong>
+			</td>
+			<td>
+				{trans("from")}
+				<input type="text" name="promotion[datefrom]" form="promotionadd"
+					value="{if $promotion.datefrom}{$promotion.datefrom}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff start date in YYYY/MM/DD format. If you don't want to define 'From' date leave this field empty" trigger="datefrom"}>
+				{trans("to")}
+				<input type="text" name="promotion[dateto]" form="promotionadd"
+					value="{if $promotion.dateto}{$promotion.dateto}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff end date in YYYY/MM/DD format. Leave this field empty if you don't want to set expiration date" trigger="dateto"}>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{icon name="optional-info"}
+			</td>
+			<td>
+				<strong>{trans("Description")}</strong>
+			</td>
+			<td>
+				<textarea name="promotion[description]" cols="50" rows="5" form="promotionadd"
+					{tip text="Enter additional information (optional)"}>{$promotion.description|escape}</textarea>
+			</td>
+		</tr>
+		<tr>
+			<td class="lms-ui-box-buttons" colspan="3">
+				{button type="submit" icon="save" label="Submit" form="promotionadd"}
+				{button icon="cancel" label="Cancel" href="?m=promotionlist"}
+				<label>
+					<input type="checkbox" name="promotion[reuse]" value="ON" id="reuse" form="promotionadd"
+						{if $promotion.reuse} checked{/if}>
+					{trans("Display this form again, when this promotion is saved")}
+				</label>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
 <script>
 
-	document.forms['promotionadd'].elements['promotion[name]'].focus();
+	$('[name="promotion[name]"]').focus();
 
 </script>
 {/block}
diff --git a/templates/default/promotion/promotionedit.html b/templates/default/promotion/promotionedit.html
index 21954e53a9..84aa7ae6bc 100644
--- a/templates/default/promotion/promotionedit.html
+++ b/templates/default/promotion/promotionedit.html
@@ -2,59 +2,80 @@
 {block name=title}LMS: {$layout.pagetitle|striphtml}{/block}
 {block name=module_content}
 <!-- $Id$ -->
-<H1>{$layout.pagetitle}</H1>
-<FORM method="post" name="promotionedit" action="?m=promotionedit&amp;id={$promotion.id}">
-<p style="display: none;">
-<INPUT type="submit" class="hiddenbtn">
-</p>
-<TABLE class="lmsbox">
+<h1>{$layout.pagetitle}</h1>
+
+<form method="post" name="promotionedit" id="promotionedit" action="?m=promotionedit&id={$promotion.id}">
+</form>
+
+<table class="lmsbox">
 	<colgroup>
 		<col style="width: 1%;">
 		<col style="width: 1%;">
 		<col style="width: 98%;">
 	</colgroup>
-	<THEAD>
-	<TR>
-		<TD>
-			{icon name="money"}
-		</TD>
-		<TD class="bold">
-			{trans("Name:")}
-		</TD>
-		<TD>
-			<INPUT type="TEXT" name="promotion[name]" value="{$promotion.name}" size="40"
-				{if !empty($promotion.assignmentcount) && !ConfigHelper::checkPrivilege('superuser')}
-					readonly {tip text="Promotion is indirectly assigned to liabilities, so name change is disabled!" trigger="name" bold=1}
-				{else}
-					{tip text="Enter promotion name" trigger="name" bold=1}
-				{/if}>
-		</TD>
-	</TR>
-	</THEAD>
-	<TBODY>
-	<TR>
-		<TD>
-			{icon name="optional-info"}
-		</TD>
-		<TD class="bold">
-			{trans("Description:")}
-		</TD>
-		<TD>
-			<TEXTAREA name="promotion[description]" cols="50" rows="5" {tip text="Enter additional information (optional)"}>{$promotion.description}</TEXTAREA>
-		</TD>
-	</TR>
-	<TR>
-		<TD class="lms-ui-box-buttons" colspan="3">
-			{button icon="save" label="Submit" onclick="document.promotionedit.submit();"}
-			{button icon="cancel" label="Cancel" href="?m=promotionlist"}
-		</TD>
-	</TR>
-	</TBODY>
-</TABLE>
-</FORM>
+	<thead>
+		<tr>
+			<td>
+				{icon name="money"}
+			</td>
+			<td>
+				<strong>{trans("Name")}</strong>
+			</td>
+			<td>
+				<input type="text" name="promotion[name]" value="{$promotion.name|escape}" size="40" form="promotionedit"
+					{if !empty($promotion.assignmentcount) && !ConfigHelper::checkPrivilege('superuser')}
+						readonly {tip text="Promotion is indirectly assigned to liabilities, so name change is disabled!" trigger="name" bold=1}
+					{else}
+						{tip text="Enter promotion name" trigger="name" bold=1}
+					{/if} required>
+			</td>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				{icon name="period"}
+			</td>
+			<td>
+				<strong>{trans("Period")}</strong>
+			</td>
+			<td>
+				{trans("from")}
+				<input type="text" name="promotion[datefrom]" form="promotionedit"
+					value="{if $promotion.datefrom}{$promotion.datefrom}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff start date in YYYY/MM/DD format. If you don't want to define 'From' date leave this field empty" trigger="datefrom"}>
+				{trans("to")}
+				<input type="text" name="promotion[dateto]" form="promotionedit"
+					value="{if $promotion.dateto}{$promotion.dateto}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff end date in YYYY/MM/DD format. Leave this field empty if you don't want to set expiration date" trigger="dateto"}>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{icon name="optional-info"}
+			</td>
+			<td>
+				<strong>{trans("Description")}</strong>
+			</td>
+			<td>
+				<textarea name="promotion[description]" cols="50" rows="5" form="promotionedit"
+					{tip text="Enter additional information (optional)"}>{$promotion.description|escape}</textarea>
+			</td>
+		</tr>
+		<tr>
+			<td class="lms-ui-box-buttons" colspan="3">
+				{button type="submit" icon="save" label="Submit" form="promotionedit"}
+				{button icon="cancel" label="Cancel" href="?m=promotionlist"}
+			</td>
+		</tr>
+	</tbody>
+</table>
+
 <script>
 
-	document.forms['promotionedit'].elements['promotion[name]'].focus();
+	$('[name="promotion[name]"]').focus();
 
 </script>
 {/block}
diff --git a/templates/default/promotion/promotioninfobox.html b/templates/default/promotion/promotioninfobox.html
index 9aea6bc903..a554d0ca1f 100644
--- a/templates/default/promotion/promotioninfobox.html
+++ b/templates/default/promotion/promotioninfobox.html
@@ -1,60 +1,85 @@
 <!-- $Id$ -->
-<TABLE class="lmsbox">
-    <THEAD>
-	<TR>
-		<TD WIDTH="1%">
-			{icon name="money"}
-		</TD>
-		<TD WIDTH="98%" COLSPAN="2">
-			<B>{$promotion.name} ({$promotion.id|string_format:"%04d"})</B>
-			{if $promotion.deleted} <span class="lms-ui-alert">({trans("deleted promotion")})</span>{/if}
-		</TD>
-	</TR>
-    </THEAD>
-    <TBODY>
-	<TR>
-		<TD WIDTH="1%">
-			{if $promotion.disabled}
-				{button type="link" icon="disconnected" tip="Enable" href="?m=promotionset&id={$promotion.id}&access={$promotion.disabled}"}
-			{else}
-				{button type="link" icon="connected" tip="Disable" href="?m=promotionset&id={$promotion.id}&access={$promotion.disabled}"}
-			{/if}
-		</TD>
-		<TD WIDTH="99%" NOWRAP colspan="2">
-			{if $promotion.disabled}{trans("disabled")}{else}{trans("enabled")}{/if}
-		</TD>
-	</TR>
-	{if $promotion.description}
-	<TR>
-		<TD WIDTH="1%">
-			{icon name="optional-info"}
-		</TD>
-		<TD WIDTH="98%" COLSPAN="2">
-			<TABLE WIDTH="100%" CELLPADDING="5">
-			    <TR><TD CLASS="fall superlight">
-				    {$promotion.description|replace:"\n":"<BR>"}
-			    </TD></TR>
-			</TABLE>
-		</TD>
-	</TR>
-	{/if}
-	<TR>
-		<TD colspan="3" class="lms-ui-box-buttons">
-			{if !$promotion.deleted}
-				{button icon="edit" label="Edit" href="?m=promotionedit&id={$promotion.id}"}
-			{/if}
-			{if !$promotion.deleted || !$promotion.assignments}
-				{button icon="delete" label="Delete" id="delete-promotion" data_href="?m=promotiondel&id={$promotion.id}"}
-			{/if}
-		</TD>
-	</TR>
-    </TBODY>
-</TABLE>
+<table class="lmsbox">
+	<colgroup>
+		<col style="width: 1%;">
+		<col style="width: 1%;">
+		<col style="width: 98%;">
+	</colgroup>
+	<thead>
+		<tr>
+			<td>
+				{icon name="money"}
+			</td>
+			<td colspan="2">
+				<strong>{$promotion.name|escape} ({$promotion.id|string_format:"%04d"})</strong>
+				{if $promotion.deleted} <span class="lms-ui-alert">({trans("deleted promotion")})</span>{/if}
+			</td>
+		</tr>
+	</thead>
+	<tbody>
+		{if $promotion.datefrom || $promotion.dateto}
+			<tr>
+				<td>
+					{icon name="period"}
+				</td>
+				<td class="nobr" colspan="2">
+					{if $promotion.datefrom}
+						{trans("from")} {$promotion.datefrom|date_format:"%Y/%m/%d"}
+					{/if}
+					{if $promotion.dateto}
+						{trans("to")} {$promotion.dateto|date_format:"%Y/%m/%d"}
+					{/if}
+				</td>
+			</tr>
+		{/if}
+		<tr>
+			<td>
+				{if $promotion.disabled}
+					{button type="link" icon="disconnected" tip="Enable" href="?m=promotionset&id={$promotion.id}&access={$promotion.disabled}"}
+				{else}
+					{button type="link" icon="connected" tip="Disable" href="?m=promotionset&id={$promotion.id}&access={$promotion.disabled}"}
+				{/if}
+			</td>
+			<td class="nobr" colspan="2">
+				{if $promotion.disabled}{trans("disabled")}{else}{trans("enabled")}{/if}
+			</td>
+		</tr>
+		{if $promotion.description}
+			<tr>
+				<td>
+					{icon name="optional-info"}
+				</td>
+				<td colspan="2">
+					<table width="100%" cellpadding="5">
+						<tr><td class="fall superlight">
+							{$promotion.description|escape|replace:"\n":"<BR>"}
+						</td></tr>
+					</table>
+				</td>
+			</tr>
+		{/if}
+		<tr>
+			<td colspan="3" class="lms-ui-box-buttons">
+				{if !$promotion.deleted}
+					{button icon="edit" label="Edit" href="?m=promotionedit&id={$promotion.id}"}
+				{/if}
+				{if !$promotion.deleted || !$promotion.assignments}
+					{button icon="delete" label="Delete" id="delete-promotion" data_href="?m=promotiondel&id={$promotion.id}"}
+				{/if}
+			</td>
+		</tr>
+	</tbody>
+</table>
+
 <script>
-	$('#delete-promotion').click(function() {
-		confirmDialog($t("Are you sure, you want to delete this promotion?"), this).done(function() {
-			location.href = $(this).attr('data-href');
+
+	$(function() {
+		$('#delete-promotion').click(function () {
+			confirmDialog($t("Are you sure, you want to delete this promotion?"), this).done(function () {
+				location.href = $(this).attr('data-href');
+			});
+			return false;
 		});
-		return false;
 	});
+
 </script>
diff --git a/templates/default/promotion/promotionlist.html b/templates/default/promotion/promotionlist.html
index 8a4d0052f5..137fa71986 100644
--- a/templates/default/promotion/promotionlist.html
+++ b/templates/default/promotion/promotionlist.html
@@ -41,29 +41,29 @@ <H1>{$layout.pagetitle}</H1>
     <TBODY>
 	{foreach $promotionlist as $promo}
 	<TR class="highlight {if $promo.disabled} blend{/if}{if $promo.deleted} lms-ui-resource-deleted{/if}" data-name="{$promo.name}">
-		<TD nowrap onClick="return self.location.href='?m=promotioninfo&amp;id={$promo.id}';">
-			{icon name="money"} <B>{$promo.name}</B>
+		<td class="nobr" data-target-url="?m=promotioninfo&id={$promo.id}">
+			{icon name="money"} <strong>{$promo.name|escape}</strong>
 			{if $promo.datefrom || $promo.dateto}
 				{if $promo.datefrom}
-				({trans("from:")} {$promo.datefrom|date_format:"%Y/%m/%d"}{if !$promo.dateto}){/if}
+					({trans("from")} {$promo.datefrom|date_format:"%Y/%m/%d"}{if !$promo.dateto}){/if}
 				{/if}
 				{if $promo.dateto}
-				{if !$promo.datefrom}({/if}{trans("to:")} {$promo.dateto|date_format:"%Y/%m/%d"})
+					{if !$promo.datefrom}({/if}{trans("to")} {$promo.dateto|date_format:"%Y/%m/%d"})
 				{/if}
 			{/if}
-		</TD>
+		</td>
 		<TD class="text-right">
 			({$promo.id|string_format:"%04d"})
 		</TD>
-		<TD onClick="return self.location.href='?m=promotioninfo&amp;id={$promo.id}';">
-			{$promo.description}
-		</TD>
-		<TD class="text-right" onClick="return self.location.href='?m=promotioninfo&amp;id={$promo.id}';">
+		<td data-target-url="?m=promotioninfo&id={$promo.id}">
+			{$promo.description|escape}
+		</td>
+		<td class="text-right" data-target-url="?m=promotioninfo&id={$promo.id}">
 			{$promo.scs|default:"-"}
-		</TD>
-		<TD class="text-right" onClick="return self.location.href='?m=promotioninfo&amp;id={$promo.id}';">
+		</td>
+		<td class="text-right" data-target-url="?m=promotioninfo&id={$promo.id}">
 			{$promo.tariffs|default:"-"}
-		</TD>
+		</td>
 		<TD class="text-right nobr">
 			{$promo.assignments|default:"-"}
 		</TD>
diff --git a/templates/default/promotion/promotionschemaadd.html b/templates/default/promotion/promotionschemaadd.html
index 225d02ece2..5281b1e02f 100644
--- a/templates/default/promotion/promotionschemaadd.html
+++ b/templates/default/promotion/promotionschemaadd.html
@@ -16,86 +16,108 @@
 
 </style>
 
-<H1>{$layout.pagetitle}</H1>
-<H3>{trans("Promotion:")} {$schema.promotionname}</H3>
-<FORM method="post" name="schemaadd" action="?m=promotionschemaadd&amp;id={$schema.promotionid}">
-<p style="display: none;">
-<INPUT type="submit" class="hiddenbtn">
-</p>
-<TABLE class="lmsbox">
+<h1>{$layout.pagetitle}</h1>
+<h3>{trans("Promotion:")} {$schema.promotionname}</h3>
+
+<form method="post" name="schemaadd" id="schemaadd" action="?m=promotionschemaadd&id={$schema.promotionid}">
+</form>
+
+<table class="lmsbox">
 	<colgroup>
 		<col style="width: 1%;">
 		<col style="width: 1%;">
 		<col style="width: 98%;">
 	</colgroup>
-	<THEAD>
-	<TR>
-		<TD>
-			{icon name="money"}
-		</TD>
-		<TD class="bold">
-			{trans("Name:")}
-		</TD>
-		<TD>
-			<INPUT type="text" name="schema[name]" value="{$schema.name}" size="40" {tip text="Enter schema name" trigger="name" bold=1}>
-		</TD>
-	</TR>
-	</THEAD>
-	<TBODY>
-	<TR>
-		<TD>
-			{icon name="calendar"}
-		</TD>
-		<TD class="bold">
-			{trans("Periods:")}
-		</TD>
-		<TD id="periodcont">
-			{foreach $schema.periods as $key => $period}
-				<SELECT name="schema[periods][]" {tip class="lms-ui-combobox" text="Select length of the period (in months)"}
-					data-value="{$period}">
-					{if !$key && count($schema.periods) == 1}
-						<OPTION value="0"{if !$period} selected{/if}>- {trans("unlimited")} -</OPTION>
-					{/if}
-					{foreach $schema.selection as $item}
-						<OPTION value="{$item}"{if $period == $item} selected{/if}>{$item}</OPTION>
-					{/foreach}
-				</SELECT>
-			{/foreach}
-			{if count($schema.periods) < 2}
-				{$visible = false}
-			{else}
-				{$visible = true}
-			{/if}
-			{button type="link" icon="delete" tip="Delete" id="perioddel" visible=$visible}
-			{button type="link" icon="add" tip="Add" id="periodadd"}
-		</TD>
-	</TR>
-	<TR>
-		<TD>
-			{icon name="info"}
-		</TD>
-		<TD class="bold">
-			{trans("Description:")}
-		</TD>
-		<TD>
-			<TEXTAREA name="schema[description]" cols="50" rows="5" {tip text="Enter additional information (optional)"}>{$schema.description}</TEXTAREA>
-		</TD>
-	</TR>
-	<TR>
-		<TD class="lms-ui-box-buttons" colspan="3">
-			<div class="lms-ui-box-button-container">
-				{button type="submit" icon="save" label="Submit"}
-				{button icon="cancel" label="Cancel" href="?m=promotioninfo&amp;id={$schema.promotionid}"}
-				<label>
-					<INPUT type="checkbox" name="schema[reuse]" value="ON"{if $schema.reuse} checked{/if}>
-					{trans("Display this form again, when this schema is saved")}
-				</label>
-			</div>
-		</TD>
-	</TR>
-	</TBODY>
-</TABLE>
-</FORM>
+	<thead>
+		<tr>
+			<td>
+				{icon name="money"}
+			</td>
+			<td>
+				<strong>{trans("Name")}</strong>
+			</td>
+			<td>
+				<input type="text" name="schema[name]" value="{$schema.name|escape}" size="40" form="schemaadd"
+					{tip text="Enter schema name" trigger="name" bold=1} required>
+			</td>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				{icon name="calendar"}
+			</td>
+			<td>
+				<strong>{trans("Periods")}</strong>
+			</td>
+			<td id="periodcont">
+				{foreach $schema.periods as $key => $period}
+					<select name="schema[periods][]" {tip class="lms-ui-combobox" text="Select length of the period (in months)"}
+						data-value="{$period}" form="schemaadd">
+						{if !$key && count($schema.periods) == 1}
+							<option value="0"{if !$period} selected{/if}>- {trans("unlimited")} -</option>
+						{/if}
+						{foreach $schema.selection as $item}
+							<option value="{$item}"{if $period == $item} selected{/if}>{$item}</option>
+						{/foreach}
+					</select>
+				{/foreach}
+				{if count($schema.periods) < 2}
+					{$visible = false}
+				{else}
+					{$visible = true}
+				{/if}
+				{button type="link" icon="delete" tip="Delete" id="perioddel" visible=$visible}
+				{button type="link" icon="add" tip="Add" id="periodadd"}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{icon name="period"}
+			</td>
+			<td>
+				<strong>{trans("Period")}</strong>
+			</td>
+			<td>
+				{trans("from")}
+				<input type="text" name="schema[datefrom]" form="schemaadd"
+					value="{if $schema.datefrom}{$schema.datefrom}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff start date in YYYY/MM/DD format. If you don't want to define 'From' date leave this field empty" trigger="datefrom"}>
+				{trans("to")}
+				<input type="text" name="schema[dateto]" form="schemaadd"
+					value="{if $schema.dateto}{$schema.dateto}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff end date in YYYY/MM/DD format. Leave this field empty if you don't want to set expiration date" trigger="dateto"}>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{icon name="info"}
+			</td>
+			<td>
+				<strong>{trans("Description")}</strong>
+			</td>
+			<td>
+				<textarea name="schema[description]" cols="50" rows="5" form="schemaadd"
+					{tip text="Enter additional information (optional)"}>{$schema.description|escape}</textarea>
+			</td>
+		</tr>
+		<tr>
+			<td class="lms-ui-box-buttons" colspan="3">
+				<div class="lms-ui-box-button-container">
+					{button type="submit" icon="save" label="Submit" form="schemaadd"}
+					{button icon="cancel" label="Cancel" href="?m=promotioninfo&amp;id={$schema.promotionid}"}
+					<label>
+						<input type="checkbox" name="schema[reuse]" form="schemaadd"
+							value="ON"{if $schema.reuse} checked{/if}>
+						{trans("Display this form again, when this schema is saved")}
+					</label>
+				</div>
+			</td>
+		</tr>
+	</tbody>
+</table>
 
 <script>
 
diff --git a/templates/default/promotion/promotionschemaedit.html b/templates/default/promotion/promotionschemaedit.html
index ae3e4d1884..c5727e403e 100644
--- a/templates/default/promotion/promotionschemaedit.html
+++ b/templates/default/promotion/promotionschemaedit.html
@@ -16,95 +16,113 @@
 
 </style>
 
-<H1>{$layout.pagetitle}</H1>
-<H3>{trans("Promotion:")} {$schema['promotionname']}</H3>
-<FORM method="post" name="schemaedit" action="?m=promotionschemaedit&amp;id={$schema.id}">
-<p style="display: none;">
-<INPUT type="submit" class="hiddenbtn">
-</p>
+<h1>{$layout.pagetitle}</h1>
+<h3>{trans("Promotion:")} {$schema['promotionname']}</h3>
 
+<form method="post" name="schemaedit" id="schemaedit" action="?m=promotionschemaedit&id={$schema.id}">
+</form>
 
-<TABLE class="lmsbox">
+<table class="lmsbox">
 	<colgroup>
 		<col style="width: 1%;">
 		<col style="width: 1%;">
 		<col style="width: 98%;">
 	</colgroup>
-	<THEAD>
-	<TR>
-		<TD>
-			{icon name="money"}
-		</TD>
-		<TD class="bold">
-			{trans("Name:")}
-		</TD>
-		<TD>
-			<INPUT type="text" name="schema[name]" value="{$schema.name}" size="40"
-				   {if !empty($schema.assignmentcount) && !ConfigHelper::checkPrivilege('superuser')}
+	<thead>
+		<tr>
+			<td>
+				{icon name="money"}
+			</td>
+			<td>
+				<strong>{trans("Name")}</strong>
+			</td>
+			<td>
+				<input type="text" name="schema[name]" value="{$schema.name|escape}" size="40" form="schemaedit"
+					{if !empty($schema.assignmentcount) && !ConfigHelper::checkPrivilege('superuser')}
 						readonly {tip text="Schema is assigned to liabilities, so name change is disabled!" trigger="name" bold=1}
-				   {else}
-					   {tip text="Enter schema name" trigger="name" bold=1}
-				   {/if}>
-		</TD>
-	</TR>
-	</THEAD>
-	<TBODY>
-	<TR>
-		<TD>
-			{icon name="calendar"}
-		</TD>
-		<TD class="bold">
-			{trans("Periods:")}
-		</TD>
-		<TD id="periodcont">
-			{foreach $schema.periods as $key => $period}
-				<SELECT name="schema[periods][]"
-						{if !empty($schema.assignmentcount) && !ConfigHelper::checkPrivilege('superuser')}
-							data-options='{ "disabled": true }'
-							{tip class="lms-ui-combobox" text="Schema is assigned to liabilities, so periods change is disabled!" bold=1}
-						{else}
-							{tip class="lms-ui-combobox" text="Select length of the period (in months)"}
+					{else}
+						{tip text="Enter schema name" trigger="name" bold=1}
+					{/if} required>
+			</td>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				{icon name="calendar"}
+			</td>
+			<td>
+				<strong>{trans("Periods")}</strong>
+			</td>
+			<td id="periodcont">
+				{foreach $schema.periods as $key => $period}
+					<select name="schema[periods][]" form="schemaedit"
+							{if !empty($schema.assignmentcount) && !ConfigHelper::checkPrivilege('superuser')}
+								data-options='{ "disabled": true }'
+								{tip class="lms-ui-combobox" text="Schema is assigned to liabilities, so periods change is disabled!" bold=1}
+							{else}
+								{tip class="lms-ui-combobox" text="Select length of the period (in months)"}
+							{/if}
+						data-value="{$period}">
+						{if !$key && count($schema.periods) == 1}
+							<option value="0"{if !$period} selected{/if}>- {trans("unlimited")} -</option>
 						{/if}
-					data-value="{$period}">
-					{if !$key && count($schema.periods) == 1}
-						<OPTION value="0"{if !$period} selected{/if}>- {trans("unlimited")} -</OPTION>
+						{foreach $schema.selection as $item}
+							<option value="{$item}"{if $period == $item} selected{/if}>{$item}</option>
+						{/foreach}
+					</select>
+				{/foreach}
+				{if empty($schema.assignmentcount) || ConfigHelper::checkPrivilege('superuser')}
+					{if count($schema.periods) < 2}
+						{$visible = false}
+					{else}
+						{$visible = true}
 					{/if}
-					{foreach $schema.selection as $item}
-						<OPTION value="{$item}"{if $period == $item} selected{/if}>{$item}</OPTION>
-					{/foreach}
-				</SELECT>
-			{/foreach}
-			{if empty($schema.assignmentcount) || ConfigHelper::checkPrivilege('superuser')}
-				{if count($schema.periods) < 2}
-					{$visible = false}
-				{else}
-					{$visible = true}
+					{button type="link" icon="delete" tip="Delete" id="perioddel" visible=$visible}
+					{button type="link" icon="add" tip="Add" id="periodadd"}
 				{/if}
-				{button type="link" icon="delete" tip="Delete" id="perioddel" visible=$visible}
-				{button type="link" icon="add" tip="Add" id="periodadd"}
-			{/if}
-		</TD>
-	</TR>
-	<TR>
-		<TD>
-			{icon name="info"}
-		</TD>
-		<TD class="bold">
-			{trans("Description:")}
-		</TD>
-		<TD>
-			<TEXTAREA name="schema[description]" cols="50" rows="5" {tip text="Enter additional information (optional)"}>{$schema.description}</TEXTAREA>
-		</TD>
-	</TR>
-	<TR>
-		<TD class="lms-ui-box-buttons" colspan="3">
-			{button icon="save" label="Submit" onclick="document.schemaedit.submit();"}
-			{button icon="cancel" label="Cancel" href="?m=promotionschemainfo&id={$schema.id}"}
-		</TD>
-	</TR>
-	</TBODY>
-</TABLE>
-</FORM>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{icon name="period"}
+			</td>
+			<td>
+				<strong>{trans("Period")}</strong>
+			</td>
+			<td>
+				{trans("from")}
+				<input type="text" name="schema[datefrom]" form="schemaedit"
+					value="{if $schema.datefrom}{$schema.datefrom}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff start date in YYYY/MM/DD format. If you don't want to define 'From' date leave this field empty" trigger="datefrom"}>
+				{trans("to")}
+				<input type="text" name="schema[dateto]" form="schemaedit"
+					value="{if $schema.dateto}{$schema.dateto}{/if}"
+					placeholder="{trans("yyyy/mm/dd")}" size="10"
+					{tip class="lms-ui-date lms-ui-date-unix" text="Enter tariff end date in YYYY/MM/DD format. Leave this field empty if you don't want to set expiration date" trigger="dateto"}>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{icon name="info"}
+			</td>
+			<td>
+				<strong>{trans("Description")}</strong>
+			</td>
+			<td>
+				<textarea name="schema[description]" cols="50" rows="5" form="schemaedit"
+					{tip text="Enter additional information (optional)"}>{$schema.description|escape}</textarea>
+			</td>
+		</tr>
+		<tr>
+			<td class="lms-ui-box-buttons" colspan="3">
+				{button type="submit" icon="save" label="Submit" form="schemaedit"}
+				{button icon="cancel" label="Cancel" href="?m=promotionschemainfo&id={$schema.id}"}
+			</td>
+		</tr>
+	</tbody>
+</table>
 
 <script>
 
diff --git a/templates/default/promotion/promotionschemainfobox.html b/templates/default/promotion/promotionschemainfobox.html
index 620dd4b3c7..0b30112637 100644
--- a/templates/default/promotion/promotionschemainfobox.html
+++ b/templates/default/promotion/promotionschemainfobox.html
@@ -1,78 +1,94 @@
 <!-- $Id$ -->
-<TABLE class="lmsbox">
+<table class="lmsbox">
 	<colgroup>
 		<col style="width: 1%;">
 		<col style="width: 1%;">
 		<col style="width: 98%;">
 	</colgroup>
-	<THEAD>
-	<TR>
-		<TD>
-			{icon name="money"}
-		</TD>
-		<TD class="bold" colspan="2">
-			{$schema.name} ({$schema.id|string_format:"%04d"})
-			{if $schema.deleted} <span class="lms-ui-alert">({trans("deleted promotion schema")})</span>{/if}
-		</TD>
-	</TR>
-	</THEAD>
-	<TBODY>
-	<TR>
-		<TD>
-			{icon name="calendar"}
-		</TD>
-		<TD class="nobr" colspan="2">
-			{if $schema.data}{$schema.data}{else}{trans("unlimited")}{/if}
-		</TD>
-	</TR>
-	<TR>
-		<TD>
-			<A href="?m=promotionschemaset&id={$schema.id}&access={$schema.disabled}">
-				{if $schema.disabled}
-					{icon name="disconnected"}
-				{else}
-					{icon name="connected"}
+	<thead>
+		<tr>
+			<td>
+				{icon name="money"}
+			</td>
+			<td class="bold" colspan="2">
+				{$schema.name|escape} ({$schema.id|string_format:"%04d"})
+				{if $schema.deleted} <span class="lms-ui-alert">({trans("deleted promotion schema")})</span>{/if}
+			</td>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				{icon name="calendar"}
+			</td>
+			<td class="nobr" colspan="2">
+				{if $schema.data}{$schema.data}{else}{trans("unlimited")}{/if}
+			</td>
+		</tr>
+		{if $schema.datefrom || $schema.dateto}
+			<tr>
+				<td>
+					{icon name="period"}
+				</td>
+				<td class="nobr" colspan="2">
+					{if $schema.datefrom}
+						{trans("from")} {$schema.datefrom|date_format:"%Y/%m/%d"}
+					{/if}
+					{if $schema.dateto}
+						{trans("to")} {$schema.dateto|date_format:"%Y/%m/%d"}
+					{/if}
+				</td>
+			</tr>
+		{/if}
+		<tr>
+			<td>
+				<A href="?m=promotionschemaset&id={$schema.id}&access={$schema.disabled}">
+					{if $schema.disabled}
+						{icon name="disconnected"}
+					{else}
+						{icon name="connected"}
+					{/if}
+				</A>
+			</td>
+			<td class="nobr" colspan="2">
+				{if $schema.disabled}{trans("disabled")}{else}{trans("enabled")}{/if}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{icon name="money"}
+			</td>
+			<td class="nobr" colspan="2">
+				<A href="?m=promotioninfo&id={$schema.pid}">{$schema.promotion}</A>
+			</td>
+		</tr>
+		{if $schema.description}
+		<tr>
+			<td>
+				{icon name="info"}
+			</td>
+			<td colspan="2">
+				<table width="100%" cellpadding="5">
+					<tr><td class="fall superlight">
+						{$schema.description|escape|replace:"\n":"<BR>"}
+					</td></tr>
+				</table>
+			</td>
+		</tr>
+		{/if}
+		<tr>
+			<td class="lms-ui-box-buttons" colspan="3">
+				{if !$schema.deleted}
+					{button icon="edit" label="Edit" href="?m=promotionschemaedit&id={$schema.id}"}
 				{/if}
-			</A>
-		</TD>
-		<TD class="nobr" colspan="2">
-			{if $schema.disabled}{trans("disabled")}{else}{trans("enabled")}{/if}
-		</TD>
-	</TR>
-	<TR>
-		<TD>
-			{icon name="money"}
-		</TD>
-		<TD class="nobr" colspan="2">
-			<A href="?m=promotioninfo&amp;id={$schema.pid}">{$schema.promotion}</A>
-		</TD>
-	</TR>
-	{if $schema.description}
-	<TR>
-		<TD>
-			{icon name="info"}
-		</TD>
-		<TD colspan="2">
-			<TABLE width="100%" cellpadding="5">
-				<TR><TD class="fall superlight">
-					{$schema.description|replace:"\n":"<BR>"}
-				</TD></TR>
-			</TABLE>
-		</TD>
-	</TR>
-	{/if}
-	<TR>
-		<TD class="lms-ui-box-buttons" colspan="3">
-			{if !$schema.deleted}
-				{button icon="edit" label="Edit" href="?m=promotionschemaedit&id={$schema.id}"}
-			{/if}
-			{if !$schema.deleted || !$schema.assignments}
-				{button icon="delete" label="Delete" id="delete-promotionschema" data_href="?m=promotionschemadel&id={$schema.id}"}
-			{/if}
-		</TD>
-	</TR>
-	</TBODY>
-</TABLE>
+				{if !$schema.deleted || !$schema.assignments}
+					{button icon="delete" label="Delete" id="delete-promotionschema" data_href="?m=promotionschemadel&id={$schema.id}"}
+				{/if}
+			</td>
+		</tr>
+	</tbody>
+</table>
+
 <script>
 	$('#delete-promotionschema').click(function() {
 		confirmDialog($t("Are you sure, you want to delete this schema?"), this).done(function() {
diff --git a/templates/default/promotion/promotionschemas.html b/templates/default/promotion/promotionschemas.html
index e595e2fe79..e44f66db67 100644
--- a/templates/default/promotion/promotionschemas.html
+++ b/templates/default/promotion/promotionschemas.html
@@ -1,90 +1,112 @@
 <!--// $Id$ //-->
-<TABLE class="lmsbox">
-    <THEAD>
-	<TR>
-		<TD width="99%" class="hand" onclick="showOrHide('promotionschemas');">
-			{icon name="money"}
-			{if empty($promotion.schemas)}{$count = 0}{else}{$count = count($promotion.schemas)}{/if}
-			<B>{t a=$count}Promotion's Schemas ($a):{/t}</B>
-		</TD>
-		<TD width="1%" class="text-right nobr">
-			{button type="link-button" icon="add" label="New Schema" href="?m=promotionschemaadd&id={$promotion.id}"}
-		</TD>
-	</TR>
-    </THEAD>
-    <TBODY>
-        <TR id="promotionschemas" style="display:none;">
-	        <TD WIDTH="100%" colspan="2">
-		    <TABLE class="lmsbox-inner lms-ui-background-cycle">
-				<colgroup>
-					<col style="width: 1%;">
-					<col style="width: 97%;">
-					<col style="width: 1%;">
-					<col style="width: 1%;">
-				</colgroup>
-			<THEAD>
-				<TR class="fbottom">
-					<TD class="bold">{trans("Name:")}</TD>
-					<TD>{trans("Description:")}</TD>
-					<td>{trans("Assignments:")}</td>
-					<TD>&nbsp;</TD>
-				</TR>
-			</THEAD>
-			<TBODY>
-			{foreach from=$promotion.schemas item=schema}
-    		<TR class="highlight{if $schema.disabled} blend{/if}{if $schema.deleted} lms-ui-resource-deleted{/if}" data-name="{$schema.name}">
-			    <TD onClick="return self.location.href='?m=promotionschemainfo&id={$schema.id}';" class="nobr">
-				    <B>{$schema.name}</B>
-			    </TD>
-			    <TD onClick="return self.location.href='?m=promotionschemainfo&id={$schema.id}';">
-				    {$schema.description}
-			    </TD>
-				<td>
-					{$schema.assignments|default:"-"}
-				</td>
-			    <TD class="nobr">
-					{if !$schema.deleted}
-						{if $schema.disabled}
-							{button type="link" icon="disconnected" tip="Enable" href="?m=promotionschemaset&id={$schema.id}&access={$schema.disabled}"}
-						{else}
-							{button type="link" icon="connected" tip="Disable" href="?m=promotionschemaset&id={$schema.id}&access={$schema.disabled}"}
-						{/if}
-					{/if}
-					{if !$schema.deleted || !$schema.assignments}
-						{button type="link" class="delete-promotion" href="?m=promotionschemadel&id={$schema.id}"
-							icon="delete" tip="Delete"}
-					{/if}
-					{button type="link" href="?m=promotionschemaclone&id={$schema.id}" icon="clone" tip="Clone"}
-					{if !$schema.deleted}
-						{button type='link' icon="edit" href="?m=promotionschemaedit&id={$schema.id}" tip="Edit schema"}
-					{/if}
-					{button type="link" icon="view" href="?m=promotionschemainfo&id={$schema.id}" tip="Info"}
-			    </TD>
-			</TR>
-			{foreachelse}
-			<tr>
-				<td colspan="4" class="empty-table">
-					{trans("This promotion hasn't got any schemas.")}
-				</td>
-			</tr>
-			{/foreach}
-			</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-    </TBODY>
-</TABLE>
-<SCRIPT>
-if (getCookie('promotionschemas') == '1')
-{
-	document.getElementById('promotionschemas').style.display = '';
-}
-$('.delete-promotion').click(function() {
-	var name = $(this).closest('tr').attr('data-name');
-	confirmDialog($t("Are you sure, you want to remove schema '$a'?", name), this).done(function() {
-		location.href = $(this).attr('href');
+<table class="lmsbox">
+	<colgroup>
+		<col style="width: 99%;">
+		<col style="width: 1%;">
+	</colgroup>
+	<thead>
+		<tr>
+			<td class="hand" onclick="showOrHide('promotionschemas');">
+				{icon name="money"}
+				{if empty($promotion.schemas)}{$count = 0}{else}{$count = count($promotion.schemas)}{/if}
+				<strong>{t a=$count}Promotion's Schemas ($a):{/t}</strong>
+			</td>
+			<td class="text-right nobr">
+				{button type="link-button" icon="add" label="New Schema" href="?m=promotionschemaadd&id={$promotion.id}"}
+			</td>
+		</tr>
+	</thead>
+	<tbody>
+		<tr id="promotionschemas" style="display: none;">
+			<td colspan="2">
+				<table class="lmsbox-inner lms-ui-background-cycle">
+					<colgroup>
+						<col style="width: 1%;">
+						<col style="width: 97%;">
+						<col style="width: 1%;">
+						<col style="width: 1%;">
+					</colgroup>
+					<thead>
+						<tr class="fbottom">
+							<td>
+								<strong>{trans("Name")}</strong>
+							</td>
+							<td>
+								{trans("Description")}
+							</td>
+							<td>
+								{trans("Assignments")}
+							</td>
+							<td>&nbsp;</td>
+						</tr>
+					</thead>
+					<tbody>
+						{foreach $promotion.schemas as $schema}
+							<TR class="highlight{if $schema.disabled} blend{/if}{if $schema.deleted} lms-ui-resource-deleted{/if}" data-name="{$schema.name}">
+								<td data-target-url="?m=promotionschemainfo&id={$schema.id}" class="nobr">
+									<strong>{$schema.name|escape}</strong>
+									{if $schema.datefrom || $schema.dateto}
+										{if $schema.datefrom}
+											({trans("from")} {$schema.datefrom|date_format:"%Y/%m/%d"}{if !$schema.dateto}){/if}
+										{/if}
+										{if $schema.dateto}
+											{if !$schema.datefrom}({/if}{trans("to")} {$schema.dateto|date_format:"%Y/%m/%d"})
+										{/if}
+									{/if}
+								</td>
+								<td data-target-url="?m=promotionschemainfo&id={$schema.id}">
+									{$schema.description|escape}
+								</td>
+								<td>
+									{$schema.assignments|default:"-"}
+								</td>
+								<td class="nobr">
+									{if !$schema.deleted}
+										{if $schema.disabled}
+											{button type="link" icon="disconnected" tip="Enable" href="?m=promotionschemaset&id={$schema.id}&access={$schema.disabled}"}
+										{else}
+											{button type="link" icon="connected" tip="Disable" href="?m=promotionschemaset&id={$schema.id}&access={$schema.disabled}"}
+										{/if}
+									{/if}
+									{if !$schema.deleted || !$schema.assignments}
+										{button type="link" class="delete-promotion" href="?m=promotionschemadel&id={$schema.id}"
+											icon="delete" tip="Delete"}
+									{/if}
+									{button type="link" href="?m=promotionschemaclone&id={$schema.id}" icon="clone" tip="Clone"}
+									{if !$schema.deleted}
+										{button type='link' icon="edit" href="?m=promotionschemaedit&id={$schema.id}" tip="Edit schema"}
+									{/if}
+									{button type="link" icon="view" href="?m=promotionschemainfo&id={$schema.id}" tip="Info"}
+								</td>
+							</TR>
+						{foreachelse}
+							<tr>
+								<td colspan="4" class="empty-table">
+									{trans("This promotion hasn't got any schemas.")}
+								</td>
+							</tr>
+						{/foreach}
+					</tbody>
+				</table>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+<script>
+
+	if (getCookie('promotionschemas') == '1') {
+		$('#promotionschemas').show();
+	}
+
+	$(function() {
+		$('.delete-promotion').click(function() {
+			var name = $(this).closest('tr').attr('data-name');
+			confirmDialog($t("Are you sure, you want to remove schema '$a'?", name), this).done(function() {
+				location.href = $(this).attr('href');
+			});
+			return false;
+		});
 	});
-	return false;
-});
 
-</SCRIPT>
+</script>