diff --git a/admin-dev/themes/template/form.tpl b/admin-dev/themes/template/form.tpl
index 0b3c1bfaf..fadb4a7f9 100644
--- a/admin-dev/themes/template/form.tpl
+++ b/admin-dev/themes/template/form.tpl
@@ -54,7 +54,7 @@
 	</script>
 	<script type="text/javascript" src="../js/form.js"></script>
 {/if}
-
+{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
 <form action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
 	{if $form_id}
 		<input type="hidden" name="id_{$table}" value="{$form_id}" />
@@ -264,7 +264,7 @@
 </form>
 
 <br /><br />
-{if $firstCall}
+{if $firstCall && !$no_back}
 	{if $back}
 		<a href="{$back}"><img src="../img/admin/arrow2.gif" />{l s='Back'}</a>
 	{else}
diff --git a/admin-dev/themes/template/options.tpl b/admin-dev/themes/template/options.tpl
index 7ceaeddf0..1bc4b78ab 100644
--- a/admin-dev/themes/template/options.tpl
+++ b/admin-dev/themes/template/options.tpl
@@ -26,7 +26,6 @@
 <script type="text/javascript">
 	id_language = Number({$current_id_lang});
 </script>
-<br />
 <form action="{$current}&submitOptions{$table}=1&token={$token}" method="post" enctype="multipart/form-data">
 	{foreach $option_list AS $category => $categoryData}
 		{if isset($categoryData['top'])}{$categoryData['top']}{/if}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index 15415fa0d..b0d28b442 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1154,6 +1154,7 @@ class AdminControllerCore extends Controller
 			$helper = new HelperOptions();
 			$helper->id = $this->id;
 			$helper->token = $this->token;
+			$helper->table = $this->table;
 			$helper->currentIndex = self::$currentIndex;
 			$this->content .= $helper->generateOptions($this->options);
 		}
diff --git a/classes/HelperForm.php b/classes/HelperForm.php
index 0b773fe9e..dadcf391d 100644
--- a/classes/HelperForm.php
+++ b/classes/HelperForm.php
@@ -49,6 +49,12 @@ class HelperFormCore extends Helper
 	 */
 	public $submit_action = '';
 
+	/**
+	 * @var bool
+	 * Usage : Set the value to true if you want to simply remove the back button
+	 */
+	public $no_back = false;
+
 	public $token;
 
 	public $languages = null;
@@ -80,6 +86,7 @@ class HelperFormCore extends Helper
 			'allowEmployeeFormLang' => $this->allow_employee_form_lang,
 			'form_id' => $this->id,
 			'back' => Tools::getValue('back'),
+			'no_back' => $this->no_back,
 			'fields' => $this->fields_form,
 			'fields_value' => $this->fields_value,
 			'required_fields' => $this->getFieldsRequired(),
diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php
new file mode 100644
index 000000000..78354086a
--- /dev/null
+++ b/controllers/admin/AdminDeliverySlipController.php
@@ -0,0 +1,140 @@
+<?php
+/*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 8971 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminDeliverySlipControllerCore extends AdminController
+{
+	public function __construct()
+	{
+	 	$this->table = 'delivery';
+		$this->context = Context::getContext();
+
+		$this->options = array(
+			'general' => array(
+				'title' =>	$this->l('Delivery slips options'),
+				'fields' =>	array(
+					'PS_DELIVERY_PREFIX' => array(
+						'title' => $this->l('Delivery prefix:'),
+						'desc' => $this->l('Prefix used for delivery slips'),
+						'size' => 6,
+						'type' => 'textLang'
+					),
+					'PS_DELIVERY_NUMBER' => array(
+						'title' => $this->l('Delivery number:'),
+						'desc' => $this->l('The next delivery slip will begin with this number, and then increase with each additional slip'),
+						'size' => 6,
+						'type' => 'text'
+					)
+				),
+				'submit' => array()
+			)
+		);
+
+		parent::__construct();
+	}
+
+	public function initForm()
+	{
+		$this->fields_form = array(
+			'title' => $this->l('Print PDF delivery slips'),
+			'input' => array(
+				array(
+					'type' => 'text',
+					'label' => $this->l('From:'),
+					'name' => 'date_from',
+					'size' => 20,
+					'maxlength' => 10,
+					'required' => true,
+					'p' => $this->l('Format: 2007-12-31 (inclusive)')
+				),
+				array(
+					'type' => 'text',
+					'label' => $this->l('To:'),
+					'name' => 'date_to',
+					'size' => 20,
+					'maxlength' => 10,
+					'required' => true,
+					'p' => $this->l('Format: 2008-12-31 (inclusive)')
+				)
+			),
+			'submit' => array(
+				'title' => $this->l('Generate PDF file'),
+				'class' => 'button'
+			)
+		);
+
+		$this->fields_value = array(
+			'date_from' => date('Y-m-d'),
+			'date_to' => date('Y-m-d')
+		);
+	}
+
+	public function postProcess()
+	{
+		if (Tools::isSubmit('submitPrint'))
+		{
+			if (!Validate::isDate(Tools::getValue('date_from')))
+				$this->_errors[] = Tools::displayError('Invalid from date');
+			if (!Validate::isDate(Tools::getValue('date_to')))
+				$this->_errors[] = Tools::displayError('Invalid end date');
+			if (!count($this->_errors))
+			{
+				$orders = Order::getOrdersIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'), null, 'delivery');
+				if (count($orders))
+					Tools::redirectAdmin('pdf.php?deliveryslips='.urlencode(serialize($orders)).'&token='.$this->token);
+				else
+					$this->_errors[] = Tools::displayError('No delivery slip found for this period');
+			}
+		}
+		else
+			parent::postProcess();
+	}
+
+	public function initContent()
+	{
+		$this->initForm();
+		$helper = new HelperForm();
+		// Check if form template has been overriden
+		if (file_exists($this->context->smarty->template_dir[0].'/'.$this->tpl_folder.'form.tpl'))
+			$helper->tpl = $this->tpl_folder.'form.tpl';
+		$helper->currentIndex = self::$currentIndex;
+		$helper->token = $this->token;
+		$helper->table = $this->table;
+		$helper->identifier = $this->identifier;
+		$helper->languages = $this->_languages;
+		$helper->submit_action = 'submitPrint';
+		$helper->no_back = true;
+		$helper->default_form_language = $this->default_form_language;
+		$helper->allow_employee_form_lang = $this->allow_employee_form_lang;
+		$helper->fields_value = $this->fields_value;
+		$this->content .= $helper->generateForm($this->fields_form);
+
+		parent::initContent();
+	}
+
+}
+
+