pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge KBH Branch lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-advice-view-kbh

Browse Source 
bzr revid: mra@tinyerp.com-20120628055934-skjaoga613iaafuq
This commit is contained in:
Mustufa Rangwala (OpenERP)
2012-06-28 11:29:34 +05:30
parent 86ecb82d25 f89a0d946c
commit b4bd695160
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+1 -1
View File
@@ -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'),
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+32 -28
View File
@@ -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>
</openerp>