Meera Trambadia (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-india-add-related-field into
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
Requested reviews:
Mustufa Rangwala (Open ERP) (mra-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-add-related-field/+merge/115932
l10n_in_hr_payroll: added related field 'ifsc' to set attrs(invisible) on
'ifsc_code' and added view for advice lines.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-add-related-field/+merge/115932
Your team OpenERP R&D Team is subscribed to branch
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-07-18 12:11:39 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-07-20 10:05:58 +0000
@@ -243,7 +243,7 @@
wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'hr_verify_sheet', cr)
wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'process_sheet', cr)
slip_ids.append(slip_id.id)
-
+
for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
@@ -284,6 +284,8 @@
'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
'debit_credit': fields.char('C/D', size=3, required=False),
'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
+ # used to set attrs on ifsc_code
+ 'ifsc': fields.related('advice_id','neft',type='boolean', string='IFSC'),
}
_defaults = {
'debit_credit': 'C',
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-07-18 05:58:26 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-07-20 10:05:58 +0000
@@ -107,13 +107,15 @@
<div class="oe_clear"/>
</header>
<sheet>
- <group col="4" colspan="4">
+ <group>
<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 colspan="3" col="6">
+ <field name="bank_id"/>
+ <field name="number"/>
+ </group>
</group>
<notebook colspan="4">
<page string="Payment Lines">
@@ -121,7 +123,8 @@
<tree string="Payment Lines" editable="bottom">
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="name"/>
- <field name="ifsc_code"/>
+ <field name="ifsc" invisible="1"/>
+ <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
<field name="bysal"/>
<field name="debit_credit"/>
</tree>
@@ -185,6 +188,44 @@
parent="hr_payroll.menu_hr_root_payroll"
/>
+ <record id="view_advice_line_tree" model="ir.ui.view">
+ <field name="name">advice.line.tree</field>
+ <field name="model">hr.payroll.advice.line</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Advice Lines" editable="bottom">
+ <field name="employee_id" on_change="onchange_employee_id(employee_id)" />
+ <field name="name" />
+ <field name="ifsc" invisible="1" />
+ <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+ <field name="bysal" />
+ <field name="debit_credit" />
+ </tree>
+ </field>
+ </record>
+
+ <record id="view_advice_line_form" model="ir.ui.view">
+ <field name="name">advice.line.form</field>
+ <field name="model">hr.payroll.advice.line</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Advice Lines" version="7.0">
+ <sheet>
+ <label for="advice_id" class="oe_edit_only"/>
+ <h1><field name="advice_id"/></h1>
+ <group>
+ <field name="employee_id" on_change="onchange_employee_id(employee_id)" />
+ <field name="name" />
+ <field name="ifsc" invisible="1"/>
+ <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+ <field name="bysal" />
+ <field name="debit_credit" />
+ </group>
+ </sheet>
+ </form>
+ </field>
+ </record>
+
<record id="view_res_company_da" model="ir.ui.view">
<field name="name">res.company.inherit</field>
<field name="model">res.company</field>
_______________________________________________
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
