projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e36fb22 3ee0f15)
[MERGE] Merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Thu, 20 May 2010 04:16:31 +0000 (09:46 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Thu, 20 May 2010 04:16:31 +0000 (09:46 +0530)
commit38dd957438daddec06d314024009860ff5cfa9ed
tree7148d7b2dc839c64ea03b97d0c2348fa0464b3bbtree | snapshot
parente36fb2209f9fcfa67878a2c10c2e0e205d282a34commit | diff
parent3ee0f15d25199ce63d64e21946fdc6c542d8acbfcommit | diff
[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
17 files changed:
addons/account/account.py diff1 | diff2 | blob | history
addons/account/account_analytic_line.py diff1 | diff2 | blob | history
addons/account/account_invoice_view.xml diff1 | diff2 | blob | history
addons/account/account_view.xml diff1 | diff2 | blob | history
addons/account/wizard/account_invoice_refund.py diff1 | diff2 | blob | history
addons/hr/hr_view.xml diff1 | diff2 | blob | history
addons/hr_expense/hr_expense.py diff1 | diff2 | blob | history
addons/hr_holidays/hr_holidays.py diff1 | diff2 | blob | history
addons/hr_holidays/report/available_holidays_view.xml diff1 | diff2 | blob | history
addons/hr_holidays/report/hr_holidays_report_view.xml diff1 | diff2 | blob | history
addons/hr_timesheet/hr_timesheet.py diff1 | diff2 | blob | history
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml diff1 | diff2 | blob | history
addons/hr_timesheet_sheet/hr_timesheet_sheet.py diff1 | diff2 | blob | history
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml diff1 | diff2 | blob | history
addons/hr_timesheet_sheet/report/timesheet_report_view.xml diff1 | diff2 | blob | history
addons/project/project_view.xml diff1 | diff2 | blob | history
addons/project/report/project_report_view.xml diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.