diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 2a7922c13b2..8380a19b411 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -251,8 +251,8 @@ class account_cash_statement(osv.osv):
         statement = statement_pool.browse(cr, uid, ids[0])
         
         if not self._user_allow(cr, uid, ids, statement, context={}):
-            raise osv.except_osv(_('Error !'), _('User %s have no rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
-            
+            raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
+        
         number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code)
         
         if len(statement.starting_details_ids) > 0:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8932e90376a..e1c73519895 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1252,18 +1252,18 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <record id="action_move_line_search_view4" model="ir.actions.act_window">
-            <field name="name">Check Registers</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_line_tree"/>
-            <field name="search_view_id" ref="view_account_move_line_filter"/>
-            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
-        </record>
-
-        <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
+<!--        <record id="action_move_line_search_view4" model="ir.actions.act_window">-->
+<!--            <field name="name">Cheque Register</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.move.line</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="view_id" ref="view_move_line_tree"/>-->
+<!--            <field name="search_view_id" ref="view_account_move_line_filter"/>-->
+<!--            <field name="domain">[('journal_id.type', '=', 'bank')]</field>-->
+<!--        </record>-->
+<!--        -->
+<!--        <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>-->
 
 <!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
 
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 3dff856b716..408df2ee031 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -23,16 +23,11 @@
     "name" : "Accounting Voucher Entries",
     "version" : "1.0",
     "author" : 'Tiny & Axelor',
-    "description": """
-    Indian Accounting module includes all the basic requirenments of
-    Basic Accounting, plus new things which are available :
-    * Indian Account Chart
-    * New Invoice - (Local, Retail)
-    * Invoice Report
-    * Tax structure
-    * Journals
-    * VAT Declaration report
-    * Accounting Periods
+    "description": """Account Voucher module includes all the basic requirements of
+    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...
+    * Voucher Entry
+    * Voucher Receipt
+    * Cheque Register
     """,
     "category" : "Generic Modules/Accounting",
     "website" : "http://tinyerp.com",
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 1ab29f111ff..91038bba0bb 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -75,7 +75,7 @@
             </field>
         </record>
 
-        <record id="view_account_move_filter" model="ir.ui.view">
+        <record id="view_voucher_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>
             <field name="type">search</field>
@@ -101,13 +101,40 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options...">
-                       <field name="journal_id" widget="selection" context="{'journal_id': self}" />
+                       <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                        <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
                        <field name="type" context="{'type': self}" />
                    </group>
                 </search>
             </field>
         </record>
+        <record id="view_voucher_filter_new" model="ir.ui.view">
+            <field name="name">account.voucher.select</field>
+            <field name="model">account.voucher</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Vouchers">
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="number" select='1'/>
+                        <field name="partner_id" select='1'/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
          <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
@@ -117,7 +144,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','sale')]</field>
-            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
         </record>
         <menuitem id="menu_action_receipt_vou_voucher_list"
         action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>
@@ -130,7 +157,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','purchase')]</field>
-            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
         </record>
         <menuitem id="menu_action_pay_vou_voucher_list"
         action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>
@@ -142,134 +169,21 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="search_view_id" ref="view_voucher_filter"/>
         </record>
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
 
-<!--        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">-->
-<!--            <field name="name">Cash Receipt</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','rec_voucher')]</field>-->
-<!--            <field name="context">{'type':'rec_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_receipt_cashreceipt_voucher_list"-->
-<!--        action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">-->
-<!--            <field name="name">Bank Receipt</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','bank_rec_voucher')]</field>-->
-<!--            <field name="context">{'type':'bank_rec_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_receipt_bakreceipt_voucher_list"-->
-<!--        action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>-->
-
-        <!--  End Receipt Vouchers -->
-
-
-        <!-- Payment Vouchers -->
-<!--        <record model="ir.actions.act_window" id="action_payments_voucher_list">-->
-<!--            <field name="name">Payable Entries</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','like','pay_voucher')]</field>-->
-<!--            <field name="context">{'type':'pay_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_payments_voucher_list"-->
-<!--        action="action_payments_voucher_list" parent="account.menu_finance_entries" sequence="8"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">-->
-<!--            <field name="name">Cash Payment</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','pay_voucher')]</field>-->
-<!--            <field name="context">{'type':'pay_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_payments_cashpay_voucher_list"-->
-<!--        action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">-->
-<!--            <field name="name">Bank Payment</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','bank_pay_voucher')]</field>-->
-<!--            <field name="context">{'type':'bank_pay_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_payments_bankpay_voucher_list"-->
-<!--        action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>-->
-
-       <!-- End Payment Vouchers -->
-
-        <!-- Other Voucher Enries -->
-<!--        <record model="ir.actions.act_window" id="action_other_voucher_list">-->
-<!--            <field name="name">Other Entries</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_other_voucher_list"-->
-<!--        action="action_other_voucher_list" parent="account.menu_finance_entries" sequence="8"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_cont_voucher_form">-->
-<!--            <field name="name">Contra Entries</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','cont_voucher')]</field>-->
-<!--            <field name="context">{'type':'cont_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_cont_voucher_form"-->
-<!--        action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">-->
-<!--            <field name="name">Journal Sale</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','journal_sale_vou')]</field>-->
-<!--            <field name="context">{'type':'journal_sale_vou'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_jour_sale_voucher_form"-->
-<!--        action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">-->
-<!--            <field name="name">Journal Purchase</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','journal_pur_voucher')]</field>-->
-<!--            <field name="context">{'type':'journal_pur_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_jour_pur_voucher_form"-->
-<!--        action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_jour_voucher_form">-->
-<!--            <field name="name">Journal Voucher</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','journal_voucher')]</field>-->
-<!--            <field name="context">{'type':'journal_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_jour_voucher_form"-->
-<!--            action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>-->
+        <record id="action_cheque_register" model="ir.actions.act_window">
+            <field name="name">Cheque Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_voucher_tree"/>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
+            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
+        </record>
+        <menuitem action="action_cheque_register" id="menu_action_cheque_register" parent="account.menu_finance_bank_and_cash"/>
 
         <record model="ir.ui.view" id="view_account_journal_form_inherit">
             <field name="name">account.journal.form.inherit</field>
diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py
index bfe7323d6f1..fc4ce593eac 100755
--- a/addons/account_voucher_payment/__openerp__.py
+++ b/addons/account_voucher_payment/__openerp__.py
@@ -22,9 +22,8 @@
     "name" : "Invoice Payment/Receipt by Vouchers.",
     "version" : "1.0",
     "author" : 'Tiny & Axelor',
-    "description": """This module includes :
-    * It reconcile the invoice (supplier, customer) while paying through
-    Accounting Vouchers
+    "description": """Extension Account Voucher module includes allows to link payment / receipt 
+    entries with voucher, also automatically reconcile during the payment and receipt entries
     """,
     "category" : "Generic Modules/Indian Accounting",
     "website" : "http://tinyerpindia.com",