diff --git a/sale_rental/__init__.py b/sale_rental/__init__.py
new file mode 100644
index 00000000000..09b1d640f0e
--- /dev/null
+++ b/sale_rental/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Sale Rental module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import rental
+from . import wizard
diff --git a/sale_rental/__openerp__.py b/sale_rental/__openerp__.py
new file mode 100644
index 00000000000..4af661eeaa1
--- /dev/null
+++ b/sale_rental/__openerp__.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Rental module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Rental',
+    'version': '0.1',
+    'category': 'Sales Management',
+    'license': 'AGPL-3',
+    'summary': 'Manage Rental of Products',
+    'description': """
+Rental
+======
+
+This module will allows you to rent products with OpenERP. On the form view of a stockable product or consumable, there is a wizard to generate the corresponding rental service. On the warehouse, you have two additionnal stock locations: *Rental In* (stock of products to rent) and *Rental Out* (products currently rented).
+
+In a sale order line, if you select a rental service, you can :
+
+* create a new rental with a start date and an end date: when the sale order is confirmed, it will generate a delivery order and an incoming shipment.
+
+* extend an existing rental: the incoming shipment will be postponed to the end date of the extension.
+
+In a sale order line, if you select a product that has a corresponding rental service, you can decide to sell the rented product that the customer already has. If the sale order is confirmed, the incoming shipment will be cancelled and a new delivery order will be created with a stock move from *Rental Out* to *Customers*.
+
+Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['sale_start_end_dates', 'stock'],
+    'data': [
+        'sale_view.xml',
+        'stock_view.xml',
+        'rental_view.xml',
+        'rental_data.xml',
+        'wizard/create_rental_product_view.xml',
+        'product_view.xml',
+        'security/ir.model.access.csv',
+    ],
+    'installable': True,
+    'active': False,
+}
diff --git a/sale_rental/product_view.xml b/sale_rental/product_view.xml
new file mode 100644
index 00000000000..3a4bf03c31f
--- /dev/null
+++ b/sale_rental/product_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <alexis.delattre@akretion.com>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="product_normal_form_view" model="ir.ui.view">
+    <field name="name">rental.product.product.form</field>
+    <field name="model">product.product</field>
+    <field name="inherit_id" ref="product.product_normal_form_view" />
+    <field name="arch" type="xml">
+        <notebook position="inside">
+            <page name="rental" string="Rental">
+                <group name="rental-service"
+                    attrs="{'invisible': [('type', '!=', 'service')]}">
+                    <field name="rented_product_id"/>
+                </group>
+                <group name="rental-product"
+                    attrs="{'invisible': [('type', '=', 'service')]}"
+                    string="Related Rental Services" col="1">
+                    <field name="rental_service_ids" nolabel="1"/>
+                    <button type="action"
+                        name="%(create_rental_product_action)d"
+                        string="Create Rental Service" />
+                </group>
+            </page>
+        </notebook>
+    </field>
+</record>
+
+
+</data>
+</openerp>
diff --git a/sale_rental/rental.py b/sale_rental/rental.py
new file mode 100644
index 00000000000..97de4a8e357
--- /dev/null
+++ b/sale_rental/rental.py
@@ -0,0 +1,543 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Sale Rental module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+from openerp import netsvc
+from datetime import datetime, timedelta
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from dateutil.relativedelta import relativedelta
+import logging
+
+logger = logging.getLogger(__name__)
+# TODO : block if we sell a rented product already sold => state
+
+
+class product_product(orm.Model):
+    _inherit = 'product.product'
+
+    _columns = {
+        # Link rental service -> rented HW product
+        'rented_product_id': fields.many2one(
+            'product.product', 'Related Rented Product',
+            domain=[('type', 'in', ('product', 'consu'))]),
+        # Link rented HW product -> rental service
+        'rental_service_ids': fields.one2many(
+            'product.product', 'rented_product_id', 'Related Rental Services'),
+        }
+
+    def _check_rental(self, cr, uid, ids):
+        for product in self.browse(cr, uid, ids):
+            if product.rented_product_id and product.type != 'service':
+                raise orm.except_orm(
+                    _("Error:"),
+                    _("The rental product '%s' must be of type 'Service'.")
+                    % product.name)
+            if product.rented_product_id and not product.must_have_dates:
+                raise orm.except_orm(
+                    _("Error:"),
+                    _("The rental product '%s' must have the option "
+                        "''Must Have Start and End Dates' checked.")
+                    % product.name)
+            (model, time_uom_categ_id) = self.pool['ir.model.data'].\
+                get_object_reference(cr, uid, 'product', 'uom_categ_wtime')
+            assert model == 'product.uom.categ', 'Must be a product uom categ'
+            if (
+                    product.rented_product_id and
+                    product.uom_id.category_id.id != time_uom_categ_id):
+                raise orm.except_orm(
+                    _("Error:"),
+                    _("The rental product '%s' must have a unit of measure "
+                        "that belong to the 'Time' category.")
+                    % product.name)
+        return True
+
+    _constraints = [(
+        _check_rental, "error msg in raise",
+        ['rented_product_id', 'must_have_dates']
+    )]
+
+
+class sale_order(orm.Model):
+    _inherit = 'sale.order'
+
+    def _prepare_order_line_procurement(
+            self, cr, uid, order, line, move_id, date_planned, context=None):
+        if context is None:
+            context = {}
+        res = super(sale_order, self)._prepare_order_line_procurement(
+            cr, uid, order, line, move_id, date_planned, context=context)
+        if context.get('rent') == 'out':
+            res.update({
+                'product_id': line.product_id.rented_product_id.id,
+                'product_qty': 1,
+                'product_uos_qty': 1,
+                'product_uom': line.product_id.rented_product_id.uom_id.id,
+                'product_uos': line.product_id.rented_product_id.uom_id.id,
+                'location_id':
+                order.shop_id.warehouse_id.rental_in_location_id.id,
+                #'procure_method': , #?????
+                })
+        return res
+
+    def _prepare_order_line_move(
+            self, cr, uid, order, line, picking_id, date_planned,
+            context=None):
+        if context is None:
+            context = {}
+        res = super(sale_order, self)._prepare_order_line_move(
+            cr, uid, order, line, picking_id, date_planned, context=context)
+        rent_type = context.get('rent')
+        if rent_type:
+            loc_rent_in = order.shop_id.warehouse_id.rental_in_location_id.id
+            loc_rent_out = order.shop_id.warehouse_id.rental_out_location_id.id
+            if rent_type == 'out':
+                location_id = loc_rent_in
+                location_dest_id = loc_rent_out
+            elif rent_type == 'in':
+                location_id = loc_rent_out
+                location_dest_id = loc_rent_in
+            res.update({
+                'product_id': line.product_id.rented_product_id.id,
+                'product_qty': 1,
+                'product_uos_qty': 1,
+                'product_uom': line.product_id.rented_product_id.uom_id.id,
+                'product_uos': line.product_id.rented_product_id.uom_id.id,
+                'location_id': location_id,
+                'location_dest_id': location_dest_id,
+                'product_packaging': (
+                    line.product_id.rented_product_id.packaging
+                    and line.product_id.rented_product_id.packaging[0].id
+                    or False),
+                'price_unit':
+                line.product_id.rented_product_id.standard_price or 0.0,
+                'move_dest_id': context.get('in_move_id', False),
+                })
+        if line.sell_rental_id:
+            res.update({
+                'prodlot_id': line.sell_rental_id.prodlot_id.id,
+                'location_id':
+                order.shop_id.warehouse_id.rental_out_location_id.id,
+                })
+        return res
+
+    def _prepare_order_picking_rent_in(
+            self, cr, uid, order, date, context=None):
+        return {
+            'name': self.pool['ir.sequence'].get(cr, uid, 'stock.picking.in'),
+            'origin': order.name,
+            'date': self.date_to_datetime(cr, uid, date, context),
+            'type': 'in',
+            'state': 'auto',
+            'move_type': order.picking_policy,
+            'sale_id': order.id,
+            'partner_id': order.partner_shipping_id.id,
+            'note': order.note,
+            'invoice_state': 'none',
+            'company_id': order.company_id.id,
+        }
+
+    def _prepare_rental(self, cr, uid, line, out_move_id, context=None):
+        return {
+            'start_order_line_id': line.id,
+            'out_move_id': out_move_id,
+            }
+
+    def _create_pickings_and_procurements(
+            self, cr, uid, order, order_lines, picking_id=False, context=None):
+        picking_obj = self.pool['stock.picking']
+        proc_obj = self.pool['procurement.order']
+        move_obj = self.pool['stock.move']
+        wf_service = netsvc.LocalService("workflow")
+        if context is None:
+            context = {}
+        picking_out_id = False
+        picking_in_dict = {}  # key = date ; value = ID
+        proc_ids = []
+        rent_out_ctx = context.copy()
+        rent_out_ctx['rent'] = 'out'
+        rent_in_ctx = context.copy()
+        rent_in_ctx['rent'] = 'in'
+        for line in order_lines:
+            if line.sell_rental_id:
+                # Cancel return picking
+                wf_service.trg_validate(
+                    uid, 'stock.picking', line.sell_rental_id.in_picking_id.id,
+                    'button_cancel', cr)
+            if line.product_id.rented_product_id:
+                if line.rental_type == 'rental_extension':
+                    if not line.extension_rental_id:
+                        raise orm.except_orm(
+                            _('Error:'),
+                            _("Missing Rental Extension for Sale Order Line "
+                                "with description '%s'")
+                            % line.name)
+                    new_datetime = self.date_to_datetime(
+                        cr, uid, line.end_date, context)
+                    move_obj.write(
+                        cr, uid, line.extension_rental_id.in_move_id.id, {
+                            'date': new_datetime,
+                            'date_expected': new_datetime,
+                        }, context=context)
+                    picking_obj.write(
+                        cr, uid, line.extension_rental_id.in_picking_id.id, {
+                            'date': line.end_date,
+                        }, context=context)
+                elif line.rental_type == 'new_rental':
+                    start_datetime = self.date_to_datetime(
+                        cr, uid, line.start_date, context)
+                    date_planned = datetime.strptime(
+                        start_datetime, DEFAULT_SERVER_DATETIME_FORMAT)
+                    date_planned = (
+                        date_planned - timedelta(
+                            days=order.company_id.security_lead)).strftime(
+                        DEFAULT_SERVER_DATETIME_FORMAT)
+
+                    if not picking_out_id:
+                        picking_out_id = picking_obj.create(
+                            cr, uid, self._prepare_order_picking(
+                                cr, uid, order, context=rent_out_ctx),
+                            context=context)
+                        # No pb to keep the native code, unless for date
+                        # but if we have both in the same...
+
+                    # Create return picking
+                    if line.end_date not in picking_in_dict:
+                        picking_in_id = picking_obj.create(
+                            cr, uid, self._prepare_order_picking_rent_in(
+                                cr, uid, order, line.end_date,
+                                context=context),
+                            context=context)
+                        picking_in_dict[line.end_date] = picking_in_id
+                    else:
+                        picking_in_id = picking_in_dict[line.end_date]
+
+                    end_datetime = self.date_to_datetime(
+                        cr, uid, line.end_date, context)
+
+                    in_move_id = move_obj.create(
+                        cr, uid, self._prepare_order_line_move(
+                            cr, uid, order, line, picking_in_id,
+                            end_datetime, context=rent_in_ctx),
+                        context=context)
+
+                    # Create outgoing picking
+                    rent_out_ctx['in_move_id'] = in_move_id
+                    out_move_id = move_obj.create(
+                        cr, uid, self._prepare_order_line_move(
+                            cr, uid, order, line, picking_out_id,
+                            date_planned, context=rent_out_ctx),
+                        context=context)
+                    proc_id = proc_obj.create(
+                        cr, uid, self._prepare_order_line_procurement(
+                            cr, uid, order, line, out_move_id,
+                            date_planned, context=rent_out_ctx),
+                        context=context)
+                    proc_ids.append(proc_id)
+                    line.write({'procurement_id': proc_id})
+#                    self.ship_recreate(
+#                        cr, uid, order, line, out_move_id, proc_id)
+
+                    self.pool['sale.rental'].create(
+                        cr, uid, self._prepare_rental(
+                            cr, uid, line, out_move_id, context=context),
+                        context=context)
+
+        for proc_id in proc_ids:
+            wf_service.trg_validate(
+                uid, 'procurement.order', proc_id, 'button_confirm', cr)
+        for picking_in_id in picking_in_dict.values():
+            wf_service.trg_validate(
+                uid, 'stock.picking', picking_in_id, 'button_confirm', cr)
+        res = super(sale_order, self)._create_pickings_and_procurements(
+            cr, uid, order, order_lines, picking_id=picking_out_id,
+            context=context)
+        return res
+
+
+class sale_order_line(orm.Model):
+    _inherit = 'sale.order.line'
+
+    _columns = {
+        'rental': fields.boolean('Rental'),
+        'can_sell_rental': fields.boolean('Can Sell from Rental'),
+        'rental_type': fields.selection([
+            ('new_rental', 'New Rental'),
+            ('rental_extension', 'Rental Extension'),
+            ], 'Rental Type',
+            readonly=True, states={'draft': [('readonly', False)]}),
+        'extension_rental_id': fields.many2one(
+            'sale.rental', 'Rental to Extend'),
+        'sell_rental_id': fields.many2one(
+            'sale.rental', 'Rental to Sell'),
+        # TODO : related one2many + impact sur rental
+        }
+
+    def start_end_dates_change(
+            self, cr, uid, ids, start_date, end_date, product_id,
+            product_uom_qty, context=None):
+        res = super(sale_order_line, self).start_end_dates_change(
+            cr, uid, ids, start_date, end_date, product_id,
+            product_uom_qty, context=context)
+        if 'value' not in res:
+            res['value'] = {}
+        if start_date and end_date and product_id:
+            product = self.pool['product.product'].browse(
+                cr, uid, product_id, context=context)
+            if product.rented_product_id:
+                start_date_dt = datetime.strptime(
+                    start_date, DEFAULT_SERVER_DATE_FORMAT)
+                end_date_dt = datetime.strptime(
+                    end_date, DEFAULT_SERVER_DATE_FORMAT)
+                days_qty = (end_date_dt - start_date_dt).days + 1
+                res['value']['product_uom_qty'] = days_qty
+        return res
+
+    def product_id_change(
+            self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False,
+            fiscal_position=False, flag=False, context=None):
+        res = super(sale_order_line, self).product_id_change(
+            cr, uid, ids, pricelist, product, qty=qty, uom=uom,
+            qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
+            lang=lang, update_tax=update_tax, date_order=date_order,
+            packaging=packaging, fiscal_position=fiscal_position,
+            flag=flag, context=context)
+        if not product:
+            res['value'].update({
+                'rental_type': False,
+                'rental': False,
+                'can_sell_rental': False,
+                'sell_rental_id': False,
+                })
+        else:
+            product_o = self.pool['product.product'].browse(
+                cr, uid, product, context=context)
+            if product_o.rented_product_id:
+                res['value'].update({
+                    'rental': True,
+                    })
+            else:
+                res['value'].update({
+                    'rental_type': False,
+                    'rental': False,
+                    })
+            if product_o.rental_service_ids:
+                res['value']['can_sell_rental'] = True
+            else:
+                res['value'].update({
+                    'can_sell_rental': False,
+                    'sell_rental_id': False,
+                    })
+        return res
+
+    def rental_type_change(
+            self, cr, uid, ids, rental_type, product_id, context=None):
+        return {}
+
+    def extension_rental_id_change(
+            self, cr, uid, ids, rental_type, extension_rental_id,
+            product_id, start_date, end_date, context=None):
+        res = {'value': {}}
+        if (
+                product_id
+                and rental_type == 'rental_extension'
+                and extension_rental_id):
+            rental_ext = self.pool['sale.rental'].browse(
+                cr, uid, extension_rental_id, context=context)
+            if rental_ext.rental_product_id.id != product_id:
+                raise orm.except_orm(
+                    _('Error'),
+                    _("The Rental Service of the Rental Extension you just "
+                        "selected is '%s' and it's not the same as the "
+                        "Product currently selected in this Sale Order Line.")
+                    % rental_ext.rental_product_id.name)
+            initial_end_date_str = rental_ext.end_date
+            initial_end_date = datetime.strptime(
+                initial_end_date_str, DEFAULT_SERVER_DATE_FORMAT)
+            start_date = initial_end_date + relativedelta(days=1)
+            res['value']['start_date'] = start_date.strftime(
+                DEFAULT_SERVER_DATE_FORMAT)
+        return res
+
+
+class sale_rental(orm.Model):
+    _name = 'sale.rental'
+    _description = "Rental"
+    _order = "id desc"
+
+    def name_get(self, cr, uid, ids, context=None):
+        res = []
+        for rental in self.browse(cr, uid, ids, context=context):
+            res.append((
+                rental.id,
+                u'[%s] %s (%s - %s)'
+                % (
+                    rental.partner_id.name,
+                    rental.rented_product_id.name,
+                    rental.start_date,
+                    rental.end_date)))
+        return res
+
+    def _compute_end_date(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for rental in self.browse(cr, uid, ids, context=context):
+            end_date = False
+            if rental.extension_order_line_ids:
+                for extension in rental.extension_order_line_ids:
+                    if extension.state not in ('cancel', 'draft'):
+                        if extension.end_date > end_date:
+                            end_date = extension.end_date
+            if not end_date and rental.start_order_line_id:
+                end_date = rental.start_order_line_id.end_date
+            res[rental.id] = end_date
+        return res
+
+    _columns = {
+        'start_order_line_id': fields.many2one(
+            'sale.order.line', 'Rental Sale Order Line'),
+        'start_date': fields.related(
+            'start_order_line_id', 'start_date',
+            type='date', string='Start Date', readonly=True),
+        'rental_product_id': fields.related(
+            'start_order_line_id', 'product_id',
+            type='many2one', relation='product.product',
+            string="Rental Service", readonly=True),
+        'rented_product_id': fields.related(
+            'rental_product_id', 'rented_product_id',
+            type='many2one', relation='product.product',
+            string="Rented Product", readonly=True),
+        'start_order_id': fields.related(
+            'start_order_line_id', 'order_id',
+            type='many2one', relation='sale.order',
+            string='Rental Sale Order', readonly=True),
+        'company_id': fields.related(
+            'start_order_id', 'company_id',
+            type='many2one', relation='res.company', string='Company',
+            readonly=True),
+        'partner_id': fields.related(
+            'start_order_id', 'partner_id',
+            type='many2one', relation='res.partner', string='Partner',
+            readonly=True),
+        'out_move_id': fields.many2one('stock.move', 'Outgoing Stock Move'),
+        'in_move_id': fields.related(
+            'out_move_id', 'move_dest_id', type='many2one',
+            relation='stock.move', string='Return Stock Move', readonly=True),
+        'out_state': fields.related(
+            'out_move_id', 'state',
+            type='selection', string='State of the Outgoing Stock Move',
+            selection=[
+                ('draft', 'New'),
+                ('cancel', 'Cancelled'),
+                ('waiting', 'Waiting Another Move'),
+                ('confirmed', 'Waiting Availability'),
+                ('assigned', 'Available'),
+                ('done', 'Done'),
+                ], readonly=True),
+        'in_state': fields.related(
+            'in_move_id', 'state',
+            type='selection', string='State of the Return Stock Move',
+            selection=[
+                ('draft', 'New'),
+                ('cancel', 'Cancelled'),
+                ('waiting', 'Waiting Another Move'),
+                ('confirmed', 'Waiting Availability'),
+                ('assigned', 'Available'),
+                ('done', 'Done'),
+                ], readonly=True),
+        'out_picking_id': fields.related(
+            'out_move_id', 'picking_id',
+            type='many2one', relation='stock.picking', string='Delivery Order',
+            readonly=True),
+        'in_picking_id': fields.related(
+            'in_move_id', 'picking_id',
+            type='many2one', relation='stock.picking', string='Return Picking',
+            readonly=True),
+        'prodlot_id': fields.related(
+            'out_move_id', 'prodlot_id',
+            type='many2one', relation='stock.production.lot',
+            string='Serial Number', readonly=True),
+        'extension_order_line_ids': fields.one2many(
+            'sale.order.line', 'extension_rental_id',
+            'Rental Extensions', readonly=True),
+        'sell_order_line_ids': fields.one2many(
+            'sale.order.line', 'sell_rental_id',
+            'Sell Rented Product', readonly=True),
+        'end_date': fields.function(
+            _compute_end_date, type='date',
+            string='End Date (extensions included)',
+            help="End Date of the Rental, taking into account all the "
+            "extensions sold to the customer."),
+        # 'state':  # TODO
+        }
+
+
+class stock_warehouse(orm.Model):
+    _inherit = "stock.warehouse"
+    _columns = {
+        'rental_in_location_id': fields.many2one(
+            'stock.location', 'Rental Input',
+            domain=[('usage', '<>', 'view')]),
+        'rental_out_location_id': fields.many2one(
+            'stock.location', 'Rental Output',
+            domain=[('usage', '<>', 'view')]),
+    }
+
+
+class stock_move(orm.Model):
+    _inherit = 'stock.move'
+
+    _columns = {
+        'sale_rental_ids': fields.one2many(
+            'sale.rental', 'out_move_id', 'Rentals', readonly=True),
+        }
+
+    def action_done(self, cr, uid, ids, context=None):
+        '''Copy prodlot from outgoing move to incoming move'''
+        res = super(stock_move, self).action_done(
+            cr, uid, ids, context=context)
+        for move in self.browse(cr, uid, ids, context=context):
+            if (
+                    move.state == 'done'
+                    and move.move_dest_id
+                    and move.sale_rental_ids
+                    and move.prodlot_id
+                    and not move.move_dest_id.prodlot_id):
+                self.write(
+                    cr, uid, move.move_dest_id.id, {
+                        'prodlot_id': move.prodlot_id.id,
+                    }, context=context)
+        return res
+
+
+class stock_picking(orm.Model):
+    _inherit = 'stock.picking'
+
+    # When we invoice from delivery, we shouldn't invoice the rented product
+    # Beware of this: https://bugs.launchpad.net/openobject-addons/+bug/1167330
+    # It will work if your code of the addons/7.0 is after 2013-12-26
+    def _invoice_line_hook(self, cr, uid, move_line, invoice_line_id):
+        if move_line.sale_line_id.rental:
+            self.pool['account.invoice.line'].unlink(cr, uid, invoice_line_id)
+        return
diff --git a/sale_rental/rental_data.xml b/sale_rental/rental_data.xml
new file mode 100644
index 00000000000..ae2bb1606d3
--- /dev/null
+++ b/sale_rental/rental_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <alexis.delattre@akretion.com>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data noupdate="1">
+
+
+<record id="rental_in_stock_location" model="stock.location">
+    <field name="name">Rental In</field>
+    <field name="location_id" ref="stock.stock_location_company"/>
+</record>
+
+<record id="rental_out_stock_location" model="stock.location">
+    <field name="name">Rental Out</field>
+    <field name="location_id" ref="stock.stock_location_company"/>
+</record>
+
+<record id="stock.warehouse0" model="stock.warehouse">
+    <field name="rental_in_location_id" ref="rental_in_stock_location"/>
+    <field name="rental_out_location_id" ref="rental_out_stock_location"/>
+</record>
+
+
+</data>
+</openerp>
diff --git a/sale_rental/rental_view.xml b/sale_rental/rental_view.xml
new file mode 100644
index 00000000000..19fdf73543a
--- /dev/null
+++ b/sale_rental/rental_view.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <alexis.delattre@akretion.com>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<record id="sale_rental_form" model="ir.ui.view">
+    <field name="name">sale.rental.form</field>
+    <field name="model">sale.rental</field>
+    <field name="arch" type="xml">
+        <form string="Rental" version="7.0">
+            <group name="main">
+                <field name="partner_id" />
+                <field name="rental_product_id" />
+                <field name="rented_product_id" />
+                <field name="start_date" />
+                <field name="end_date" />
+                <field name="start_order_line_id" />
+                <field name="start_order_id" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </group>
+            <group name="extensions" string="Rental Extensions">
+                <field name="extension_order_line_ids" nolabel="1">
+                    <tree>
+                        <field name="order_id"/>
+                        <field name="order_partner_id"/>
+                        <field name="name"/>
+                        <field name="start_date"/>
+                        <field name="end_date"/>
+                        <field name="product_uom_qty"/>
+                        <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                        <field name="price_subtotal" sum="Total"/>
+                        <field name="state"/>
+                        <field name="invoiced"/>
+                    </tree>
+                </field>
+            </group>
+            <group name="stock-out" string="Delivery">
+                <field name="out_move_id" />
+                <field name="out_state" />
+                <field name="out_picking_id" />
+                <field name="prodlot_id" />
+            </group>
+            <group name="stock-in" string="Return">
+                <field name="in_move_id" />
+                <field name="in_state" />
+                <field name="in_picking_id" />
+            </group>
+            <group name="sell" string="Sell Rented Product">
+                <field name="sell_order_line_ids" nolabel="1"/>
+            </group>
+        </form>
+    </field>
+</record>
+
+<record id="sale_rental_tree" model="ir.ui.view">
+    <field name="name">sale.rental.tree</field>
+    <field name="model">sale.rental</field>
+    <field name="arch" type="xml">
+        <tree string="Rentals">
+            <field name="partner_id"/>
+            <field name="rented_product_id"/>
+            <field name="start_date"/>
+            <field name="out_state" string="Delivery"/>
+            <field name="end_date" string="End Date"/>
+            <field name="in_state" string="Return"/>
+        </tree>
+    </field>
+</record>
+
+<record id="sale_rental_action" model="ir.actions.act_window">
+    <field name="name">Rentals</field>
+    <field name="res_model">sale.rental</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">tree,form</field>
+</record>
+
+<menuitem id="sale_rental_menu" parent="base.menu_sales"
+    action="sale_rental_action" sequence="90"/>
+
+</data>
+</openerp>
diff --git a/sale_rental/sale_view.xml b/sale_rental/sale_view.xml
new file mode 100644
index 00000000000..5ed9a713eac
--- /dev/null
+++ b/sale_rental/sale_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <alexis.delattre@akretion.com>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<record id="view_order_form" model="ir.ui.view">
+    <field name="name">rental.view_order_form</field>
+    <field name="model">sale.order</field>
+    <field name="inherit_id" ref="sale.view_order_form" />
+    <field name="priority">100</field> <!-- inherit after sale_start_end_dates, to have the rental fields above the dates field -->
+    <field name="arch" type="xml">
+        <xpath expr="//field[@name='order_line']/form/group/group/field[@name='product_id']" position="after">
+            <field name="rental_type"
+                attrs="{'invisible': [('rental', '=', False)], 'required': [('rental', '=', True)]}"
+                on_change="rental_type_change(rental_type, product_id, context)"/>
+            <field name="extension_rental_id"
+                attrs="{'invisible': [('rental_type', '!=', 'rental_extension')], 'required': [('rental_type', '=', 'rental_extension')]}"
+                on_change="extension_rental_id_change(rental_type, extension_rental_id, product_id, start_date, end_date, context)"
+                domain="[('rental_product_id', '=', product_id)]" />
+            <field name="sell_rental_id"
+                attrs="{'invisible': [('can_sell_rental', '=', False)]}"
+                domain="[('rented_product_id', '=', product_id)]"/>
+            <field name="rental" invisible="1"/>
+            <field name="can_sell_rental" invisible="1"/>
+        </xpath>
+    </field>
+</record>
+
+
+</data>
+</openerp>
diff --git a/sale_rental/security/ir.model.access.csv b/sale_rental/security/ir.model.access.csv
new file mode 100644
index 00000000000..d08d36e7030
--- /dev/null
+++ b/sale_rental/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_rental_user,Read-Write-Create access on sale.rental to Sale User,model_sale_rental,base.group_sale_salesman,1,1,1,0
+access_sale_rental_managerr,Full access on sale.rental to Sale Manager,model_sale_rental,base.group_sale_manager,1,1,1,1
diff --git a/sale_rental/stock_view.xml b/sale_rental/stock_view.xml
new file mode 100644
index 00000000000..67f874ea296
--- /dev/null
+++ b/sale_rental/stock_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <alexis.delattre@akretion.com>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<record id="view_warehouse" model="ir.ui.view">
+    <field name="name">rental.warehouse.form</field>
+    <field name="model">stock.warehouse</field>
+    <field name="inherit_id" ref="stock.view_warehouse" />
+    <field name="arch" type="xml">
+        <field name="lot_output_id" position="after">
+            <field name="rental_in_location_id" groups="stock.group_locations"/>
+            <field name="rental_out_location_id" groups="stock.group_locations"/>
+        </field>
+    </field>
+</record>
+
+
+</data>
+</openerp>
diff --git a/sale_rental/wizard/__init__.py b/sale_rental/wizard/__init__.py
new file mode 100644
index 00000000000..75116f62db3
--- /dev/null
+++ b/sale_rental/wizard/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Sale Rental module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import create_rental_product
diff --git a/sale_rental/wizard/create_rental_product.py b/sale_rental/wizard/create_rental_product.py
new file mode 100644
index 00000000000..7ee805e49e0
--- /dev/null
+++ b/sale_rental/wizard/create_rental_product.py
@@ -0,0 +1,103 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Sale Rental module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+
+
+class create_rental_product(orm.TransientModel):
+    _name = 'create.rental.product'
+    _description = 'Create the Rental Service Product'
+
+    _columns = {
+        'sale_price_per_day': fields.float(
+            'Sale Price per Day', required=True,
+            digits_compute=dp.get_precision('Product Price')),
+        # I would like to translate the field 'name_prefix', but
+        # it doesn't seem to work in a wizard
+        'name_prefix': fields.char(
+            'Product Name Prefix', size=64, required=True),
+        'default_code_prefix': fields.char(
+            'Prefix for Default Code', size=16, required=True),
+        'categ_id': fields.many2one(
+            'product.category', 'Product Category', required=True),
+        }
+
+    _defaults = {
+        'sale_price_per_day': 1.0,
+        'default_code_prefix': 'RENT-',
+        'name_prefix': 'Rental of one ',
+    }
+
+    def create_rental_product(self, cr, uid, ids, context=None):
+        assert len(ids) == 1, 'Only 1 ID'
+        if context is None:
+            context = {}
+        #  check that a rental product doesn't already exists ?
+        hw_product_id = context.get('active_id')
+        pp_obj = self.pool['product.product']
+        hw_product = pp_obj.browse(cr, uid, hw_product_id, context=context)
+        assert isinstance(hw_product_id, int), 'Active ID is not set'
+        wiz = self.browse(cr, uid, ids[0], context=context)
+        (uom_model, day_uom_id) = self.pool['ir.model.data'].\
+            get_object_reference(cr, uid, 'product', 'product_uom_day')
+        assert uom_model == 'product.uom', 'Must be product.uom'
+
+        product_id = pp_obj.create(cr, uid, {
+            'type': 'service',
+            'sale_ok': True,
+            'purchase_ok': False,
+            'uom_id': day_uom_id,
+            'uom_po_id': day_uom_id,
+            'list_price': wiz.sale_price_per_day,
+            'name': '%s%s' % (
+                wiz.name_prefix and wiz.name_prefix + ' ' or '',
+                hw_product.name),
+            'default_code': '%s%s' % (
+                wiz.default_code_prefix or '',
+                hw_product.default_code),
+            'rented_product_id': hw_product_id,
+            'must_have_dates': True,
+            'categ_id': wiz.categ_id.id,
+            }, context=context)
+
+#        lang_ids = self.pool['res.lang'].search(cr, uid, [], context=context)
+#        for lang in self.pool['res.lang'].browse(
+#                cr, uid, lang_ids, context=context):
+#            ctx_lang = context.copy()
+#            ctx_lang['lang'] = ctx_lang.code
+#            wiz_lang = self.browse(cr, uid, ids[0], context=ctx_lang)
+#            pp_obj.write(cr, uid, product_id, {
+#                'name': '%s%s' % (
+#                    wiz.name_prefix and wiz.name_prefix + ' ' or '',
+#                    hw_product.name),
+#                }, context=ctx_lang)
+        return {
+            'name': pp_obj._description,
+            'type': 'ir.actions.act_window',
+            'res_model': pp_obj._name,
+            'view_type': 'form',
+            'view_mode': 'form,tree,kanban',
+            'nodestroy': False,  # Close the wizard pop-up
+            'target': 'current',
+            'res_id': product_id,
+            }
diff --git a/sale_rental/wizard/create_rental_product_view.xml b/sale_rental/wizard/create_rental_product_view.xml
new file mode 100644
index 00000000000..c2b4de310a3
--- /dev/null
+++ b/sale_rental/wizard/create_rental_product_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <alexis.delattre@akretion.com>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="create_rental_product_form" model="ir.ui.view">
+    <field name="name">rental.product.product.form</field>
+    <field name="model">create.rental.product</field>
+    <field name="arch" type="xml">
+        <form string="Create Rental Service" version="7.0">
+            <group>
+                <field name="name_prefix"/>
+                <field name="default_code_prefix"/>
+                <field name="categ_id"/>
+                <field name="sale_price_per_day"/>
+            </group>
+            <footer>
+                <button name="create_rental_product" string="Create" type="object" class="oe_highlight"/>
+                <button special="cancel" string="Cancel" class="oe_link"/>
+            </footer>
+        </form>
+    </field>
+</record>
+
+<record id="create_rental_product_action" model="ir.actions.act_window">
+    <field name="name">Create Rental Service</field>
+    <field name="res_model">create.rental.product</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">form</field>
+    <field name="target">new</field>
+</record>
+
+</data>
+</openerp>
diff --git a/sale_start_end_dates/__init__.py b/sale_start_end_dates/__init__.py
new file mode 100644
index 00000000000..e3fa3783da1
--- /dev/null
+++ b/sale_start_end_dates/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Sale Start End Dates module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import sale
diff --git a/sale_start_end_dates/__openerp__.py b/sale_start_end_dates/__openerp__.py
new file mode 100644
index 00000000000..cb2154a5d83
--- /dev/null
+++ b/sale_start_end_dates/__openerp__.py
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Sale Start End Dates module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Sale Start End Dates',
+    'version': '0.1',
+    'category': 'Sales Management',
+    'license': 'AGPL-3',
+    'summary': 'Adds start date and end date on sale order lines',
+    'description': """
+Sale Start End Dates
+====================
+
+This module adds start date and end dates on sale order lines. The value of these field is copied to the start date and end date of invoice lines. This module is designed to be used with other modules such as sale_rental.
+
+Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['account_cutoff_prepaid'],
+    'data': [
+        'sale_view.xml',
+    ],
+    'installable': True,
+    'active': False,
+}
diff --git a/sale_start_end_dates/sale.py b/sale_start_end_dates/sale.py
new file mode 100644
index 00000000000..77e01396f72
--- /dev/null
+++ b/sale_start_end_dates/sale.py
@@ -0,0 +1,127 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Sale Start End Dates module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+
+class sale_order_line(orm.Model):
+    _inherit = 'sale.order.line'
+
+    _columns = {
+        'start_date': fields.date(
+            'Start Date',
+            readonly=True, states={'draft': [('readonly', False)]}),
+        'end_date': fields.date(
+            'End Date',
+            readonly=True, states={'draft': [('readonly', False)]}),
+        'must_have_dates': fields.boolean(
+            'Must Have Start and End Dates',
+            readonly=True, states={'draft': [('readonly', False)]}),
+        }
+
+    def _check_start_end_dates(self, cr, uid, ids):
+        for line in self.browse(cr, uid, ids):
+            if line.start_date and not line.end_date:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Missing End Date for sale order line with "
+                        "Description '%s'.")
+                    % (line.name))
+            if line.end_date and not line.start_date:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Missing Start Date for sale order line with "
+                        "Description '%s'.")
+                    % (line.name))
+            if line.end_date and line.start_date and \
+                    line.start_date > line.end_date:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Start Date should be before or be the same as "
+                        "End Date for sale order line with Description '%s'.")
+                    % (line.name))
+        return True
+
+# TODO check must_have_dates on SO validation ? or in constraint ?
+
+    _constraints = [
+        (_check_start_end_dates, "Error msg in raise",
+            ['start_date', 'end_date', 'product_id']),
+        ]
+
+    def _prepare_order_line_invoice_line(
+            self, cr, uid, line, account_id=False, context=None):
+        res = super(sale_order_line, self)._prepare_order_line_invoice_line(
+            cr, uid, line, account_id=account_id, context=context)
+        if line.must_have_dates:
+            res.update({
+                'start_date': line.start_date,
+                'end_date': line.end_date,
+                })
+        return res
+
+    def start_end_dates_change(
+            self, cr, uid, ids, start_date, end_date, product_id,
+            product_uom_qty, context=None):
+        '''This function is designed to be inherited'''
+        res = {}
+        if start_date and end_date:
+            if end_date < start_date:
+                # We could have put a raise here
+                # but a warning is fine because we have the constraint
+                res['warning'] = {
+                    'title': _('Warning:'),
+                    'message': _("Start Date should be before or be the "
+                                 "same as End Date."),
+                }
+        return res
+
+    def product_id_change(
+            self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False,
+            fiscal_position=False, flag=False, context=None):
+        res = super(sale_order_line, self).product_id_change(
+            cr, uid, ids, pricelist, product, qty=qty, uom=uom,
+            qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
+            lang=lang, update_tax=update_tax, date_order=date_order,
+            packaging=packaging, fiscal_position=fiscal_position,
+            flag=flag, context=context)
+        if not product:
+            res['value'].update({
+                'must_have_dates': False,
+                'start_date': False,
+                'end_date': False,
+                })
+        else:
+            product_o = self.pool['product.product'].browse(
+                cr, uid, product, context=context)
+            if product_o.must_have_dates:
+                res['value'].update({'must_have_dates': True})
+            else:
+                res['value'].update({
+                    'must_have_dates': False,
+                    'start_date': False,
+                    'end_date': False,
+                    })
+        return res
diff --git a/sale_start_end_dates/sale_view.xml b/sale_start_end_dates/sale_view.xml
new file mode 100644
index 00000000000..16d18e6b6af
--- /dev/null
+++ b/sale_start_end_dates/sale_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <alexis.delattre@akretion.com>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<record id="view_order_form" model="ir.ui.view">
+    <field name="name">start.end.dates.view_order_form</field>
+    <field name="model">sale.order</field>
+    <field name="inherit_id" ref="sale.view_order_form" />
+    <field name="arch" type="xml">
+        <xpath expr="//field[@name='order_line']/form/group/group/field[@name='product_id']" position="after">
+            <field name="start_date"
+                on_change="start_end_dates_change(start_date, end_date, product_id, product_uom_qty, context)"
+                attrs="{'invisible': [('must_have_dates', '=', False)], 'required': [('must_have_dates', '=', True)]}"/>
+            <field name="end_date"
+                on_change="start_end_dates_change(start_date, end_date, product_id, product_uom_qty, context)"
+                attrs="{'invisible': [('must_have_dates', '=', False)], 'required': [('must_have_dates', '=', True)]}"/>
+            <field name="must_have_dates" invisible="1"/>
+        </xpath>
+    </field>
+</record>
+
+
+</data>
+</openerp>