projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d854d9
e1a9e04
)
[MERGE] with trunk
author
Thibault Francois
<tfr@openerp.com>
Wed, 10 Nov 2010 12:09:02 +0000
(13:09 +0100)
committer
Thibault Francois
<tfr@openerp.com>
Wed, 10 Nov 2010 12:09:02 +0000
(13:09 +0100)
bzr revid: tfr@openerp.com-
20101110120902
-k60lls4irx842pq2
1
2
addons/hr_payroll/hr_payroll.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_payroll/report/report_employees_detail.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_payroll/report/report_payroll_advice.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_payroll/report/report_payslip.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_payroll/report/report_year_salary.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_payroll/report/rml_parse.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_payroll_account/hr_payroll_account.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/hr_payroll/hr_payroll.py
Simple merge
diff --cc
addons/hr_payroll/report/report_employees_detail.py
Simple merge
diff --cc
addons/hr_payroll/report/report_payroll_advice.py
Simple merge
diff --cc
addons/hr_payroll/report/report_payslip.py
Simple merge
diff --cc
addons/hr_payroll/report/report_year_salary.py
Simple merge
diff --cc
addons/hr_payroll/report/rml_parse.py
Simple merge
diff --cc
addons/hr_payroll_account/hr_payroll_account.py
Simple merge
diff --cc
addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
Simple merge