projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d478aa2
d954a74
)
[MERGE] lp:openobject-addons
author
Kuldeep Joshi (OpenERP)
<kjo@tinyerp.com>
Thu, 24 May 2012 13:20:45 +0000
(18:50 +0530)
committer
Kuldeep Joshi (OpenERP)
<kjo@tinyerp.com>
Thu, 24 May 2012 13:20:45 +0000
(18:50 +0530)
bzr revid: kjo@tinyerp.com-
20120524132045
-dllvk05a2lxchcyr
1
2
addons/hr/hr_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_evaluation/hr_evaluation_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_evaluation/report/hr_evaluation_report_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_expense/report/hr_expense_report_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_recruitment/hr_recruitment_menu.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/hr_recruitment/report/hr_recruitment_report_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/hr/hr_view.xml
Simple merge
diff --cc
addons/hr_evaluation/hr_evaluation_view.xml
Simple merge
diff --cc
addons/hr_evaluation/report/hr_evaluation_report_view.xml
Simple merge
diff --cc
addons/hr_expense/report/hr_expense_report_view.xml
Simple merge
diff --cc
addons/hr_recruitment/hr_recruitment_menu.xml
Simple merge
diff --cc
addons/hr_recruitment/report/hr_recruitment_report_view.xml
Simple merge
projects / odoo / odoo.git / commitdiff