[IMP] hr_payroll: added tree view on payroll structures and rule categories. + few renaming of stupid copied/pasted xml_id meaningless
bzr revid: qdp-launchpad@openerp.com-20110914085311-nfg3sg0cdi5jv9y6
This commit is contained in:
parent
92e1432757
commit
514dfa0748
|
@ -50,6 +50,7 @@ class hr_payroll_structure(osv.osv):
|
|||
'company_id':fields.many2one('res.company', 'Company', required=True),
|
||||
'note': fields.text('Description'),
|
||||
'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
|
||||
'children_ids':fields.one2many('hr.payroll.structure', 'parent_id', 'Children'),
|
||||
}
|
||||
|
||||
def _get_parent(self, cr, uid, context=None):
|
||||
|
@ -175,6 +176,7 @@ class hr_salary_rule_category(osv.osv):
|
|||
'name':fields.char('Name', size=64, required=True, readonly=False),
|
||||
'code':fields.char('Code', size=64, required=True, readonly=False),
|
||||
'parent_id':fields.many2one('hr.salary.rule.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."),
|
||||
'children_ids': fields.one2many('hr.salary.rule.category', 'parent_id', 'Children'),
|
||||
'note': fields.text('Description'),
|
||||
'company_id':fields.many2one('res.company', 'Company', required=False),
|
||||
}
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
<!-- End Contract View-->
|
||||
|
||||
<!-- Salary structure -->
|
||||
<record id="view_hr_employee_grade_tree" model="ir.ui.view">
|
||||
<record id="view_hr_payroll_structure_list_view" model="ir.ui.view">
|
||||
<field name="name">hr.payroll.structure.tree</field>
|
||||
<field name="model">hr.payroll.structure</field>
|
||||
<field name="type">tree</field>
|
||||
|
@ -71,6 +71,19 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_hr_payroll_structure_tree" model="ir.ui.view">
|
||||
<field name="name">hr.payroll.structure.tree</field>
|
||||
<field name="model">hr.payroll.structure</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="field_parent">children_ids</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Employee Function">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_hr_payroll_structure_filter" model="ir.ui.view">
|
||||
<field name="name">hr.payroll.structure.select</field>
|
||||
|
@ -116,18 +129,32 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_view_hr_employee_grade_form" model="ir.actions.act_window">
|
||||
<record id="action_view_hr_payroll_structure_list_form" model="ir.actions.act_window">
|
||||
<field name="name">Salary Structures</field>
|
||||
<field name="res_model">hr.payroll.structure</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_hr_employee_grade_tree"/>
|
||||
<field name="view_id" ref="view_hr_payroll_structure_list_view"/>
|
||||
</record>
|
||||
<menuitem
|
||||
id="menu_hr_employee_function"
|
||||
action="action_view_hr_employee_grade_form"
|
||||
id="menu_hr_payroll_structure_view"
|
||||
action="action_view_hr_payroll_structure_list_form"
|
||||
parent="payroll_configure"
|
||||
sequence="1"
|
||||
/>
|
||||
<record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
|
||||
<field name="name">Salary Structures</field>
|
||||
<field name="res_model">hr.payroll.structure</field>
|
||||
<field name="view_type">tree</field>
|
||||
<field name="domain">[('parent_id','=',False)]</field>
|
||||
<field name="view_id" ref="view_hr_payroll_structure_tree"/>
|
||||
</record>
|
||||
<menuitem
|
||||
id="menu_hr_payroll_structure_tree"
|
||||
action="action_view_hr_payroll_structure_tree"
|
||||
parent="payroll_configure"
|
||||
sequence="2"
|
||||
icon="STOCK_INDENT"
|
||||
/>
|
||||
<!-- End Salary structure -->
|
||||
|
||||
<!-- Payslip Line -->
|
||||
|
@ -415,6 +442,19 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="hr_salary_rule_category_tree_view" model="ir.ui.view">
|
||||
<field name="name">hr.salary.rule.category.tree.view</field>
|
||||
<field name="model">hr.salary.rule.category</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="field_parent">children_ids</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Salary Rule Categories">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="parent_id" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_hr_salary_rule_category_filter" model="ir.ui.view">
|
||||
<field name="name">hr.salary.rule.category.select</field>
|
||||
|
@ -441,6 +481,19 @@
|
|||
parent="payroll_configure"
|
||||
sequence="11"
|
||||
/>
|
||||
<record id="action_hr_salary_rule_category_tree_view" model="ir.actions.act_window">
|
||||
<field name="name">Salary Rule Categories</field>
|
||||
<field name="res_model">hr.salary.rule.category</field>
|
||||
<field name="view_type">tree</field>
|
||||
<field name="view_id" ref="hr_salary_rule_category_tree_view"/>
|
||||
</record>
|
||||
<menuitem
|
||||
id="menu_hr_salary_rule_category_tree_view"
|
||||
action="action_hr_salary_rule_category_tree_view"
|
||||
parent="payroll_configure"
|
||||
sequence="12"
|
||||
icon="STOCK_INDENT"
|
||||
/>
|
||||
|
||||
<!--
|
||||
Contribution Register
|
||||
|
|
Loading…
Reference in New Issue