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

[MERGE] merged mtr's branch with salary.head => salary.category 

bzr revid: qdp-launchpad@openerp.com-20110510142723-6kr9k4ivqwrusxss
This commit is contained in:
Quentin (OpenERP) 2011-05-10 16:27:23 +02:00
parent f0de17b169 84739f218e
commit b55e82f0d9
4 changed files with 55 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
addons/hr_payroll/hr_payroll.py
View File

@ -164,17 +164,17 @@ class contrib_register(osv.osv):
contrib_register()
class hr_salary_head(osv.osv):
class hr_salary_category(osv.osv):
"""
HR Salary Head
HR Salary Category
"""
_name = 'hr.salary.head'
_description = 'Salary Head'
_name = 'hr.salary.category'
_description = 'Salary Category'
_columns = {
'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.head', 'Parent', help="Linking a salary head to its parent is used only for the reporting purpose."),
'parent_id':fields.many2one('hr.salary.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."),
'note': fields.text('Description'),
'company_id':fields.many2one('res.company', 'Company', required=False),
}
@ -185,7 +185,7 @@ class hr_salary_head(osv.osv):
context=context).company_id.id,
}
hr_salary_head()
hr_salary_category()
class one2many_mod2(fields.one2many):
@ -210,11 +210,11 @@ class hr_payslip(osv.osv):
_name = 'hr.payslip'
_description = 'Pay Slip'
def _get_lines_salary_head(self, cr, uid, ids, field_names, arg=None, context=None):
def _get_lines_salary_category(self, cr, uid, ids, field_names, arg=None, context=None):
result = {}
if not ids: return result
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) \
LEFT JOIN hr_salary_category AS sh on (pl.category_id = sh.id) \
WHERE pl.slip_id in %s \
GROUP BY pl.slip_id, pl.sequence, pl.id ORDER BY pl.sequence''',(tuple(ids),))
res = cr.fetchall()
@ -251,7 +251,7 @@ class hr_payslip(osv.osv):
'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'note': fields.text('Description'),
'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'details_by_salary_head': fields.function(_get_lines_salary_head, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'),
'details_by_salary_category': fields.function(_get_lines_salary_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'),
'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
}
_defaults = {
@ -471,10 +471,10 @@ class hr_payslip(osv.osv):
return res
def get_payslip_lines(self, cr, uid, contract_ids, payslip_id, context):
def _sum_salary_head(localdict, head, amount):
if head.parent_id:
localdict = _sum_salary_head(localdict, head.parent_id, amount)
localdict['heads'][head.code] = head.code in localdict['heads'] and localdict['heads'][head.code] + amount or amount
def _sum_salary_category(localdict, category, amount):
if category.parent_id:
localdict = _sum_salary_category(localdict, category.parent_id, amount)
localdict['categories'][category.code] = category.code in localdict['categories'] and localdict['categories'][category.code] + amount or amount
return localdict
#we keep a dict with the result because a value can be overwritten by another rule with the same code
@ -485,7 +485,7 @@ class hr_payslip(osv.osv):
worked_days = {}
for input_line in payslip.input_line_ids:
worked_days[input_line.code] = input_line
localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days}
localdict = {'categories': {}, 'payslip': payslip, 'worked_days': worked_days}
#get the ids of the structures on the contracts and their parent id as well
structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
#get the rules of the structure and thier children
@ -507,8 +507,8 @@ class hr_payslip(osv.osv):
previous_amount = rule.code in localdict and localdict[rule.code] or 0.0
#set/overwrite the amount computed for this rule in the localdict
localdict[rule.code] = amount
#sum the amount for its salary head
localdict = _sum_salary_head(localdict, rule.category_id, amount - previous_amount)
#sum the amount for its salary category
localdict = _sum_salary_category(localdict, rule.category_id, amount - previous_amount)
#create/overwrite the rule in the temporary results
result_dict[key] = {
'salary_rule_id': rule.id,
@ -555,7 +555,6 @@ class hr_payslip(osv.osv):
#defaults
res = {'value':{
'line_ids':[],
#'details_by_salary_head':[], TODO put me back
'name':'',
'contract_id': False,
'struct_id': False,
@ -642,13 +641,13 @@ class hr_salary_rule(osv.osv):
'code':fields.char('Code', size=64, required=True, help="The code of salary rules can be used as reference in computation of other rules. In that case, it is case sensitive."),
'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days['WORK100']['number_of_days']."),
'category_id':fields.many2one('hr.salary.head', 'Salary Head', required=True),
'category_id':fields.many2one('hr.salary.category', 'Category', required=True),
'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),
'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"),
'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True),
'company_id':fields.many2one('res.company', 'Company', required=False),
'condition_select': fields.selection([('none', 'Always True'),('range', 'Range'), ('python', 'Python Expression')], "Condition Based on", required=True),
'condition_range':fields.char('Range Based on',size=1024, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),#old name = conputional expression
'condition_range':fields.char('Range Based on',size=1024, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all categories code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
'condition_python':fields.text('Python Condition', required=True, readonly=False, help='Applied this rule for calculation if condition is true. You can specify condition like basic > 1000.'),#old name = conditions
'condition_range_min': fields.float('Minimum Range', required=False, help="The minimum amount, applied for this rule."),
'condition_range_max': fields.float('Maximum Range', required=False, help="The maximum amount, applied for this rule."),
@ -660,7 +659,7 @@ class hr_salary_rule(osv.osv):
'amount_fix': fields.float('Fixed Amount', digits_compute=dp.get_precision('Account'),),
'amount_percentage': fields.float('Percentage (%)', digits_compute=dp.get_precision('Account'), help='For example, enter 50.0 to apply a percentage of 50%'),
'amount_python_compute':fields.text('Python Code'),
'amount_percentage_base':fields.char('Percentage based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'), #old name = expressiont
'amount_percentage_base':fields.char('Percentage based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'),
'child_ids':fields.one2many('hr.salary.rule', 'parent_rule_id', 'Child Salary Rule'),
'register_id':fields.property(
'hr.contribution.register',
@ -682,7 +681,7 @@ class hr_salary_rule(osv.osv):
# employee: hr.employee object
# contract: hr.contract object
# rules: rules code (previously computed)
# heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes.
# worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
# Note: returned value have to be set in the variable 'result'
@ -696,12 +695,12 @@ result = contract.wage * 0.10''',
# employee: hr.employee object
# contract: hr.contract object
# rules: rules code (previously computed)
# heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes.
# worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
# Note: returned value have to be set in the variable 'result'
result = rules['NET'] > heads['NET'] * 0.10''',
result = rules['NET'] > categories['NET'] * 0.10''',
'condition_range': 'contract.wage',
'sequence': 5,
'appears_on_payslip': True,

144
addons/hr_payroll/hr_payroll_data.xml
View File

@ -2,164 +2,36 @@
<openerp>
<data noupdate="1">
<record id="BASIC" model="hr.salary.head">
<record id="BASIC" model="hr.salary.category">
<field name="name">Basic</field>
<field name="code">BASIC</field>
</record>
<record id="ALW" model="hr.salary.head">
<record id="ALW" model="hr.salary.category">
<field name="name">Allowance</field>
<field name="code">ALW</field>
</record>
<record id="DED" model="hr.salary.head">
<record id="DED" model="hr.salary.category">
<field name="name">Deduction</field>
<field name="code">DED</field>
</record>
<record id="GROSS" model="hr.salary.head">
<record id="GROSS" model="hr.salary.category">
<field name="name">Gross</field>
<field name="code">GROSS</field>
</record>
<record id="NET" model="hr.salary.head">
<record id="NET" model="hr.salary.category">
<field name="name">Net</field>
<field name="code">NET</field>
</record>
<record id="COMP" model="hr.salary.head">
<record id="COMP" model="hr.salary.category">
<field name="name">Company Contribution</field>
<field name="code">COMP</field>
</record>
<!-- <record id="HRA" model="hr.salary.head">
<field name="code">HRA</field>
<field name="parent_id" ref="AL"/>
<field name="name">House Rent Allowance</field>
<field name="sequence" eval="5"/>
</record>
<record id="CA" model="hr.salary.head">
<field name="code">CA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Conveyance Allowance</field>
<field name="sequence" eval="10"/>
</record>
<record id="MA" model="hr.salary.head">
<field name="code">MA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Medical Allowance</field>
<field name="sequence" eval="15"/>
</record>
<record id="TELA" model="hr.salary.head">
<field name="code">TELA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Telephone Allowance</field>
<field name="sequence" eval="20"/>
</record>
<record id="LTA" model="hr.salary.head">
<field name="code">LTA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Leave Travel Allowance</field>
<field name="sequence" eval="25"/>
</record>
<record id="NA" model="hr.salary.head">
<field name="code">NA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Newspaper Allowance</field>
<field name="sequence" eval="30"/>
</record>
<record id="TA" model="hr.salary.head">
<field name="code">TA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Traveling Allowance</field>
<field name="sequence" eval="35"/>
</record>
<record id="FA" model="hr.salary.head">
<field name="code">FA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Food Allowance</field>
<field name="sequence" eval="40"/>
</record>
<record id="DA" model="hr.salary.head">
<field name="code">DA</field>
<field name="parent_id" ref="AL"/>
<field name="name">Dearness Allowance</field>
<field name="sequence" eval="45"/>
</record>
<record id="PF" model="hr.salary.head">
<field name="code">PF</field>
<field name="parent_id" ref="DED"/>
<field name="name">Provident Fund</field>
<field name="sequence" eval="50"/>
</record>
<record id="PT" model="hr.salary.head">
<field name="code">PT</field>
<field name="parent_id" ref="DED"/>
<field name="name">Professional Tax</field>
<field name="sequence" eval="55"/>
</record>
<record id="WF" model="hr.salary.head">
<field name="code">WF</field>
<field name="parent_id" ref="DED"/>
<field name="name">Welfare</field>
<field name="sequence" eval="60"/>
</record>
<record id="TDS" model="hr.salary.head">
<field name="code">TDS</field>
<field name="parent_id" ref="DED"/>
<field name="name">Tax Deduct at Source</field>
<field name="sequence" eval="65"/>
</record>
<record id="LWP" model="hr.salary.head">
<field name="code">LWP</field>
<field name="parent_id" ref="DED"/>
<field name="name">Leave without pay</field>
<field name="sequence" eval="70"/>
</record>
<record id="FC" model="hr.salary.head">
<field name="code">FC</field>
<field name="parent_id" ref="DED"/>
<field name="name">Food Coupons</field>
<field name="sequence" eval="75"/>
</record>
<record id="ESI" model="hr.salary.head">
<field name="code">ESI</field>
<field name="parent_id" ref="DED"/>
<field name="name">Employee's State Insurance</field>
<field name="sequence" eval="80"/>
</record>
<record id="NET" model="hr.salary.head">
<field name="code">TP</field>
<field name="parent_id" ref="AL"/>
<field name="name">Total Payment</field>
<field name="sequence" eval="85"/>
</record>
<record id="hr_salary_rule_net" model="hr.salary.rule">
<field name="amount_type">code</field>
<field name="code">NET</field>
<field name="category_id" ref="NET"/>
<field name="name">NET</field>
<field name="sequence" eval="500"/>
<field name="python_compute">total = basic+allowance+deduction</field>
</record>
-->
<record id="hr_rule_basic" model="hr.salary.rule">
<field name="name">Basic</field>
<field name="sequence" eval="1"/>
@ -177,7 +49,7 @@
<field name="category_id" ref="hr_payroll.GROSS"/>
<field name="condition_select">none</field>
<field name="amount_select">code</field>
<field name="amount_python_compute">result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0)</field>
<field name="amount_python_compute">result = categories['BASIC'] + ('ALW' in categories and categories['ALW'] or 0.0)</field>
</record>
<record id="hr_rule_net" model="hr.salary.rule">
@ -187,7 +59,7 @@
<field name="category_id" ref="hr_payroll.NET"/>
<field name="condition_select">none</field>
<field name="amount_select">code</field>
<field name="amount_python_compute">result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0) + ('DED' in heads and heads['DED'] or 0.0)</field>
<field name="amount_python_compute">result = categories['BASIC'] + ('ALW' in categories and categories['ALW'] or 0.0) + ('DED' in categories and categories['DED'] or 0.0)</field>
</record>

49
addons/hr_payroll/hr_payroll_view.xml
View File

@ -193,7 +193,7 @@
</group>
<newline/>
<group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Salary Head" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
<filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
<separator orientation="vertical"/>
<filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/>
<separator orientation="vertical"/>
@ -260,8 +260,8 @@
</field>
</page>
<!-- TODO: put me back -->
<page string="Details By Salary Head">
<field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
<page string="Details By Salary Category">
<field name="details_by_salary_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
<tree string="Payslip Lines" colors="blue:total == 0">
<field name="category_id"/>
<field name="name"/>
@ -346,13 +346,13 @@
</record>
<menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
<!-- Payment Heads -->
<record id="hr_salary_head_form" model="ir.ui.view">
<field name="name">hr.salary.head.form</field>
<field name="model">hr.salary.head</field>
<!-- Salary Category-->
<record id="hr_salary_category_form" model="ir.ui.view">
<field name="name">hr.salary.category.form</field>
<field name="model">hr.salary.category</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Salary Heads">
<form string="Salary Categories">
<group col="3" colspan="6">
<field name="name" select="1"/>
<field name="code" select="1"/>
@ -364,12 +364,12 @@
</field>
</record>
<record id="hr_salary_head_tree" model="ir.ui.view">
<field name="name">hr.salary.head.tree</field>
<field name="model">hr.salary.head</field>
<record id="hr_salary_category_tree" model="ir.ui.view">
<field name="name">hr.salary.category.tree</field>
<field name="model">hr.salary.category</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Salary Heads">
<tree string="Salary Rule Categories">
<field name="name"/>
<field name="code"/>
<field name="parent_id" invisible="1"/>
@ -377,32 +377,31 @@
</field>
</record>
<record id="view_hr_salary_head_filter" model="ir.ui.view">
<field name="name">hr.salary.head.select</field>
<field name="model">hr.salary.head</field>
<record id="view_hr_salary_category_filter" model="ir.ui.view">
<field name="name">hr.salary.category.select</field>
<field name="model">hr.salary.category</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Salary Heads">
<search string="Salary Rule Categories">
<field name="name" select="1"/>
<field name="code" select="1"/>
</search>
</field>
</record>
<record id="action_hr_salary_head" model="ir.actions.act_window">
<field name="name">Salary Heads</field>
<field name="res_model">hr.salary.head</field>
<record id="action_hr_salary_category" model="ir.actions.act_window">
<field name="name">Salary Categories</field>
<field name="res_model">hr.salary.category</field>
<field name="view_type">form</field>
<field name="view_id" ref="hr_salary_head_tree"/>
<field name="search_view_id" ref="view_hr_salary_head_filter"/>
<field name="view_id" ref="hr_salary_category_tree"/>
<field name="search_view_id" ref="view_hr_salary_category_filter"/>
</record>
<menuitem
id="menu_hr_salary_head"
action="action_hr_salary_head"
id="menu_hr_salary_category"
action="action_hr_salary_category"
parent="payroll_configure"
sequence="11"
/>
<!-- End Payment Heads -->
<!--
Contribution Register
@ -564,7 +563,7 @@
</group>
<newline/>
<group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Head" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
<filter string="Category" icon="terp-folder-yellow" name="category" context="{'group_by':'category_id'}"/>
</group>
</search>
</field>

2
addons/hr_payroll/security/ir.model.access.csv
View File

@ -1,7 +1,7 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1
"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,1,1,1
"access_hr_salary_category","hr.salary.category","model_hr_salary_category","base.group_hr_user",1,1,1,1
"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
"access_res_partner_payroll","res.partner.payroll","base.model_res_partner","base.group_hr_user",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_hr_payroll_structure hr.payroll.structure model_hr_payroll_structure base.group_hr_user 1 1 1 1
3 access_hr_contribution_register hr.contribution.register model_hr_contribution_register base.group_hr_user 1 1 1 1
4 access_hr_salary_head access_hr_salary_category hr.salary.head hr.salary.category model_hr_salary_head model_hr_salary_category base.group_hr_user 1 1 1 1
5 access_hr_payslip hr.payslip model_hr_payslip base.group_hr_user 1 1 1 1
6 access_hr_payslip_line hr.payslip.line model_hr_payslip_line base.group_hr_user 1 1 1 1
7 access_res_partner_payroll res.partner.payroll base.model_res_partner base.group_hr_user 1 1 1 1