[IMP]: improvement in accounting voucher

bzr revid: mga@tinyerp.com-20100629063924-0esfvsb9yyzg9k5p

1 files changed, 34 insertions, 133 deletions

diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 4f0e6e12ac1..f08226543d7 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -98,14 +98,41 @@
                     </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">
             <field name="name">Customer Vouchers</field>
@@ -114,7 +141,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_voucher_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"/>
@@ -127,7 +154,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_voucher_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"/>
@@ -143,6 +170,7 @@
         </record>
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
         
+        
         <record id="action_cheque_register" model="ir.actions.act_window">
             <field name="name">Cheque Register</field>
             <field name="type">ir.actions.act_window</field>
@@ -150,138 +178,11 @@
             <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"/>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
-        </record>
-        
+        </record>        
         <menuitem action="action_cheque_register" id="menu_action_cheque_register" parent="account.menu_finance_bank_and_cash"/>
 
-        
-<!--        <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 model="ir.ui.view" id="view_account_journal_form_inherit">
             <field name="name">account.journal.form.inherit</field>
             <field name="model">account.journal</field>