From bddfe1cd5a644ca6c0582aa6458988375a9a1ec3 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Thu, 15 Sep 2011 10:46:36 +0530
Subject: [PATCH] [IMP] hr_payroll, hr_payroll_account: Payslip Run => add
 journal_id field on payslip run, improve search view, fix for done button on
 payslip run, usibility improvements

bzr revid: mra@tinyerp.com-20110915051636-54xj84eams3fvyu5
---
 addons/hr_payroll/hr_payroll.py               |  1 +
 addons/hr_payroll/hr_payroll_view.xml         |  5 ++-
 .../hr_payroll_account/hr_payroll_account.py  |  9 +++++
 .../hr_payroll_account_view.xml               | 40 +++++++++++++++++++
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 464c3d295a4..f025addc61e 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -211,6 +211,7 @@ class one2many_mod2(fields.one2many):
 class hr_payslip_run(osv.osv):
 
     _name = 'hr.payslip.run'
+    _description = 'Payslip Run'
     _columns = {
         'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a2523fcb7ba..b11ca79c5f5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -663,8 +663,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Runs">
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft runs"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done runs"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Runs"/>
+                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Runs"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="date_start"/>
@@ -683,6 +683,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="credit_note"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 1ff19e01bb1..6eb0a6d1859 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -174,5 +174,14 @@ class hr_contract(osv.osv):
     }
 hr_contract()
 
+class hr_payslip_run(osv.osv):
+
+    _inherit = 'hr.payslip.run'
+    _description = 'Payslip Run'
+    _columns = {
+        'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
+    }
+
+hr_payslip_run()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 825fac9cab4..667b1308ec5 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -51,6 +51,46 @@
                 </xpath>
             </field>
         </record>
+        
+    <!-- Payslip Run View -->
 
+        <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.search.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position="after">
+                	<newline/>
+                    <field name="journal_id" widget="selection"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_tree_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.tree.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_tree"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position="after">
+                    <field name="journal_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.form.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position="after">
+                	<newline/>
+                    <field name="journal_id"/>
+                </field>
+            </field>
+        </record>
+        
     </data>
 </openerp>