From a1e8567f8a1ff8d6be32e95989458eda1d6c046d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 23 Sep 2010 14:26:55 +0530
Subject: [PATCH] [IMP] account_voucher: search view ordering of extended
 option and group by

bzr revid: mra@mra-laptop-20100923085655-mjm66guqv3a67sof
---
 .../voucher_payment_receipt_view.xml          | 32 ++++++++--------
 .../voucher_sales_purchase_view.xml           | 38 +++++++++----------
 addons/account_voucher/voucher_view.xml       | 14 +++----
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 2d4d7d7ba5d..ced86942d5c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -23,13 +23,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -37,6 +30,13 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                        <field name="reference"/>
+                        <field name="name"/>
+                        <field name="narration"/>
+                        <field name="amount"/>
+                   </group>
                 </search>
             </field>
         </record>
@@ -63,13 +63,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -77,6 +70,13 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                        <field name="reference"/>
+                        <field name="name"/>
+                        <field name="narration"/>
+                        <field name="amount"/>
+                   </group>
                 </search>
             </field>
         </record>
@@ -225,7 +225,7 @@
                 </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</field>
@@ -331,7 +331,7 @@
                 </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</field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 9ccebbd504b..576bf5fa5c7 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -22,13 +22,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -36,6 +29,13 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                        <field name="reference"/>
+                        <field name="name"/>
+                        <field name="narration"/>
+                        <field name="amount"/>
+                   </group>
                 </search>
             </field>
         </record>
@@ -61,13 +61,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -75,6 +68,13 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                        <field name="reference"/>
+                        <field name="name"/>
+                        <field name="narration"/>
+                        <field name="amount"/>
+                   </group>
                 </search>
             </field>
         </record>
@@ -122,7 +122,7 @@
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                                    <field name="account_id" 
+                                    <field name="account_id"
                                          attrs="{'invisible':[('pay_now','!=','pay_now')]}"
                                           domain="[('type','=','liquidity')]"/>
                                          <!-- should select income accounts only. Or use the journal for this ? -->
@@ -159,7 +159,7 @@
                 </form>
             </field>
         </record>
-        
+
         <!-- Sales Voucher -->
         <record id="action_sale_receipt" model="ir.actions.act_window">
             <field name="name">Sales Receipt</field>
@@ -284,8 +284,8 @@
             <field name="act_window_id" ref="action_purchase_receipt"/>
         </record>
 
-        <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL" 
-        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>        
-        
+        <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
+        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
+
     </data>
 </openerp>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index d785350b876..4b09fdc70e9 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -107,13 +107,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -121,6 +114,13 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                        <field name="reference"/>
+                        <field name="name"/>
+                        <field name="narration"/>
+                        <field name="amount"/>
+                   </group>
                 </search>
             </field>
         </record>