odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] remove sequence form salary head object 

bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt
This commit is contained in:
psi (Open ERP) 2011-05-04 16:43:48 +05:30
parent efdb84c905
commit a13984cf7b
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_payroll/hr_payroll.py
View File

@ -177,14 +177,12 @@ class hr_salary_head(osv.osv):
'parent_id':fields.many2one('hr.salary.head', 'Parent', help="Linking a salary head to its parent is used only for the reporting purpose."),
'note': fields.text('Description'),
'company_id':fields.many2one('res.company', 'Company', required=False),
'sequence': fields.integer('Sequence', required=True, help='Display sequence order'),
}
_defaults = {
'company_id': lambda self, cr, uid, context: \
self.pool.get('res.users').browse(cr, uid, uid,
context=context).company_id.id,
'sequence': 5
}
hr_salary_head()
@ -218,7 +216,7 @@ class hr_payslip(osv.osv):
cr.execute('''SELECT pl.slip_id, pl.id FROM hr_payslip_line AS pl \
LEFT JOIN hr_salary_head AS sh on (pl.category_id = sh.id) \
WHERE pl.slip_id in %s \
GROUP BY pl.slip_id, sh.sequence, pl.sequence, pl.id ORDER BY sh.sequence, pl.sequence''',(tuple(ids),))
GROUP BY pl.slip_id, pl.sequence, pl.id ORDER BY pl.sequence''',(tuple(ids),))
res = cr.fetchall()
for r in res:
result.setdefault(r[0], [])

24
addons/hr_payroll/hr_payroll_view.xml
View File

@ -186,8 +186,8 @@
<field name="arch" type="xml">
<search string="Search Payslip Lines">
<group col="8" colspan="4">
<field name="name"/>
<field name="code"/>
<field name="name"/>
<field name="code"/>
<field name="slip_id"/>
<field name="amount_select"/>
</group>
@ -249,18 +249,18 @@
</tree>
<form string="Payslip Line">
<group>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="category_id"/>
<field name="sequence" groups="base.group_extended"/>
<field name="total"/>
<field name="salary_rule_id" groups="base.group_extended"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="category_id"/>
<field name="sequence" groups="base.group_extended"/>
<field name="total"/>
<field name="salary_rule_id" groups="base.group_extended"/>
</group>
</form>
</field>
</page>
<!-- TODO: put me back -->
<page string="Details By Salary Head">
<page string="Details By Salary Head">
<field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
<tree string="Payslip Lines" colors="blue:total == 0">
<field name="category_id"/>
@ -357,7 +357,6 @@
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="parent_id" select="1"/>
<field name="sequence" select="1"/>
</group>
<separator colspan="4" string="Notes"/>
<field name="note" colspan="4" nolabel="1"/>
@ -373,7 +372,6 @@
<tree string="Salary Heads">
<field name="name"/>
<field name="code"/>
<field name="sequence"/>
<field name="parent_id" invisible="1"/>
</tree>
</field>
@ -533,14 +531,14 @@
<field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
<field name="amount_fix" attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
<field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
<field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
<field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
<field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
<separator colspan="4" string="Company contribution"/>
<field name="register_id"/>
</group>
</page>
<page string="Child Rules">
<field name="parent_rule_id"/>
<field name="parent_rule_id"/>
<separator colspan="4" string="Children definition"/>
<field colspan="4" name="child_ids" nolabel="1"/>
</page>