[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 25 Jun 2012 05:04:07 +0000 (10:34 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 25 Jun 2012 05:04:07 +0000 (10:34 +0530)
commit3c7cd469e6d69c3c76cf15376e40a447bdf6066f
tree2af6bc55fa83186cf6229b7cb61f5eb51dca852b
parentbbdbb9dd6b84bcdef34e7782432064d88fbe466f
parent0a22debf5fb7af0dbf4ebf5039aa6ecbfb054a95
[MERGE]

bzr revid: apa@tinyerp.com-20120622090553-lkvmsz12ooao1lug
bzr revid: apa@tinyerp.com-20120625050407-vfjnqgnqexrfvr8d
15 files changed:
addons/account/project/project_view.xml
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
addons/account_budget/account_budget_view.xml
addons/hr_expense/hr_expense_view.xml
addons/hr_timesheet/hr_timesheet_view.xml
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
addons/hr_timesheet_invoice/report/report_analytic_view.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
addons/project/project_view.xml
addons/project_issue/project_issue_view.xml
addons/project_long_term/project_long_term_view.xml
addons/project_timesheet/project_timesheet_view.xml
addons/sale/sale_view.xml
addons/stock/i18n/ja.po