From 35a9faf9edf54ba62ddb3353630bc5d8e6aa5a2a Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 27 Jun 2012 16:20:52 +0530
Subject: [PATCH 1/2] [IMP]improved payroll advice form view

bzr revid: kbh@tinyerp.com-20120627105052-i14kz4wz47v5lrnk
---
 .../l10n_in_hr_payroll_view.xml               | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index ac14e228b39..fdc9b537a57 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -73,7 +73,7 @@
             <field name="arch" type="xml">
                 <form string="Bank Advice" version="7.0">
                     <header>
-                    	<button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object"/>
+                        <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object"/>
                         <button name="compute_advice" string="Compute Advice" states="draft" type="object"/>
                         <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
                         <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
@@ -81,32 +81,35 @@
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
                         </div>
                         <div class="oe_clear"/>
-                   	</header>
-                    <group col="6" colspan="4">
-                        <field name="name" colspan="4"/>
-                        <field name="number"/>
-                        <field name="date"/>
-                        <field name="bank_id"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Paymeny Lines">
-                            <field name="line_ids" colspan="4" nolabel="1">
-                                <tree string="Payment Lines" editable="bottom">
-                                    <field name="employee_id"/>
-                                    <field name="name"/>
-                                    <field name="bysal"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Other Information">
-                            <group colspan="4" col="6">
-                              <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
-                              <field name="chaque_nos"/>
-                            </group>
-                            <separator colspan="4" string="Letter Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    </header>
+                    <sheet>
+                        <label for="date" class="oe_edit_only" string="Date"/>
+                            <h1><field name="date"/></h1>
+                        <group col="4" colspan="8">
+                            <field name="name" colspan="4"/>
+                            <field name="number"/>
+                            <field name="bank_id"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Paymeny Lines">
+                                <field name="line_ids" colspan="4" nolabel="1">
+                                    <tree string="Payment Lines" editable="bottom">
+                                        <field name="employee_id"/>
+                                        <field name="name"/>
+                                        <field name="bysal"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Other Information">
+                                <group colspan="4" col="6">
+                                <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
+                                <field name="chaque_nos"/>
+                                </group>
+                                <separator colspan="4" string="Letter Details"/>
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -164,4 +167,4 @@
             groups="base.group_hr_manager"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From f89a0d946c8a4950dd862b0606a358cfea86a2b1 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 28 Jun 2012 11:07:59 +0530
Subject: [PATCH 2/2] [IMP]improved advice form view and date field required.

bzr revid: kbh@tinyerp.com-20120628053759-k9tdeiubt882fufa
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 92520ebf3aa..eee0273a021 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -112,7 +112,7 @@ class payroll_advice(osv.osv):
     _columns = {
         'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
-        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
+        'date': fields.date('Date', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
         'state':fields.selection([
             ('draft', 'Draft'),
             ('confirm', 'Confirmed'),
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index fdc9b537a57..83d9aae8968 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -83,11 +83,12 @@
                         <div class="oe_clear"/>
                     </header>
                     <sheet>
-                        <label for="date" class="oe_edit_only" string="Date"/>
-                            <h1><field name="date"/></h1>
-                        <group col="4" colspan="8">
-                            <field name="name" colspan="4"/>
+                        <group col="4" colspan="4">
+                            <label for="Name" class="oe_edit_only" string="Name"/>
+                            <h2><field name="name"/></h2>
                             <field name="number"/>
+                            <label for="date" class="oe_edit_only"/>
+                            <h2><field name="date"/></h2>
                             <field name="bank_id"/>
                         </group>
                         <notebook colspan="4">