diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
new file mode 100644
index 00000000000..8ee4823ae2b
--- /dev/null
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_vendor_payment_form">
+            <field name="name">account.voucher.payment.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bill Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Payment Lines" editable="top">
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_vendor_payment" model="ir.actions.act_window">
+            <field name="name">Vendor Payment</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL"
+            id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
+
+        <record model="ir.ui.view" id="view_vendor_receipt_form">
+            <field name="name">account.voucher.receipt.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Payment Lines" editable="top">
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_vendor_receipt" model="ir.actions.act_window">
+            <field name="name">Sales Payment</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'receipt'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL"
+            id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
+    </data>
+</openerp>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
new file mode 100644
index 00000000000..b81f18bf8d7
--- /dev/null
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_sale_receipt_form">
+            <field name="name">account.voucher.sale.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Receipt">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id"  domain="[('type','=','sale')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Sales Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Sales Lines" editable="top">
+                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount" />
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <group col="2" colspan="1">
+                                    <separator string="Payment Options" colspan="2"/>
+                                    <field name="pay_now"/>
+                                    <field name="pay_journal_id" on_change="onchange_pay_journal(pay_journal_id,type)" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                    <field name="pay_account_id" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                    <field name="pay_amount" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                </group>
+                                <group col="2" colspan="1">
+                                    <separator string="Other Information" colspan="2"/>
+                                    <field name="reference" select="1"/>
+                                    <field name="tax_id"/>
+                                    <field name="amount"/>
+                                    <field name="date" select="1" on_change="onchange_date(date)"/>
+                                    <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <!-- Sales Voucher -->
+        <record id="action_sale_receipt" model="ir.actions.act_window">
+            <field name="name">Sales Receipt</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type','=','sale')]</field>
+            <field name="context">{'journal_type':'sale', 'type':'sale'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
+        action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="12"/>
+        
+        <!--  Purchase Vouchers -->
+        <record model="ir.ui.view" id="view_purchase_receipt_form">
+            <field name="name">account.voucher.purchase.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Vendor Bills">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id"  domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Bill Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Voucher Lines" editable="top">
+                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_purchase_receipt" model="ir.actions.act_window">
+            <field name="name">Vendor Bills</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type','=','purchase')]</field>
+            <field name="context">{'journal_type':'purchase', 'type':'purchase'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
+        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="12"/>        
+        
+    </data>
+</openerp>