[FIX]: fix a broken window action for account move wizard 'Reconcile Entries'

[IMP]: improve some views in account, and hr_payroll module view

bzr revid: mga@tinyerp.com-20100803133719-5jgyo5gcvrugxqkq

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 39c8e6f..d3dd4f1 100644 (file)
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -824,7 +824,7 @@ class account_move_line(osv.osv):
 #        }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
-        result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
+        result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         if view_type != 'tree':
             return result
 

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index da0269c..4e9049b 100644 (file)
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,24 +35,24 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group col="10" colspan="12">
-                       <filter icon="terp-go-year" string="  365 Days  "
-                                   domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                   help="Analytic Entries of last 365 days"/>
-                       <filter icon="terp-go-month" string="   30 Days   "
-                                       name="month"
-                                       domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                       help="Analytic Entries of last 30 days"/>
-                       <filter icon="terp-go-week"
-                               string="    7 Days    "
-                               separator="1"
-                               domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                               help="Analytic Entries during last 7 days"/>
-                       <separator orientation="vertical"/>
-                       <field name="product_id" />
-                       <field name="user_id" widget="selection">
-                       <filter icon="terp-gtk-jump-to-ltr" domain="[('user_id','=',uid)]" help="My Entries"/>
-                       </field>
-                   </group>
+                    <filter icon="terp-go-year" string="  365 Days  "
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Entries of last 365 days"/>
+                    <filter icon="terp-go-month" string="   30 Days   "
+                            name="month"
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Entries of last 30 days"/>
+                    <filter icon="terp-go-week"
+                            string="    7 Days    "
+                            separator="1"
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Entries during last 7 days"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" />
+                    <field name="user_id" widget="selection">
+                    <filter icon="terp-gtk-jump-to-ltr" domain="[('user_id','=',uid)]" help="My Entries"/>
+                    </field>
+                </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -72,15 +72,15 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                                       <field name="currency_id" widget="selection"/>
-                                       <field name="general_account_id" widget="selection"/>
-                                       <field name="product_uom_id" widget="selection"/>
-                                       <field name="journal_id" widget="selection"/>
-                                       <separator orientation="vertical"/>
+                    <field name="currency_id" widget="selection"/>
+                    <field name="general_account_id" widget="selection"/>
+                    <field name="product_uom_id" widget="selection"/>
+                    <field name="journal_id" widget="selection"/>
+                    <separator orientation="vertical"/>
                     <field name="name"/>
-                                       <field name="account_id"/>
-                                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       </group>
+                    <field name="account_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </group>
             </search>
         </field>
     </record>
@@ -90,7 +90,7 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Analytic Entries Analysis" type="bar">
-               <field name="user_id"/>
+                 <field name="user_id"/>
                 <field name="amount" operator="+"/>
                 <field name="unit_amount" operator="+"/>
                 <field name="amount_currency" operator="+"/>

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index c5c3b62..dc21c20 100644 (file)
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -101,9 +101,9 @@
                  </group>
                  <newline/>
                  <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="journal_id"/>
-                    <field name="fiscalyear_id"/>
+                    <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
+                    <field name="fiscalyear_id"/>
                     <separator orientation="vertical"/>
                     <field name="analytic_account_id"/>
                     <separator orientation="vertical"/>

diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 22bc289..1ce7d5f 100644 (file)
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <record id="view_account_move_line_reconcile_select" model="ir.ui.view">
+        <record id="view_account_move_line_reconcile_select" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.select.form</field>
             <field name="model">account.move.line.reconcile.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation">
-                       <group colspan="4" >
-                                <field name="account_id"/>
+                    <group colspan="4" >
+                         <field name="account_id"/>
                     </group>
-                               <separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                               <label string ="" colspan="2"/>
-                       <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                                               <button icon="terp-gtk-go-back-rtl"
-                                                       string="Open for Reconciliation" name="action_open_window"
-                                                       type="object" />
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl"
+                            string="Open for Reconciliation" name="action_open_window"
+                            type="object" />
                    </group>
                </form>
             </field>
-       </record>
+        </record>
 
         <record id="action_account_reconcile_select" model="ir.actions.act_window">
             <field name="name">Reconcile Entries</field>
@@ -32,7 +32,7 @@
         </record>
 
         <!-- <menuitem action="action_account_reconcile_select"
-               id="menu_reconcile_select" parent="periodical_processing_reconciliation" /> -->
+            id="menu_reconcile_select" parent="periodical_processing_reconciliation" /> -->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 7b5f5e4..49d194a 100644 (file)
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -78,7 +78,7 @@
             <field name="object" eval="1" />
             <field name="name">Reconcile Entries</field>
             <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile_prompt'))" />
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile'))" />
             <field name="key">action</field>
             <field name="model">account.move.line</field>
         </record>

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 394692f..8f50302 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -506,7 +506,6 @@
                         <button string="Approve Sheet" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
                         <button string="Pay Salary" icon="terp-dolar_ok!" name="process_sheet" states="confirm"/>
                         <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm"/>
-                        <button string="Re-Open" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="draft,hr_check,confirm"/>
                         <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="cancel"/>
                     </group>
                 </form>