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

[FIX]: fix a problems in payroll module 

bzr revid: mga@tinyerp.com-20100629172204-0jmz15a7ak6nk7ff
This commit is contained in:
Mantavya Gajjar 2010-06-29 22:52:04 +05:30
parent 41a15f72a0
commit 8a7e4a2617
7 changed files with 165 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr/hr_view.xml
View File

@ -9,7 +9,7 @@
<menuitem
id="menu_hr_main"
parent="menu_hr_root"
name="Human Resources Management"
name="Human Resources"
sequence="0"/>
<menuitem
id="menu_hr_configuration"
@ -19,7 +19,7 @@
sequence="50" />
<menuitem
id="menu_hr_management"
name="Human Resources Management"
name="Human Resources"
parent="hr.menu_hr_configuration"
groups="group_hr_manager"
sequence="1" />

18
addons/hr_holidays/hr_holidays_report.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0"?>
<openerp>
<data>
<report id="report_holidays_summary"
string="Summary Of Leaves"
model="hr.holidays"
name="holidays.summary"
xsl="hr_holidays/report/holidays_summary.xsl"
auto="False"
menu="False"/>
<data>
<report id="report_holidays_summary"
string="Summary Of Leaves"
model="hr.holidays"
name="holidays.summary"
xsl="hr_holidays/report/holidays_summary.xsl"
auto="False"
menu="False"/>
</data>
</data>
</openerp>

186
addons/hr_holidays/hr_holidays_view.xml
View File

@ -55,11 +55,11 @@
</group>
<notebook colspan="4">
<page string="General">
<field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
<field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
<field name="department_id"/>
<field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
<field name="number_of_days_temp"/>
<field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
<field name="number_of_days_temp"/>
<newline/>
<field name="manager_id"/>
<field name="manager_id2"/>
@ -70,7 +70,7 @@
<group colspan="2">
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
<button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
@ -82,48 +82,48 @@
</record>
<!-- Holidays: Allocation Request -->
<record model="ir.ui.view" id="allocation_leave_new">
<field name="name">Allocation Request</field>
<field name="model">hr.holidays</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Allocation Request">
<group col="4" colspan="4">
<field name="name" select="1"/>
<field name="holiday_status_id" select="1"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
<group col="2" colspan="2">
<group attrs="{'invisible':[('holiday_type','=','category')]}">
<field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
</group>
<group attrs="{'invisible':[('holiday_type','=','employee')]}">
<field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
</group>
</group>
</group>
<notebook colspan="4">
<page string="General">
<field name="number_of_days_temp"/>
<field name="department_id"/>
<field name="manager_id"/>
<field name="manager_id2"/>
<separator string="Notes" colspan="4"/>
<field name="notes" nolabel="1" colspan="4" />
<newline/>
<field name="state" select="1" colspan="2"/>
<group colspan="2">
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
<button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
</group>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="allocation_leave_new">
<field name="name">Allocation Request</field>
<field name="model">hr.holidays</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Allocation Request">
<group col="4" colspan="4">
<field name="name" select="1"/>
<field name="holiday_status_id" select="1"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
<group col="2" colspan="2">
<group attrs="{'invisible':[('holiday_type','=','category')]}">
<field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
</group>
<group attrs="{'invisible':[('holiday_type','=','employee')]}">
<field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
</group>
</group>
</group>
<notebook colspan="4">
<page string="General">
<field name="number_of_days_temp"/>
<field name="department_id"/>
<field name="manager_id"/>
<field name="manager_id2"/>
<separator string="Notes" colspan="4"/>
<field name="notes" nolabel="1" colspan="4" />
<newline/>
<field name="state" select="1" colspan="2"/>
<group colspan="2">
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
<button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
</group>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_holiday_allocation_tree">
<field name="name">hr.holidays.allocation.tree</field>
@ -242,7 +242,7 @@
</record>
-->
<menuitem
name="Holidays Management"
name="Holidays"
parent="hr.menu_hr_root"
id="menu_open_ask_holidays"
sequence="5"/>
@ -257,53 +257,51 @@
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<menuitem
name="Leave Requests"
parent="menu_open_ask_holidays"
id="menu_open_ask_holidays_new"
action="open_ask_holidays"/>
<menuitem
name="Leave Requests"
parent="menu_open_ask_holidays"
id="menu_open_ask_holidays_new"
action="open_ask_holidays"/>
<record model="ir.actions.act_window" id="open_allocation_holidays">
<field name="name">Allocation Requests</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="context">{'search_default_user_id':uid,'type':'add'}</field>
<field name="domain">[('type','=','add')]</field>
<field name="view_id" ref="allocation_leave_new"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<record model="ir.actions.act_window" id="open_allocation_holidays">
<field name="name">Allocation Requests</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="context">{'search_default_user_id':uid,'type':'add'}</field>
<field name="domain">[('type','=','add')]</field>
<field name="view_id" ref="allocation_leave_new"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday_allocation_tree"/>
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday_allocation_tree"/>
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="allocation_leave_new"/>
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="allocation_leave_new"/>
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<menuitem
<menuitem
name="Allocation Requests"
parent="menu_open_ask_holidays"
id="menu_open_allocation_holidays"
@ -368,18 +366,18 @@
id="menu_open_view_holiday_status"
parent="hr.menu_open_view_attendance_reason_config"/>
<!-- holiday on resource leave -->
<!-- holiday on resource leave -->
<record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
<field name="name">resource.calendar.leaves.form.inherit</field>
<field name="model">resource.calendar.leaves</field>
<field name="type">form</field>
<field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
<field name="arch" type="xml">
<field name="date_to" position="after">
<field name="holiday_id"/>
</field>
<field name="date_to" position="after">
<field name="holiday_id"/>
</field>
</field>
</record>
</record>
<!-- Shortcuts -->
<act_window name="Holidays"

20
addons/hr_holidays/hr_holidays_wizard.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<openerp>
<data>
<menuitem
<data>
<menuitem
id="hr.menu_hr_reporting"
name="Reporting"
parent="hr.menu_hr_root"
@ -11,21 +11,5 @@
name="Holidays"
parent="hr.menu_hr_reporting"
sequence="6" />
<!--<wizard string="Holidays by Departement"
name="hr.holidays.summary"
id="holidays_summary"/>-->
<!--<menuitem name="Leaves by Departement" parent="menu_hr_reporting_holidays"
icon="STOCK_PRINT"
action="holidays_summary"
type="wizard"
id="menu_holidays_summary" sequence="20"/>
<record model='ir.ui.menu' id="menu_holidays_summary">
<field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
</record>
-->
<!--<wizard string="Employee's Holidays"
model="hr.employee" name="hr.holidays.summary.employee"
keyword="client_print_multi" id="wizard_holidays_summary" />-->
</data>
</openerp>

33
addons/hr_payroll/hr_payroll.py
View File

@ -797,7 +797,6 @@ class hr_payslip(osv.osv):
'paid':fields.boolean('Paid ? ', required=False),
'note':fields.text('Description'),
'contract_id':fields.many2one('hr.contract', 'Contract', required=False),
'igross': fields.float('Calculaton Field', readonly=True, digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
'inet': fields.float('Calculaton Field', readonly=True, digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
}
@ -843,20 +842,11 @@ class hr_payslip(osv.osv):
move_pool = self.pool.get('account.move')
for slip in self.browse(cr, uid, ids, context):
if slip.move_id:
if slip.move_id.state == 'posted':
move_pool.button_cancel(cr, uid [slip.move_id.id], context)
move_pool.unlink(cr, uid, [slip.move_id.id])
if slip.adj_move_id:
if slip.adj_move_id.state == 'posted':
move_pool.button_cancel(cr, uid [slip.adj_move_id.id], context)
move_pool.unlink(cr, uid, [slip.adj_move_id.id])
if slip.other_move_id:
if slip.other_move_id.state == 'posted':
move_pool.button_cancel(cr, uid [slip.other_move_id.id], context)
move_pool.unlink(cr, uid, [slip.other_move_id.id])
for line in slip.move_ids:
if slip.move_id:
if slip.move_id.state == 'posted':
move_pool.button_cancel(cr, uid [slip.move_id.id], context)
move_pool.unlink(cr, uid, [slip.move_id.id])
self.write(cr, uid, ids, {'state':'cancel'})
return True
@ -1385,7 +1375,9 @@ class hr_payslip(osv.osv):
LIMIT 1
'''
cr.execute(sql_req, (employee.id, date, date))
contract = cr.dictfetchone()
contract = cr.dictfetchone()
contract = contract and contract or {}
return contract
@ -1589,9 +1581,12 @@ class hr_payslip(osv.osv):
})
self.write(cr, uid, [slip.id], update)
for slip in self.browse(cr, uid, ids):
basic_before_leaves = basic
if not slip.contract_id :
continue
basic_before_leaves = slip.basic
working_day = 0
off_days = 0
@ -1600,7 +1595,7 @@ class hr_payslip(osv.osv):
days_arr = [0, 1, 2, 3, 4, 5, 6]
for dy in range(contract.working_days_per_week, 7):
off_days += get_days(1, dates[1].day, dates[1].month, dates[1].year, days_arr[dy])
total_off = off_days
working_day = dates[1].day - total_off
perday = slip.net / working_day

33
addons/hr_payroll/hr_payroll_view.xml
View File

@ -491,10 +491,10 @@
<field name="move_payment_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
<group col="9" colspan="4">
<group col="10" colspan="4">
<field name="state"/>
<button string="Compute Sheet" name="compute_sheet" states="new"/>
<button string="Recompute Sheet" name="compute_sheet" type="object" states="draft"/>
<button string="Compute Sheet" icon="STOCK_JUMP_TO" name="compute_sheet" states="new"/>
<button string="Recompute Sheet" icon="STOCK_JUMP_TO" name="compute_sheet" type="object" states="draft"/>
<button string="Verify Sheet" name="verify_sheet" states="draft"/>
<button string="Complete HR Checking" name="verify_twice_sheet" states="hr_check"/>
<button string="Complete Accountant Checking" name="final_verify_sheet" states="accont_check"/>
@ -505,11 +505,38 @@
</form>
</field>
</record>
<record id="view_hr_payslip_filter" model="ir.ui.view">
<field name="name">hr.payslip.select</field>
<field name="model">hr.payslip</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Payslips">
<group col="8" colspan="4">
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Slip"/>
<separator orientation="vertical"/>
<filter icon="terp-account" string="Paid" domain="[('state','=','done'),('paid','=',True)]" help="Paid Slip"/>
<field name="name"/>
<field name="employee_id"/>
<field name="number"/>
<field name="date"/>
</group>
<newline/>
<group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'register_id':self}"/>
<filter string="Employees" icon="terp-partner" name="employee_id" context="{'employee_id':self}"/>
<filter string="Periods" name="period_id" icon="terp-go-month" context="{'period_id':self}"/>
<filter string="Staes" name="state" icon="terp-stock_effects-object-colorize" context="{'state':self}"/>
</group>
</search>
</field>
</record>
<record id="action_view_hr_payslip_form" model="ir.actions.act_window">
<field name="name">Employee Payslip</field>
<field name="res_model">hr.payslip</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_hr_payslip_tree"/>
<field name="search_view_id" ref="view_hr_payslip_filter"/>
</record>
<menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>

32
addons/hr_payroll/hr_payroll_wizard.xml
View File

@ -1,40 +1,40 @@
<?xml version="1.0" ?>
<openerp>
<data>
<data>
<menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
<wizard id="wizard_print_year_salary"
menu="False"
model="hr.payslip"
name="wizard.year.salary"
string="Year Salary Detail"/>
string="Salary Register"/>
<menuitem id="menu_wizard_print_year_salary"
icon="STOCK_PRINT"
action="wizard_print_year_salary"
parent="menu_hr_payroll_reporting"
name="Employee Year Salary"
name="Salary Register"
type="wizard"/>
<wizard id="wizard_print_employees_detail"
menu="False"
model="hr.payslip"
name="wizard.employees.detail"
string="Employees Salary Detail"/>
string="Employee Salary Statement"/>
<menuitem id="menu_wizard_print_employees_detail"
icon="STOCK_PRINT"
action="wizard_print_employees_detail"
parent="menu_hr_payroll_reporting"
name="Employees Salary Detail"
name="Employee Salary Statement"
type="wizard"/>
<wizard id="wizard_payroll_analysis"
menu="False"
model="account.analytic.account"
name="payroll.analysis"
string="Create Analytic Structure"/>
<menuitem id="menu_wizard_payroll_analysis"
action="wizard_payroll_analysis"
parent="payroll_configure"
name="Create Analytic Structure"
type="wizard"/>
</data>
<!-- <wizard id="wizard_payroll_analysis"-->
<!-- menu="False" -->
<!-- model="account.analytic.account" -->
<!-- name="payroll.analysis" -->
<!-- string="Create Analytic Structure"/>-->
<!-- <menuitem id="menu_wizard_payroll_analysis" -->
<!-- action="wizard_payroll_analysis" -->
<!-- parent="payroll_configure" -->
<!-- name="Create Analytic Structure"-->
<!-- type="wizard"/>-->
</data>
</openerp>