diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 02fc8b71a7a..fc38ba94450 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -48,14 +48,14 @@ class sale_journal(osv.osv):
         'user_id': fields.many2one('res.users', 'Responsible', required=True),
         'date': fields.date('Journal date', required=True),
         'date_created': fields.date('Creation date', readonly=True, required=True),
-        'date_validation': fields.date('Validation date', readonly=True),
-        'sale_stats_ids': fields.one2many("sale.journal.report", "journal_id", 'Sale Stats', readonly=True),
+        'date_close': fields.date('Close date ', readonly=True),
+        'sale_stats_ids': fields.one2many("sale.journal.report", "journal_id", 'Sale stats', readonly=True),
         'state': fields.selection([
             ('draft','Draft'),
             ('open','Open'),
             ('cancel','Cancel'),
             ('confirm','Confirm'),
-            ('done','Done'),
+            ('close','Close'),
         ], 'State', required=True, readonly=True),
         'note': fields.text('Note'),
     }
@@ -105,12 +105,17 @@ class sale_journal(osv.osv):
         return True
 
     def button_close(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'done', 'date_validation':time.strftime('%Y-%m-%d')})
+        self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
         for (id,name) in self.name_get(cr, uid, ids):
                 message = _('Sale orders of Journal') + " '" + name + "' "+ _("is closed")
                 self.log(cr, uid, id, message)
         return True
-    
+    def button_reset(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'draft'})
+        for (id,name) in self.name_get(cr, uid, ids):
+                    message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
+                    self.log(cr, uid, id, message)
+        return True
     def copy(self, cr, uid, id, default=None, context=None):
         """Overrides orm copy method
         @param self: The object pointer
@@ -222,7 +227,7 @@ picking()
 class sale(osv.osv):
     _inherit = "sale.order"
     _columns = {
-        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal', domain=[('state','!=', 'done')]),
+        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal', domain=[('state','not in', ('done', 'draft''cancel'))]),
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
     }
     def action_ship_create(self, cr, uid, ids, *args):
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 73377a173fe..1ea275b086d 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -56,7 +56,7 @@
                         <field name="user_id" select="1"/>
                         <field name="date" select="1"/>
                         <field name="date_created" select="1"/>
-                        <field name="date_validation" select="1"/>
+                        <field name="date_close" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales">
@@ -78,10 +78,10 @@
                     <field name="state"/>
                         <group col="6" colspan="2">
                             <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-                            <button name="button_close" string="Close Journal" states="open,confirm" type="object" icon="gtk-close"/>
-                            <button name="button_draft" string="Set to Draft" states="close,open,cancel" type="object" icon="gtk-convert"/>
-                            <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
-                            <button string="Cancel Sales" name="button_sale_cancel" states="draft,open,confirm" type="object" icon="gtk-cancel"/>
+                            <button string="Confirm Sales" name="button_sale_confirm" states="open" type="object" icon="gtk-execute"/>
+                            <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="gtk-close"/>
+                            <button name="button_draft" string="Set to Draft" states="cancel" type="object" icon="gtk-convert"/>
+                            <button string="Cancel Sales" name="button_sale_cancel" states="close,draft,open,confirm" type="object" icon="gtk-cancel"/>
                         </group>
                 </form>
             </field>
@@ -394,6 +394,7 @@
                             <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
                             <button name="button_draft" string="Set to Draft" states="close,open,cancel" type="object" icon="gtk-convert"/>
                             <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
+                            <button name="button_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                         </group>
                 </form>
             </field>
@@ -474,5 +475,18 @@
             <field name="object" eval="True"/>
         </record>
 
+
+        <record id="view_sale_journal_search_form" model="ir.ui.view">
+            <field name="name">sale.order.journal.search</field>
+            <field name="model">sale.order</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="/search/group[@string='Group By...']/filter[@string='Salesman']" position="after">
+                   	<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                </xpath>
+            </field>
+        </record>
    </data>
 </openerp>