From badc8caef52ccf5911c3423420ffbb524e8f647c Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 12 May 2011 12:32:53 +0530
Subject: [PATCH] [IMP] small improvment in wizard

bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0
---
 addons/hr_payroll/hr_payroll.py                               | 4 ++--
 addons/hr_payroll/hr_payroll_view.xml                         | 2 +-
 addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py  | 3 +--
 addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index c3e153b9a82..5bec8164e32 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -206,8 +206,8 @@ class hr_payslip_run(osv.osv):
 
     _name = 'hr.payslip.run'
     _columns = {
-        'name': fields.char('Name', size=256, readonly=True, states={'draft': [('readonly', False)]}),
-        'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True),
+        'name': fields.char('Name', size=64, readonly=True, states={'draft': [('readonly', False)]}),
+        'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('close', 'Close'),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 27fa0d15bc2..4d422d708de 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -660,7 +660,7 @@
                 <group col="6" colspan="6">
                     <field name="state"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
+                    <button name="close_payslip_run" type="object" icon="gtk-jump-to" string="Close" states="draft"/>
                     <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
                 </group>
             </form>
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index 0f0c42095d2..55375095025 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -37,13 +37,12 @@ class hr_payslip_employees(osv.osv_memory):
     def compute_sheet(self, cr, uid, ids, context=None):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
-        input_line_pool = self.pool.get('hr.payslip.input')
         slip_ids = []
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         if not data['employee_ids']:
-            raise osv.except_osv(_("Warning !"), _("You must select employees to generate payslip"))
+            raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip"))
         for emp in emp_pool.browse(cr, uid, data['employee_ids'], context=context):
             slip_data = slip_pool.onchange_employee_id(cr, uid, [], time.strftime('%Y-%m-01'), str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10], emp.id, contract_id=False, context=context)
             res = {
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index 28d83700948..c8bd142dbf9 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.payslip.employees</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employees">
+                <form string="Payslips by Employees">
                     <group colspan="4" >
                         <separator string="Payslips by Employees" colspan="4"/>
                         <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s)" />
@@ -18,7 +18,7 @@
                     <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="Generate" name="compute_sheet" type="object"/>
+                        <button  icon="gtk-execute" string="Generate" name="compute_sheet" type="object"/>
                     </group>
                </form>
             </field>