Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-advice-view-kbh into
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-advice-view-kbh/+merge/112494
Hello,
l10n_in_hr_payroll
I have improved form view of payroll advice.
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-advice-view-kbh/+merge/112494
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-advice-view-kbh into
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll.py'
--- l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-06-27 09:11:01 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-06-28 05:43:26 +0000
@@ -112,7 +112,7 @@
_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'),
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-06-27 06:14:04 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-06-28 05:43:26 +0000
@@ -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,36 @@
<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>
+ <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">
+ <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 +168,4 @@
groups="base.group_hr_manager"/>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
