[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120515073246-73t1llk8rmt2z4a7

38 files changed, 976 insertions, 730 deletions

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4447f99d30d..5a9e808bf2d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,7 +53,7 @@
                 <form string="Invoice Line">
                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                     <field colspan="2" name="name"/>
-                    <label string="Quantity :" align="1.0"/>
+                    <label string="Quantity" for="quantity" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="quantity" nolabel="1"/>
                         <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 938fff39f59..f6f1429b445 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-14 03:35+0000\n"
+"PO-Revision-Date: 2012-05-15 01:20+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-14 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n"
 "X-Generator: Launchpad (build 15238)\n"
 
 #. module: account
@@ -43,7 +43,7 @@ msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金�
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "仕訳帳エントリーの調整"
+msgstr "仕訳帳エントリーの消し込み"
 
 #. module: account
 #: view:account.account:0
@@ -109,7 +109,7 @@ msgstr "借方合計"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
-msgstr "取引を調整しない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
+msgstr "取引を消し込みしない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
 
 #. module: account
 #: constraint:account.journal:0
@@ -131,7 +131,7 @@ msgstr "起点"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "調整"
+msgstr "消し込み"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -218,7 +218,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "調整選択行の移動"
+msgstr "消し込み選択行の移動"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -237,7 +237,7 @@ msgstr "請求書 %s は部分的に支払われます：%s%s / %s%s（%s%s 残�
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "会計エントリーは調整の入力です。"
+msgstr "会計エントリーは消し込みの入力です。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -327,7 +327,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "調整なしアカウント"
+msgstr "消し込みなしアカウント"
 
 #. module: account
 #: view:product.product:0
@@ -430,7 +430,7 @@ msgstr "貸方合計"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr "不一致を開く"
+msgstr "未消し込みを開く"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -551,7 +551,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "調整なし取引"
+msgstr "未消し込み取引"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -601,7 +601,7 @@ msgstr "３ヶ月毎"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr "取引を調整しない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
+msgstr "取引を消し込みしない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -677,7 +677,7 @@ msgstr "仕訳帳期間"
 #: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr "エントリーを調整するために、会社は全てのエントリーに対して同じであるべきです。"
+msgstr "エントリーを消し込みするために、会社は全てのエントリーに対して同じであるべきです。"
 
 #. module: account
 #: view:account.account:0
@@ -721,7 +721,7 @@ msgstr "請求書印刷"
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr "本日パートナ調整後"
+msgstr "本日パートナ消し込み済"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
@@ -813,7 +813,7 @@ msgstr "仕入先請求書と返金"
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr "不一致"
+msgstr "未消し込み"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -828,7 +828,7 @@ msgstr "アカウント分析仕訳帳"
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr "自動調整"
+msgstr "自動消し込み"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -872,7 +872,7 @@ msgstr "これをチェックした場合、アカウントの新しいチャー
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
-msgstr "請求書 %s は既に調整済のため変更できません。請求書は最初に未調整であるべきです。この請求書の返金のみができます。"
+msgstr "請求書 %s は既に消し込み済のため変更できません。請求書は最初に消し込みなしであるべきです。この請求書の返金のみができます。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -887,7 +887,7 @@ msgstr "計算"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr "キャンセル：請求書と調整の返金"
+msgstr "キャンセル：請求書と消し込みの返金"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -931,7 +931,7 @@ msgstr "アカウント %s は勘定科目表 %s に属していないため、�
 msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
-msgstr "このアカウントは調整を許されていません。これを変更するにはアカウントの定義を更新する必要があります。"
+msgstr "このアカウントは消し込みを許されていません。これを変更するにはアカウントの定義を更新する必要があります。"
 
 #. module: account
 #: view:account.invoice:0
@@ -1370,7 +1370,7 @@ msgstr "税金テンプレート検索"
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr "エントリーの調整"
+msgstr "エントリーの消し込み"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
@@ -1542,7 +1542,7 @@ msgstr "会計ポジションテンプレート"
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "調整済取引"
+msgstr "消し込み済取引"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
@@ -1614,7 +1614,7 @@ msgid ""
 "form."
 msgstr ""
 "銀行取引明細書は預金口座、クレジットカードまたは金融口座の任意の口座タイプ上で、所定の期間に発生した全ての金融取引を要約したものです。期首残高は自動的に繰"
-"り越され、期末残高は取引明細書に示されています。行の支払カラムで F1 を押すと照合フォームが開きます。"
+"り越され、期末残高は取引明細書に示されています。行の支払カラムで F1 を押すと消し込みフォームが開きます。"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1674,7 +1674,7 @@ msgstr "アカウントタイプ別売上"
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
-msgstr "請求書のキャンセル：現在の請求書をキャンセルするために返金請求書を作成し、検証し、調整して下さい。"
+msgstr "請求書のキャンセル：現在の請求書をキャンセルするために返金請求書を作成、検証、消し込みして下さい。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -2030,7 +2030,7 @@ msgstr "エントリーを開く"
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr "調整用のアカウント"
+msgstr "消し込み用のアカウント"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -2383,7 +2383,7 @@ msgstr "請求書のドラフト状態"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr "パートナ照合"
+msgstr "パートナ消し込み"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2414,7 +2414,7 @@ msgstr "30%の前払い30日期限"
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr "未照合のエントリー"
+msgstr "未消し込みのエントリー"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2538,7 +2538,7 @@ msgstr "このレポートは特定の仕訳帳の状況の概要を示してい
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr "アカウント移動行の調整（償却）"
+msgstr "アカウント移動行の消し込み（償却）"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2610,7 +2610,7 @@ msgstr "特殊な計算"
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "銀行照合"
+msgstr "銀行消し込み"
 
 #. module: account
 #: report:account.invoice:0
@@ -2639,12 +2639,12 @@ msgstr "モデルの中で誤った借方または貸方の値があります。
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr "自動調整"
+msgstr "自動消し込み"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "支払済 / 調整後"
+msgstr "支払済 / 消し込み済"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -2808,7 +2808,7 @@ msgstr "8月"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr "支払いエントリーは調整の第２の入力です。"
+msgstr "支払いエントリーは消し込みの第２の入力です。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2853,7 +2853,7 @@ msgstr "検証（請求書）日の期間を使うために空のままにして
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr "取引明細書の照合領域で使用されます。その他の場所では使うべきではありません。"
+msgstr "取引明細書の消し込み領域で使用されます。その他の場所では使うべきではありません。"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -3142,7 +3142,7 @@ msgstr "タイプ別今月の売上"
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "調整 / 未調整アカウント"
+msgstr "未消し込み / 消し込み アカウント"
 
 #. module: account
 #: sql_constraint:account.tax:0
@@ -3166,8 +3166,8 @@ msgstr ""
 "\n"
 "　\"なし\" は何も行われないことを意味します。\n"
 "　\"残高\"は一般的には現金のアカウントのために使用されます。\n"
-"　\"詳細\"は調整されたものも含む前年のそれぞれの既存仕訳帳項目をコピーします。\n"
-"　\"未調整\"は未調整だった仕訳帳項目のみを新会計年度の初日としてコピーします。"
+"　\"詳細\"は消し込みされたものも含む前年のそれぞれの既存仕訳帳項目をコピーします。\n"
+"　\"未消し込み\"は未消し込みだった仕訳帳項目のみを新会計年度の初日としてコピーします。"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -3300,7 +3300,7 @@ msgstr "会社の通貨と異なっている場合は、金額は関係するア
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr "未調整エントリー"
+msgstr "未消し込みエントリー"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3429,7 +3429,7 @@ msgstr "アカウントタイプ別売上レポート"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "未調整仕訳帳項目"
+msgstr "未消し込み仕訳帳項目"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3491,7 +3491,7 @@ msgstr "ビューアカウントでは仕訳帳項目を作ることはできま
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr "パートナ毎のパートナ調整プロセス"
+msgstr "パートナ毎のパートナ消し込みプロセス"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3551,7 +3551,7 @@ msgstr "記帳"
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr "未調整"
+msgstr "未消し込み"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3583,7 +3583,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:837
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "幾つかのエントリーは既に調整済です。"
+msgstr "幾つかのエントリーは既に消し込み済です。"
 
 #. module: account
 #: view:account.tax:0
@@ -3673,7 +3673,7 @@ msgstr "支払オーダー"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "ユーザがこのアカウントのエントリーを調整したい場合はこのオプションをチェックして下さい。"
+msgstr "ユーザがこのアカウントのエントリーを消し込みしたい場合はこのオプションをチェックして下さい。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3912,7 +3912,7 @@ msgstr "アカウントの表示"
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "（請求書を開く場合は、それは未調整でなければなりません）"
+msgstr "（請求書を開く場合は、それは未消し込みでなければなりません）"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4270,7 +4270,7 @@ msgstr "銀行取引明細書はシステムに入力されます。"
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr "償却の調整"
+msgstr "償却の消し込み"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -4317,7 +4317,7 @@ msgstr ""
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr "未調整取引"
+msgstr "未消し込み取引"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -4339,7 +4339,7 @@ msgstr "モデルからエントリーを作成"
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr "調整の許可"
+msgstr "消し込みの許可"
 
 #. module: account
 #: code:addons/account/account.py:1077
@@ -4515,7 +4515,7 @@ msgstr "実施日"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation Transactions"
-msgstr "不一致取引"
+msgstr "未消し込み取引"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4560,7 +4560,7 @@ msgstr "${object.company_id.name} 請求書（参照 ${object.number or 'n/a' }�
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
-msgstr "最後にパートナー会計エントリーが調整された日付"
+msgstr "最後にパートナー会計エントリーが消し込みされた日付"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4649,7 +4649,7 @@ msgstr "確かでしょうか？"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "銀行照合のために使用される銀行取引明細書"
+msgstr "銀行消し込みのために使用される銀行取引明細書"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -5031,7 +5031,7 @@ msgstr "税金アカウント"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr "調整結果"
+msgstr "消し込み結果"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
@@ -5313,7 +5313,8 @@ msgid ""
 "This is the remaining partners for who you should check if there is "
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
-msgstr "これは調整有無によらず、何らかの確認しなければならない残りのパートナです。調整としてこの数値には既に現在のパートナが含まれています。"
+msgstr ""
+"これは消し込みの有無によらず、何らかの確認しなければならない残りのパートナです。消し込みとしてこの数値には既に現在のパートナが含まれています。"
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5388,7 +5389,7 @@ msgstr "指定された仕訳帳はこの期間にひとつもドラフト状態
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr "調整行"
+msgstr "消し込み行"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5430,7 +5431,7 @@ msgstr "返金請求書オプション"
 msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
-msgstr "バランスポイントを見つけるために組み合わせることのできる部分的な量の数は、自動調整の能力として選択されます。"
+msgstr "バランスポイントを見つけるために組み合わせることのできる部分的な量の数は、自動消し込みの能力として選択されます。"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5496,7 +5497,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr "償却して調整"
+msgstr "償却して消し込み"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -5517,7 +5518,7 @@ msgstr "請求日"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr "アカウント自動調整"
+msgstr "アカウント自動消し込み"
 
 #. module: account
 #: view:account.move:0
@@ -5540,7 +5541,7 @@ msgstr "開始エントリーの生成"
 #: code:addons/account/account_move_line.py:759
 #, python-format
 msgid "Already Reconciled!"
-msgstr "既に調整済です。"
+msgstr "既に消し込み済です。"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5698,8 +5699,8 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
-"本日の調整処理の進捗状況を示してます。それは次式で計算されます。\n"
-"本日のパートナ調整後 / （残りのパートナ + 本日のパートナ調整後 ）"
+"本日の消し込み処理の進捗状況を示してます。それは次式で計算されます。\n"
+"本日のパートナ消し込み後 / （残りのパートナ + 本日のパートナ消し込み後 ）"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5766,7 +5767,7 @@ msgstr "非アクティブなアカウントを使うことはできません。
 #: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
-msgstr "エントリーは同じアカウントのものでないか、または既に調整済です。 "
+msgstr "エントリーは同じアカウントのものでないか、または既に消し込み済です。 "
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
@@ -5960,7 +5961,7 @@ msgstr "（今期を使う場合は空のままとして下さい）"
 msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
-msgstr "調整を終了するや否や、請求書の状態はシステム内で終了（すなわち支払済）となります。"
+msgstr "消し込みを終了するや否や、請求書の状態はシステム内で終了（すなわち支払済）となります。"
 
 #. module: account
 #: view:account.chart.template:0
@@ -5971,7 +5972,7 @@ msgstr "ルートアカウント"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr "最終調整日"
+msgstr "消し込み調整日"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
@@ -6083,7 +6084,7 @@ msgstr "会計年度"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr "部分調整エントリー"
+msgstr "部分消し込みエントリー"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6212,7 +6213,7 @@ msgstr "次回税金の計算のために基本金額に税額が含まれるべ
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr "調整：次のパートナへ"
+msgstr "消し込み：次のパートナへ"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -6401,7 +6402,7 @@ msgstr "幾つかの仕訳帳項目を含むアカウントを無効にするこ
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr "調整済"
+msgstr "消し込み済"
 
 #. module: account
 #: report:account.invoice:0
@@ -6428,7 +6429,7 @@ msgstr "現金取引"
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled"
-msgstr "請求書は既に調整済です。"
+msgstr "請求書は既に消し込み済です。"
 
 #. module: account
 #: view:account.account:0
@@ -6506,7 +6507,7 @@ msgid ""
 "Bank Reconciliation consists of verifying that your bank statement "
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
-msgstr "銀行照合は、銀行取引明細書が会計システムのそのアカウントのエントリー（またはレコード）と対応することを検証することから構成されます。"
+msgstr "銀行消し込みは、銀行取引明細書が会計システムのそのアカウントのエントリー（またはレコード）と対応することを検証することから構成されます。"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6664,8 +6665,8 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
-"支払いとみなされる請求書のため、請求書エントリーは通常の支払いでは相手方とともに調整されなければなりません。自動調整機能では、OpenERPは調整のため一"
-"連のアカウントの中を独自の検索を行います。それは金額が対応する各パートナのエントリーを見つけます。"
+"支払いとみなされる請求書のため、請求書エントリーは通常の支払いでは相手方とともに消し込みされなければなりません。自動消し込み機能では、OpenERPは消し"
+"込みのため一連のアカウントの中を独自の検索を行います。それは金額が対応する各パートナのエントリーを見つけます。"
 
 #. module: account
 #: view:account.move:0
@@ -6705,7 +6706,7 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
-"調整済エントリーにはこの変更はできません。変更できるのは幾つかの非法定項目のみです。または最初に未調整にしなければなりません。\n"
+"消し込み済エントリーにはこの変更はできません。変更できるのは幾つかの非法定項目のみです。または最初に未消し込みにしなければなりません。\n"
 "%s"
 
 #. module: account
@@ -6776,7 +6777,7 @@ msgstr "期首残高"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "調整アカウント"
+msgstr "消し込みアカウント"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -6812,7 +6813,7 @@ msgstr "このレポートは１枚のレポートでアカウントのそれぞ
 msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
-msgstr "その仕訳帳エントリーに確信がなく、会計専門家によるレビューされることを付記したい場合はこのボックスをチェックして下さい。"
+msgstr "その仕訳帳エントリーに確信がなく、会計専門家のレビューが必要と付記したい場合はこのボックスをチェックして下さい。"
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
@@ -6980,12 +6981,12 @@ msgstr "記帳された仕訳帳エントリー %s を削除することはで�
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
-msgstr "未調整エントリー"
+msgstr "未消し込みエントリー"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr "取引明細書調整"
+msgstr "取引明細書消し込み"
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
@@ -7294,7 +7295,7 @@ msgid ""
 "This field shows you the next partner that will be automatically chosen by "
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
-msgstr "この項目は調整済の最終日を基準に調整処理を通過することでシステムによって自動的に選択された次のパートナを示します。"
+msgstr "この項目は消し込み済の最終日を基準に消し込み処理を通過することでシステムによって自動的に選択された次のパートナを示します。"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -7487,7 +7488,7 @@ msgstr "売上属性"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr "手動調整"
+msgstr "手動消し込み"
 
 #. module: account
 #: report:account.overdue:0
@@ -7792,7 +7793,7 @@ msgstr "移動行の状態"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr "アカウント移動行調整"
+msgstr "アカウント移動行消し込み"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7949,7 +7950,7 @@ msgstr "このボックスがチェックされると、システムは請求書
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
-msgstr "このアカウントが仕訳帳項目の調整を許す場合は、このボックスをチェックして下さい。"
+msgstr "このアカウントが仕訳帳項目の消し込みを許す場合は、このボックスをチェックして下さい。"
 
 #. module: account
 #: help:account.period,state:0
@@ -7966,7 +7967,7 @@ msgstr "反転分析残高 -"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr "銀行調整を開く"
+msgstr "銀行消し込みを開く"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8012,7 +8013,7 @@ msgstr ""
 " ・ ドラフト：ユーザが新しく確認未済の請求書をエンコードした時に使用されます。\n"
 "・ プロフォーマ：請求書がプロフォーマ状態である時は、請求書は請求書番号を持っていません。\n"
 "・ 開く：請求書が作成され、請求書番号が生成された時に使用されます。開く状態はユーザが支払を終えるまで続きます。  \n"
-"・ 支払済：請求書が支払われると自動的にセットされます。関係する仕訳帳エントリーは調整されるかもしれません。\n"
+"・ 支払済：請求書が支払われると自動的にセットされます。関係する仕訳帳エントリーは消し込みされるかもしれません。\n"
 "・ キャンセル済：ユーザが請求書をキャンセルする時に使われます。"
 
 #. module: account
@@ -8150,7 +8151,7 @@ msgstr "税込価格の計算コード"
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
-msgstr "一部が支払済の請求書のキャンセルはできません。まず、関連する支払エントリーを未調整にする必要があります。"
+msgstr "一部が支払済の請求書のキャンセルはできません。まず、関連する支払エントリーを未消し込みにする必要があります。"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8192,7 +8193,7 @@ msgid ""
 "form."
 msgstr ""
 "顧客返金とともに顧客のためのクレジットノートを管理することができます。返金は全部あるいは部分的な請求書のクレジットのドキュメントです。請求書フォームから簡"
-"単に返金を生成したり、それを直接調整することができます。"
+"単に返金を生成したり、それを直接消し込みすることができます。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8259,7 +8260,7 @@ msgstr "関連するパートナとの訴訟としてこの仕訳帳項目をマ
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "部分調整"
+msgstr "部分消し込み"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
@@ -8301,7 +8302,7 @@ msgstr "仕訳帳ビュー"
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr "銀行調整の移動"
+msgstr "銀行消し込みの移動"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8345,9 +8346,9 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
-"このボタンは請求書の状態が支払済（全てが調整済であることを示す）で、自動計算されたブール値の調整済がFalse（もはやそのケースではないことを示す）の時に"
-"のみ表示されます。言い換えれば、請求書の調整は除去されもはや支払済状態と適合していません。結果的に作成されたかもしれない例外を解決した後に、それを再度開い"
-"て通常処理を継続させるためにこのボタンを押すべきです。"
+"このボタンは請求書の状態が支払済（全てが消し込み済であることを示す）で、自動計算されたブール値の消し込み済がFalse（もはやそのケースではないことを示す"
+"）の時にのみ表示されます。言い換えれば、請求書の消し込みは除去されもはや支払済状態と適合していません。結果的に作成されたかもしれない例外を解決した後に、そ"
+"れを再度開いて通常処理を継続させるためにこのボタンを押すべきです。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8576,7 +8577,7 @@ msgstr "仕訳帳名"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr "調整する次のパートナエントリー"
+msgstr "消し込みする次のパートナエントリー"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8698,7 +8699,7 @@ msgstr ""
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "調整済エントリー"
+msgstr "消し込み済エントリー"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -9051,7 +9052,7 @@ msgid ""
 "the invoice form."
 msgstr ""
 "仕入先返金とともに仕入先から受け取ったクレジットノートを管理することができます。返金は全部あるいは部分的な請求書のクレジットのドキュメントです。請求書フォ"
-"ームから簡単に返金を生成したり、それを直接調整することができます。"
+"ームから簡単に返金を生成したり、それを直接消し込みすることができます。"
 
 #. module: account
 #: view:account.account.template:0
@@ -9154,12 +9155,12 @@ msgstr ""
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr "調整のためにアカウントを選択する必要があります。"
+msgstr "消し込みのためにアカウントを選択する必要があります。"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr "会計エントリーは調整の最初の入力です。"
+msgstr "会計エントリーは消し込みの最初の入力です。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -9235,13 +9236,13 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
-"調整のために仕訳帳定義の中に\n"
+"消し込みのために仕訳帳定義の中に\n"
 "銀行口座を定義する必要があります。"
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr "調整取引"
+msgstr "消し込み取引"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9407,7 +9408,8 @@ msgstr "開始日"
 msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
-msgstr "この請求書は既に支払済で、１つあるいは幾つかの支払の仕訳帳エントリーを持ち、請求書が調整済みの仕訳帳エントリーであることを示しています。"
+msgstr ""
+"この請求書は既に支払済で、１つあるいは幾つかの支払の仕訳帳エントリーを持ち、請求書が消し込み済みの仕訳帳エントリーであることを示しています。"
 
 #. module: account
 #: view:account.invoice:0
@@ -9421,7 +9423,7 @@ msgstr "ドラフト請求書"
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "未調整"
+msgstr "未消し込み"
 
 #. module: account
 #: code:addons/account/account_invoice.py:828
@@ -9562,7 +9564,7 @@ msgid ""
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
 "設定エラー\n"
-"内部タイプが売掛金 / 買掛金のアカウントに対して未調整と異なる繰延方法を持つアカウントタイプを選択できません。 "
+"内部タイプが売掛金 / 買掛金のアカウントに対して未消し込みと異なる繰延方法を持つアカウントタイプを選択できません。 "
 
 #. module: account
 #: view:account.model:0
@@ -9660,7 +9662,7 @@ msgstr "損益計算書"
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr "調整のために開く"
+msgstr "消し込みのために開く"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -9672,7 +9674,7 @@ msgstr "親の左"
 msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
-msgstr "このタイプを基にした返金請求書。既に調整された請求書は変更やキャンセルができません。"
+msgstr "このタイプを基にした返金請求書。既に消し込みされた請求書は変更やキャンセルができません。"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9958,7 +9960,7 @@ msgid ""
 "This figure depicts the total number of partners that have gone throught the "
 "reconciliation process today. The current partner is counted as already "
 "processed."
-msgstr "この図は本日調整処理を通過したパートナの合計数を描画したものです。現在のパートナは既に処理されたとして数えられています。"
+msgstr "この図は本日消し込み処理を通過したパートナの合計数を描画したものです。現在のパートナは既に処理されたとして数えられています。"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -10126,7 +10128,7 @@ msgstr "アカウントタイプは閉鎖のものから他のタイプには変
 #: code:addons/account/account_move_line.py:832
 #, python-format
 msgid "Entry is already reconciled"
-msgstr "エントリーは既に調整済です。"
+msgstr "エントリーは既に消し込み済です。"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
@@ -10201,7 +10203,7 @@ msgstr "分析仕訳帳の印刷"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr "請求日の月によるグループ化"
+msgstr "請求月によるグループ化"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -10328,7 +10330,7 @@ msgstr "11月"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr "変更：返金請求書、調整、新しいドラフト請求書の作成"
+msgstr "変更：返金請求書、消し込み、新しいドラフト請求書の作成"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10545,7 +10547,7 @@ msgstr "請求書は終了状態です。"
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr "できるだけ早く調整を終えるために請求書の支払が可能です。"
+msgstr "できるだけ早く消し込みを終えるために請求書の支払が可能です。"
 
 #. module: account
 #: view:account.account.template:0
diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po
index 1e1622c1ae4..3b703dff7c8 100644
--- a/addons/account_payment/i18n/ja.po
+++ b/addons/account_payment/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-13 04:20+0000\n"
+"PO-Revision-Date: 2012-05-15 04:40+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-14 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n"
 "X-Generator: Launchpad (build 15238)\n"
 
 #. module: account_payment
@@ -210,7 +210,7 @@ msgstr "確認済"
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
 msgid "Invoice Effective Date"
-msgstr "請求書発効日"
+msgstr "請求書有効日"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -246,7 +246,7 @@ msgstr "支払モード"
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr "発効日"
+msgstr "有効日"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 5e72e1af6dd..5a0ec9f3236 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-14 03:43+0000\n"
+"PO-Revision-Date: 2012-05-15 04:42+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-14 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n"
 "X-Generator: Launchpad (build 15238)\n"
 
 #. module: account_voucher
@@ -25,7 +25,7 @@ msgstr "先月"
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation Transactions"
-msgstr "不一致取引"
+msgstr "未消し込み取引"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:324
@@ -88,7 +88,7 @@ msgstr "エントリーのインポート"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
 msgid "Account voucher unreconcile"
-msgstr "バウチャー不一致アカウント"
+msgstr "バウチャー未消し込みアカウント"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -135,7 +135,7 @@ msgstr "請求年によるグループ"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr "不一致エントリー"
+msgstr "未消し込みエントリー"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -181,18 +181,18 @@ msgstr "OK"
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr "最大の調整"
+msgstr "全消し込み"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0 field:account.voucher.line,date_due:0
 #: view:sale.receipt.report:0 field:sale.receipt.report,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "期日"
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -203,314 +203,316 @@ msgid ""
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
 msgstr ""
+"販売の支払では顧客からの支払を登録することができます。支払を記録するためには、顧客、支払方法（仕訳帳）、支払金額を入力する必要があります。OpenERPは"
+"開いている請求書または領収書に対して自動的に支払の消し込みを提案します。"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
 msgid "Sale"
-msgstr ""
+msgstr "販売"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "仕訳帳項目"
 
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr ""
+msgstr "多通貨バウチャー"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金額"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "支払オプション"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "その他情報"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0 selection:sale.receipt.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "キャンセル済"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "支払日"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行取引明細書行"
 
 #. module: account_voucher
 #: view:account.voucher:0 view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "未消し込み"
 
 #. module: account_voucher
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "税金"
 
 #. module: account_voucher
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "選択された仕訳帳と期間は同じ会社に属していなければなりません。"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "相手のコメント"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "分析アカウント"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:927
 #: code:addons/account_voucher/account_voucher.py:931
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "支払情報"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 msgid "Go"
-msgstr ""
+msgstr "進む"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "支払済金額"
 
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "請求書インポート"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0 selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "後払いまたはまとめ払い"
 
 #. module: account_voucher
 #: help:account.voucher,writeoff_amount:0
 msgid ""
 "Computed as the difference between the amount stated in the voucher and the "
 "sum of allocation on the voucher lines."
-msgstr ""
+msgstr "バウチャーで明示された金額とバウチャー行で割り当てられた合計の差を計算します。"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "レシート"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "販売行"
 
 #. module: account_voucher
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "current month"
-msgstr ""
+msgstr "今月"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "期間"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_voucher
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "会社名は固有でなければいけません。"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "バウチャー行の番号"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,type:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "会計エントリーも削除しますか？"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Pro-forma Vouchers"
-msgstr ""
+msgstr "プロフォーマバウチャー"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr ""
+msgstr "バウチャーエントリー"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:462
 #: code:addons/account_voucher/account_voucher.py:894
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr ""
+msgstr "仕入先バウチャー"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "バウチャーエントリー"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "メモ"
 
 #. module: account_voucher
 #: view:account.invoice:0 code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "請求書支払"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "このレコードを本当に消し込みしキャンセルしますか？"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipt"
-msgstr ""
+msgstr "領収書"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:797
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無効なアクションです。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "請求書情報"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "未消し込み"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "差額"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "平均遅延"
 
 #. module: account_voucher
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Income Currency Rate"
-msgstr ""
+msgstr "収入の通貨レート"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "アカウント基本コードとアカウント税金コードがありません。"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "税額"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Validated Vouchers"
-msgstr ""
+msgstr "検証済バウチャー"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0 view:account.voucher.line:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr ""
+msgstr "バウチャー行"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "バウチャーエントリー"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,partner_id:0
 #: field:account.voucher.line,partner_id:0 view:sale.receipt.report:0
 #: field:sale.receipt.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "支払差額"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "バウチャーの金額は明細行のひとつの金額と同じでなければなりません。"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,audit:0
 msgid "To Review"
-msgstr ""
+msgstr "レビュー"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:938
@@ -518,52 +520,52 @@ msgstr ""
 #: code:addons/account_voucher/account_voucher.py:1103
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "変更"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
-msgstr ""
+msgstr "費用行"
 
 #. module: account_voucher
 #: help:account.voucher,is_multi_currency:0
 msgid ""
 "Fields with internal purpose only that depicts if the voucher is a multi "
 "currency one or not"
-msgstr ""
+msgstr "バウチャーが多通貨であるかどうかを示す内部目的のみの項目"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "請求書"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "請求月によるグループ化"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 #: field:account.voucher.line,currency_id:0
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "通貨"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "買掛金と売掛金"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -573,32 +575,34 @@ msgid ""
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
 msgstr ""
+"仕入先支払フォームは実施した仕入先への支払の追跡を可能にします。仕入先、支払方法、支払金額を選択した場合に、OpenERPは開いている仕入先請求書や請求書"
+"の支払の消し込みを提案します。"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "販売員"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "平均支払遅延"
 
 #. module: account_voucher
 #: help:account.voucher,paid:0
 msgid "The Voucher has been totally paid."
-msgstr ""
+msgstr "バウチャーは全て支払済です。"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "消し込み支払残高"
 
 #. module: account_voucher
 #: view:account.voucher:0 selection:account.voucher,state:0
 #: view:sale.receipt.report:0 selection:sale.receipt.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:927
@@ -606,193 +610,193 @@ msgstr ""
 msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Income Currency Rate' on the company! "
-msgstr ""
+msgstr "通貨レートの差額により会計エントリーの作成ができません。会社の収入通貨レートの項目を設定する必要があります。 "
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Draft Vouchers"
-msgstr ""
+msgstr "ドラフトバウチャー"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total_tax:0
 msgid "Total With Tax"
-msgstr ""
+msgstr "税込合計"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr ""
+msgstr "割り当て"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
 msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
-msgstr ""
+msgstr "その仕訳帳エントリーに確信がなく、会計専門家のレビューが必要と付記したい場合はこのボックスをチェックして下さい。"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate_currency_id:0
 msgid "Payment Rate Currency"
-msgstr ""
+msgstr "支払の通貨レート"
 
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "支払済"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "支払条件"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record ?"
-msgstr ""
+msgstr "このレコードを本当に消し込みしますか？"
 
 #. module: account_voucher
 #: field:account.voucher,date:0 field:account.voucher.line,date_original:0
 #: field:sale.receipt.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "会社通貨での支払済金額"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "消し込み済金額"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "償却の分析アカウント"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0 selection:sale.receipt.report,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "直接支払"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Dr/Cr"
-msgstr ""
+msgstr "借方 / 貸方"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "以前の支払ですか？"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "バウチャー仕訳帳"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Compute Tax"
-msgstr ""
+msgstr "税金計算"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "会社"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:462
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\" !"
-msgstr ""
+msgstr "仕訳帳 %s にデフォルトの貸方 / 借方のアカウントを定義して下さい。"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Credit"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:895
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "仕訳帳の順序を定義して下さい。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "仕入先仕訳帳エントリーを開く"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Allocation"
-msgstr ""
+msgstr "割り当て合計"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "請求日でグループ化"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "記帳"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "請求書と未処理取引"
 
 #. module: account_voucher
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Expense Currency Rate"
-msgstr ""
+msgstr "費用の通貨レート"
 
 #. module: account_voucher
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "請求書番号は会社ごとに固有である必要があります。"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "税抜き合計"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "請求日"
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -806,73 +810,78 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" ・ ドラフト状態は、ユーザが新規に未確認のバウチャーをエンコードしている状態です。\n"
+"・ プロフォーマ状態は、バウチャーが形式上の状態で、まだバウチャー番号を持っていません。\n"
+"・ 記帳済状態は、ユーザがバウチャーを作成し、バウチャー番号が生成され、そしてアカウントにバウチャーエントリーが作成された状態です。           "
+"            \n"
+"・ キャンセル済状態はユーザがバウチャーをキャンセルした状態です。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "会計バウチャー"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr ""
+msgstr "番号"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行取引明細書"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "販売情報"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipt Analysis"
-msgstr ""
+msgstr "領収書分析"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
-msgstr ""
+msgstr "バウチャー"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "バウチャー項目"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 #: view:account.statement.from.invoice.lines:0 view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0 view:sale.receipt.report:0
 #: selection:sale.receipt.report,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "プロフォーマ"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr ""
+msgstr "仕訳帳項目"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -880,33 +889,33 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payment"
-msgstr ""
+msgstr "顧客支払"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "請求書を取引明細書にインポート"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
 msgid "Purchase"
-msgstr ""
+msgstr "仕入"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "支払"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "year"
-msgstr ""
+msgstr "年"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Currency Options"
-msgstr ""
+msgstr "通貨オプション"
 
 #. module: account_voucher
 #: help:account.voucher,payment_option:0
@@ -916,11 +925,13 @@ msgid ""
 "either choose to keep open this difference on the partner's account, or "
 "reconcile it with the payment(s)"
 msgstr ""
+"この項目は支払い金額と割当金額合計の結果的な差額に対して何をしたいかを選択することを手助けします。パートナのアカウント上にこの違いをそのままにしておくか、"
+"支払によってこれを消し込みするかを選択できます。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "このレコードを本当に確認しますか？"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
@@ -929,115 +940,117 @@ msgid ""
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
 msgstr ""
+"このレポートから支払遅延と同様に、顧客の請求済金額の全体像を把握することができます。ツール検索は請求書レポートをパーソナライズして、ニーズに分析を一致させ"
+"るべく使用することができます。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Posted Vouchers"
-msgstr ""
+msgstr "記帳済バウチャー"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "為替レート"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "支払方法"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0 view:account.voucher:0
 #: field:account.voucher,journal_id:0 view:sale.receipt.report:0
 #: field:sale.receipt.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payment"
-msgstr ""
+msgstr "仕入先支払"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "内部注記"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Original Amount"
-msgstr ""
+msgstr "元アカウント"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
-msgstr ""
+msgstr "領収書"
 
 #. module: account_voucher
 #: help:account.voucher,payment_rate:0
 msgid ""
 "The specific rate that will be used, in this voucher, between the selected "
 "currency (in 'Payment Rate Currency' field)  and the voucher currency."
-msgstr ""
+msgstr "このバウチャーには選択した通貨（支払通貨レート項目で）とバウチャー通貨の間の特定レートが使用されます。"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0 view:account.invoice:0
 #: field:account.voucher,pay_now:0 selection:account.voucher,type:0
 #: field:sale.receipt.report,pay_now:0 selection:sale.receipt.report,type:0
 msgid "Payment"
-msgstr ""
+msgstr "支払"
 
 #. module: account_voucher
 #: view:account.voucher:0 selection:account.voucher,state:0
 #: view:sale.receipt.report:0 selection:sale.receipt.report,state:0
 msgid "Posted"
-msgstr ""
+msgstr "記帳済"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "顧客"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "仕入先請求書と未処理取引"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: account_voucher
 #: help:account.voucher,tax_id:0
 msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "価格から税金だけを除外"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:931
@@ -1045,72 +1058,72 @@ msgstr ""
 msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Expense Currency Rate' on the company! "
-msgstr ""
+msgstr "通貨レートの差額により会計エントリーの作成ができません。会社の費用の通貨レート項目を設定する必要があります。 "
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "デフォルトタイプ"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
 msgid "Entries by Statement from Invoices"
-msgstr ""
+msgstr "請求書から取引明細書によるエントリー"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "アカウントエントリー"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "参照番号"
 
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher State"
-msgstr ""
+msgstr "バウチャー状態"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "会計エントリーの有効日"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "開くの継続"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr ""
+msgstr "取引を消し込みしない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
-msgstr ""
+msgstr "非課税金額"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr ""
+msgstr "領収書統計"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "期首残高"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "合計"
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index 94b99af8443..6be9d306546 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -10,8 +10,8 @@
                 <field name="property_account_payable" position="after">
                     <group colspan="2" col="6">
                         <field name="vat" on_change="vat_change(vat)"/>
-                        <button name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
-                        <field name="vat_subjected" colspan="1" />
+                        <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
+                        <field name="vat_subjected" colspan="1"/>
                     </group>
                 </field>
             </field>
diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index dfe4134be99..4f049d08d10 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -53,11 +53,10 @@
         </record>
 
         <!-- bind adminitration dashboard to the root administration -->
-        <menuitem id="base.menu_administration" name="Settings" action="open_board_administration_form"/>
+        <menuitem id="base.menu_administration" name="Settings"/>
 
         <!-- add a menu item in adminitration/reporting/dashboards -->
-        <menuitem id="base.menu_reporting_admin" name="Administration" parent="base.menu_reporting_dashboard" groups="base.group_system"/>
-        <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_admin" action="open_board_administration_form"/>
+        <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_dashboard" action="open_board_administration_form" groups="base.group_system"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 447645f615c..460e6493552 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -108,7 +108,6 @@ Creates a dashboard for CRM that includes:
         'process/crm_configuration_process.xml',
 
         'res_partner_view.xml',
-        'board_crm_statistical_view.xml',
         'board_crm_view.xml',
         
         'res_config_view.xml',
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
deleted file mode 100644
index 14b0afdc6bb..00000000000
--- a/addons/crm/board_crm_statistical_view.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!--
-         Board for statistical view of the sections
-         -->
-
-         <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
-            <field name="name">Opportunities By Categories - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                    <field name="categ_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
-            <field name="name">Opportunities By Stage - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunities By Stage" type="pie">
-                    <field name="stage_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_crm_opportunity_user_stage_graph">
-            <field name="name">Opportunities By Stage Per User - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunities By Stage" type="bar">
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
-                    <field name="user_id" group="True"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="act_oppor_categ">
-            <field name="name">Opportunities By Categories</field>
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form</field>
-            <field name="view_id" ref="view_crm_opportunity_categ_graph"/>
-            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
-            <field name="context">{'search_default_Category':1}</field>
-        </record>
-
-        <record model="ir.actions.act_window" id="act_opportunity_stage">
-            <field name="name">Opportunities By Stage</field>
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form</field>
-            <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
-            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
-            <field name="context">{'search_default_Stage':1}</field>
-        </record>
-
-        <record model="ir.actions.act_window" id="act_oppor_stage_user">
-            <field name="name">Planned Revenue By User and Stage</field>
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form</field>
-            <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
-            <field name="domain">[('state','!=','cancel')]</field>
-            <field name="context">{'search_default_Stage':1}</field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_statistical_form">
-            <field name="name">CRM - Statistical Dashboard Form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Statistics Dashboard" layout="manual">
-                    <board style="1-1">
-                        <column>
-                            <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
-                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
-                        </column>
-                        <column>
-                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="open_board_statistical_dash">
-            <field name="name">CRM Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_crm_statistical_form"/>
-        </record>
-
-        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
-
-        <menuitem
-            id="menu_board_statistics_dash"
-            name="CRM Dashboard"
-            sequence="0"
-            parent="board.menu_sales_dashboard"
-            action="open_board_statistical_dash"
-            groups="base.group_sale_manager"/>
-
-    </data>
-</openerp>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index bc0b41b24b9..60fb24f1a7a 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -1,31 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
      <data>
-          <record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
-               <field name="name">crm.opportunity.user.graph1</field>
-               <field name="model">crm.lead.report</field>
-               <field name="type">graph</field>
-               <field name="arch" type="xml">
-                    <graph string="Opportunities by User and Team" type="bar">
-                         <field name="stage_id"/>
-                         <field name="nbr" operator="+"/>
-                         <field name="user_id" group="True"/>
-                    </graph>
-               </field>
-          </record>
-
-        <record id="view_report_crm_oppor_graph" model="ir.ui.view">
-            <field name="name">crm.lead.report.graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="Opportunity Analysis" type="bar">
-                   <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
+        <!-- crm user dashboard -->
         <record model="ir.ui.view" id="crm_case_my_open_oppor">
             <field name="name">Opportunities</field>
             <field name="model">crm.lead</field>
@@ -59,23 +35,20 @@
                 </tree>
             </field>
         </record>
-
-          <record model="ir.actions.act_window" id="act_my_oppor">
-              <field name="name">My Open Opportunities</field>
-              <field name="res_model">crm.lead</field>
-              <field name="view_type">form</field>
-              <field name="view_mode">tree,form</field>
-              <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
-              <field name="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
-          </record>
-
+        <record model="ir.actions.act_window" id="act_my_oppor">
+            <field name="name">My Open Opportunities</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
+            <field name="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
+        </record>
         <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
-          <field name="sequence" eval="1"/>
-          <field name="view_mode">tree</field>
-          <field name="view_id" ref="crm_case_my_open_oppor"/>
-          <field name="act_window_id" ref="act_my_oppor"/>
-         </record>
-
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_my_open_oppor"/>
+            <field name="act_window_id" ref="act_my_oppor"/>
+        </record>
         <record model="ir.actions.act_window.view" id="act_my_oppor_form_view">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
@@ -83,44 +56,151 @@
             <field name="act_window_id" ref="act_my_oppor"/>
         </record>
 
-          <record model="ir.actions.act_window" id="act_my_oppor_stage">
-               <field name="name">Planned Revenue By Stage</field>
-               <field name="res_model">crm.lead.report</field>
-               <field name="view_type">form</field>
-               <field name="view_mode">graph,tree,form</field>
-               <field name="view_id" ref="view_report_crm_oppor_graph"/>
-               <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
-               <field name="context">{'search_default_Stage':1}</field>
-          </record>
+        <record id="view_report_crm_oppor_graph" model="ir.ui.view">
+            <field name="name">crm.lead.report.graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="vertical" string="Opportunity Analysis" type="bar">
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="act_my_oppor_stage">
+             <field name="name">Planned Revenue By Stage</field>
+             <field name="res_model">crm.lead.report</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">graph,tree,form</field>
+             <field name="view_id" ref="view_report_crm_oppor_graph"/>
+             <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
+             <field name="context">{'search_default_Stage':1}</field>
+        </record>
 
-          <record model="ir.ui.view" id="board_crm_form">
-               <field name="name">Sales Dashboard Form</field>
-               <field name="model">board.board</field>
-               <field name="type">form</field>
-               <field name="arch" type="xml">
-                    <form string="Sales Dashboard" layout="manual">
-                         <board style="2-1">
-                            <column>
-                                <action string="My Opportunities"
-                                    name="%(act_my_oppor)d" creatable="true"/>
-                            </column>
-                            <column>
-                                <action string="My Planned Revenues by Stage"
-                                    name="%(act_my_oppor_stage)d"/>
-                            </column>
+        <record model="ir.ui.view" id="board_crm_form">
+            <field name="name">Sales Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Dashboard" layout="manual">
+                    <board style="2-1">
+                        <column>
+                            <action string="My Opportunities" name="%(act_my_oppor)d" creatable="true"/>
+                        </column>
+                        <column>
+                            <action string="My Planned Revenues by Stage" name="%(act_my_oppor_stage)d"/>
+                        </column>
                     </board>
                 </form>
             </field>
         </record>
         <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">Sales</field>
+            <field name="name">CRM</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-        <menuitem id="base.menu_base_partner"
-            action="open_board_crm"/>
+        <menuitem id="menu_board_crm" parent="base.menu_reporting_dashboard" action="open_board_crm" sequence="10" groups="base.group_sale_salesman"/>
+
+        <!-- crm mananger dashboard -->
+        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
+            <field name="name">Opportunities By Categories - Graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
+                    <field name="categ_id"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="act_oppor_categ">
+            <field name="name">Opportunities By Categories</field>
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_opportunity_categ_graph"/>
+            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
+            <field name="context">{'search_default_Category':1}</field>
+        </record>
+
+        <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
+            <field name="name">Opportunities By Stage - Graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities By Stage" type="pie">
+                    <field name="stage_id"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="act_opportunity_stage">
+            <field name="name">Opportunities By Stage</field>
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
+            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
+            <field name="context">{'search_default_Stage':1}</field>
+        </record>
+
+        <record model="ir.ui.view" id="view_crm_opportunity_user_stage_graph">
+            <field name="name">Opportunities By Stage Per User - Graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities By Stage" type="bar">
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" operator="+"/>
+                    <field name="user_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="act_oppor_stage_user">
+            <field name="name">Planned Revenue By User and Stage</field>
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
+            <field name="domain">[('state','!=','cancel')]</field>
+            <field name="context">{'search_default_Stage':1}</field>
+        </record>
+
+        <record model="ir.ui.view" id="board_crm_statistical_form">
+            <field name="name">CRM - Statistical Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statistics Dashboard" layout="manual">
+                    <board style="1-1">
+                        <column>
+                            <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
+                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
+                        </column>
+                        <column>
+                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="open_board_statistical_dash">
+            <field name="name">CRM Manager</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_crm_statistical_form"/>
+        </record>
+        <menuitem 
+            id="menu_board_statistics_dash"
+            parent="base.menu_reporting_dashboard"
+            action="open_board_statistical_dash"
+            sequence="11"
+            groups="base.group_sale_manager"/>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1a24075c210..92322f483cf 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -410,110 +410,115 @@
                     </div>
                 </div>
                 <sheet layout="auto">
-                <group colspan="4" col="7">
-                    <field name="name"  required="1" string="Opportunity"/>
-                    <label string="Stage:" align="1.0"/>
-                    <group colspan="1" col="4">
-                        <field name="stage_id" nolabel="1"
-                            on_change="onchange_stage_id(stage_id)"
-                            domain="section_id and [('section_ids', '=', section_id)] or []"/>
-                        <button name="stage_previous"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
-                        <button name="stage_next" states="draft,open,pending"
-                            type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
-                    </group>
-                    <field name="user_id"/>
-
+                <group colspan="4" col="3">
+                    <field name="name" required="1" nolabel="1" class="oe_form_title" width="80%%"/>
                     <button string="Schedule/Log Call"
                         name="%(opportunity2phonecall_act)d" icon="terp-call-start"
                         type="action"/>
-
+                    <button string="Schedule Meeting" icon="gtk-redo"
+                        name="action_makeMeeting"
+                        type="object"/>
+                </group>
+                <group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
+                    <field name="user_id"/>
                     <field name="planned_revenue"/>
-                    <field name="probability"/>
-                    <field name="date_deadline"/>
 
-                    <button name="action_makeMeeting" type="object"
-                    string="Schedule Meeting" icon="gtk-redo" />
-                    <newline/>
                     <field name="date_action"/>
+                    <field name="date_deadline"/>
+
                     <field name="title_action"/>
-                    <field name="priority" string="Priority"/>
-                    <newline/>
+                    <field name="probability"/>
+
                     <field name="type" invisible="1"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
                     <group col="4" colspan="2">
                         <separator colspan="4" string="Contacts"/>
-                        <group colspan="2">
-                            <field name="partner_id" select="1"
-                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
-                                colspan="2" />
+                        <group colspan="2" col="3" class="oe_form_group_label_border">
+                            <field width="80%%" name="partner_id" select="1"
+                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
                             <button name="%(action_crm_lead2partner)d"
                                 icon="terp-partner" type="action"
                                 string="Create"
                                 attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                            <field name="phone" colspan="3"/>
+                            <field width="80%%" name="email_from" string="Email"/>
+                            <button string="Mail"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                context="{'mail':'new', 'model': 'crm.lead'}"
+                                icon="terp-mail-message-new" type="action" />
                         </group>
-                        
-                        <group col="3" colspan="2">
-                            <field name="email_from" string="Email" />
-                        </group>
-                            <field name="phone"/>
-
                     </group>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" class="oe_form_group_label_border">
                         <separator colspan="2" string="Categorization"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="categ_id" select="1"
-                        string="Category" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.lead')]" />
+                            string="Category" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
+
+                        <label string="Stage" for="stage_id" align="1.0"/>
+                        <group colspan="1" col="3">
+                            <field name="stage_id" nolabel="1"
+                                on_change="onchange_stage_id(stage_id)"
+                                domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
+                            <button name="stage_previous"
+                                states="draft,open,pending" type="object"
+                                icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
+                            <button name="stage_next" states="draft,open,pending"
+                                type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
+                        </group>
+
+                        <field name="priority" string="Priority"/>
                     </group>
 
                     <separator colspan="4" string="Details"/>
                     <field name="description" nolabel="1" colspan="4"/>
                 </page>
                 <page string="Lead">
-                    <group colspan="2" col="4">
-                        <separator string="Contact" colspan="4" col="4"/>
+                    <separator string="Contact" colspan="4"/>
+                    <group colspan="4" col="4" class="oe_form_group_label_border">
                         <field name="partner_name" string="Customer Name" colspan="4"/>
-                        <newline/>
+                    </group>
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
                         <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                        <field name="function" />
-                        <field name="street" colspan="4"/>
-                        <field name="street2" colspan="4"/>
+                        <field name="fax"/>
+                        <field name="street"/>
                         <field name="zip"/>
-                        <field name="city"/>
                         <field name="country_id"/>
-                        <field name="state_id"/>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Communication" colspan="2"/>
-                        <field name="fax"/>
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
+                        <field name="function" />
                         <field name="mobile"/>
+                        <field name="street2"/>
+                        <field name="city"/>
+                        <field name="state_id"/>
                     </group>
-                    <group colspan="2" col="2">
+
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Categorization" colspan="2"/>
                         <field name="type_id" widget="selection"/>
                         <field name="channel_id" widget="selection"/>
                     </group>
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Mailings" colspan="2"/>
                         <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
                         <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
                     </group>
                 </page>
                 <page string="Extra Info">
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" class="oe_form_group_label_border">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>
                         <field name="day_open" groups="base.group_no_one"/>
                         <field name="day_close" groups="base.group_no_one"/>
                         <field name="referred"/>
                     </group>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
+                    <group col="2" colspan="2" class="oe_form_group_label_border">
+                        <separator colspan="4" string="References"/>
+                        <field name="ref"/>
+                        <field name="ref2"/>
+                    </group>
                 </page>
                 </notebook>
                 </sheet>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 9c8d1fb8817..371fc5d669e 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -10,11 +10,11 @@
                 <data>
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
                         <page string="Assignation">
-                        <group name="partner_assign_group" col="5" colspan="4">
+                        <group name="partner_assign_group" col="5" colspan="4" class="oe_form_group_label_border">
                             <separator string="Partner Assignation" colspan="5"/>
-                            <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                            <field name="date_assign"/>
-                            <group colspan="1" col="1">
+                            <field width="50%%" name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                            <field width="40%%" name="date_assign"/>
+                            <group width="10%%" colspan="1" col="1">
                                 <button string="Forward"
                                     attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                     name="%(crm_lead_forward_to_partner_act)d"
@@ -22,15 +22,12 @@
                                     context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
                                 />
                             </group>
-                            <group name="geo_assign_group" col="5" colspan="4">
-                                <separator string="Geo Assignation" colspan="5"/>
-                                <field name="partner_latitude"/>
-                                <field name="partner_longitude"/>
-                                <group colspan="1" col="1">
-                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                        icon="gtk-apply"/>
-                                </group>
-                            </group>
+
+                            <separator string="Geo Assignation" colspan="5"/>
+                            <field width="50%%" name="partner_latitude"/>
+                            <field width="40%%" name="partner_longitude"/>
+                            <button width="10%%" string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
+                                icon="gtk-apply"/>
                         </group>
                         </page>
                     </xpath>
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index f7e080c13cd..51e2f47d9d8 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-15 01:40+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n"
+"X-Generator: Launchpad (build 15238)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -382,7 +382,7 @@ msgstr "8月"
 #: selection:hr.analytical.timesheet.users,month:0
 #, python-format
 msgid "June"
-msgstr "6 月"
+msgstr "6月"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -401,7 +401,7 @@ msgstr "日付"
 #: selection:hr.analytical.timesheet.users,month:0
 #, python-format
 msgid "November"
-msgstr "11 月"
+msgstr "11月"
 
 #. module: hr_timesheet
 #: constraint:hr.employee:0
@@ -429,7 +429,7 @@ msgstr "10月"
 #: selection:hr.analytical.timesheet.users,month:0
 #, python-format
 msgid "January"
-msgstr "1 月"
+msgstr "1月"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
index 113d029bf65..f3bef5e5439 100644
--- a/addons/hr_timesheet_invoice/i18n/ja.po
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:24+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-15 03:16+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n"
+"X-Generator: Launchpad (build 15238)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -159,7 +159,7 @@ msgstr "請求書を未発行率"
 #. module: hr_timesheet_invoice
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "請求書番号は会社ごとにユニークでなければいけません。"
+msgstr "請求書番号は会社ごとに固有である必要があります。"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 93a60e1cdb1..072f2fc3ba5 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                <field name="menu_tips" position="after">
                     <field name="notification_email_pref" readonly="0"/>
-                </xpath>
+                </field>
             </data>
             </field>
         </record>
@@ -23,11 +23,13 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/notebook/page[@string='User']/group/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                <field name="menu_tips" position="after">
                     <field name="notification_email_pref"/>
-                </xpath>
-                <xpath expr="/form/notebook" position="after">
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </field>
+                <xpath expr="/form/sheet" position="after">
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </xpath>
             </data>
             </field>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 0576ba59f84..45263d84a63 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -319,16 +319,6 @@
     margin: 0;
 }
 
-.openerp .oe_mail_oe_right {
-    float: right;
-    margin-right: 8px;
-}
-
-.openerp .oe_mail_oe_left {
-    float: left;
-    margin-right: 8px;
-}
-
 .openerp a.oe_mail_oe_intlink {
     color: #8786b7;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 36352a9a999..d9d79832c61 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -584,7 +584,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b8adba6d01a..a11a5a2c6b8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,15 +2,16 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
-        <div class="oe_view_manager_header">
-            <div class="oe_view_manager_row">
-                <h2 class="oe_view_title">All Feeds</h2>
-            </div>
-        </div>
+        <table class="oe_view_manager_header">
+            <tr class="oe_header_row">
+                <td><h2 class="oe_view_title">All Feeds</h2></td>
+                <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
+            </tr>
+        </table>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
-                <button class="oe_mail_oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
+                <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
@@ -45,7 +46,7 @@
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
-            <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
+            <img class="oe_mail_msg_image oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
@@ -71,7 +72,7 @@
                     <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                 </t>
             </ul>
-            <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay"/></t>
                 <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay"/></t>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index aaa11a21fc5..825886501eb 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1120,4 +1120,10 @@ class mrp_production_product_line(osv.osv):
     }
 mrp_production_product_line()
 
+class product_product(osv.osv):
+    _inherit = "product.product"
+    _columns = {
+        'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Materials'),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 121567b3e56..e5e1e4fbc63 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -413,7 +413,6 @@
                         </page>
                     </notebook>
                     <newline/>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -450,7 +449,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree string="BoM Structure" colors="blue:method">
+                <tree string="Bill of Materials" colors="blue:method">
                     <field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="code"/>
@@ -975,6 +974,19 @@
             </field>
         </record>
 
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.mrp.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <group name="misc" position="after">
+                    <separator string="Bill of Materials" colspan="4"/>
+                    <field name="bom_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/>
+                </group>
+            </field>
+        </record>
+
         <act_window
             context="{'search_default_product_id': [active_id]}"
             id="act_product_manufacturing_open"
@@ -995,15 +1007,6 @@
             src_model="product.product"
             groups="mrp.group_mrp_user"/>
 
-        <act_window
-            domain="[('bom_id','=',False)]"
-            context="{'search_default_product_id': [active_id],'default_product_id':active_id}"
-            id="act_product_product_2_mrp_bom"
-            name="Bill of Materials"
-            res_model="mrp.bom"
-            src_model="product.product"
-            groups="mrp.group_mrp_user"/>
-
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 164314c4573..81bfe58947f 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -571,8 +571,9 @@ stock_warehouse_orderpoint()
 class product_product(osv.osv):
     _inherit="product.product"
     _columns = {
-        'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rule')
+        'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
     }
+
 product_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index b3e90ab4e6e..37a0b2c48d2 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -251,15 +251,6 @@
         src_model="stock.warehouse"
         groups="stock.group_stock_user"/>
 
-        <!-- add product_uom to context to be the default value when adding new orderpoints -->
-        <act_window
-            context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            id="act_product_product_2_stock_warehouse_orderpoint"
-            name="Minimum Stock Rules"
-            res_model="stock.warehouse.orderpoint"
-            src_model="product.product"
-            groups="stock.group_stock_user"/>
-
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
             id="act_procurement_2_stock_warehouse_orderpoint"
@@ -275,30 +266,18 @@
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.orderpoint.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                  <group name="misc" position="after">
-                      <group col="2" colspan="2" attrs="{'invisible':[('type', '=', 'service')]}">
-                          <separator string="Minimum Stock Rules" colspan="2"/>
-                          <field name="orderpoint_ids" context="{'default_product_uom': uom_id}" nolabel="1">
-                              <tree string="Minimum Stock Rule" editable="bottom">
-                                  <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                                  <field name="location_id"/>
-                                  <field name="product_min_qty"/>
-                                  <field name="product_max_qty"/>
-                                  <field name="product_uom" groups="product.group_uom"/>
-                              </tree>
-                          </field>
-                      </group>
-                  </group>
+                <group name="misc" position="after">
+                    <separator string="Minimum Stock Rules" colspan="4"/>
+                    <field name="orderpoint_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/>
+                </group>
             </field>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 00d33b0f52f..1038297b80d 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -216,6 +216,7 @@
                                     </div>
                                     <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
                                         <img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" width="48" style="float: left; padding: 0 4px 4px 0"/>
+                                        Code: <field name="code"/>
                                         <div t-if="record.type.raw_value == 'service'">No Stock</div>
                                         <t t-if="record.type.raw_value != 'service'">
                                             <div>Stock: <field name="qty_available"/> on hand, <field name="virtual_available"/> available</div>
@@ -275,7 +276,7 @@
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
+        <menuitem id="base.menu_product" parent="base.menu_base_partner" name="Products"  sequence="9"/>
         <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 3780c68b2b3..a0101c347bf 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -1,76 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="board_sales_manager_form" model="ir.ui.view">
-            <field name="name">board.sales.manager.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard" layout="manual">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
-                            <action name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
-                        </column>
-                        <column>
-                            <action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
-                            <action name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
-                            <action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record id="open_board_sales_manager" model="ir.actions.act_window">
-            <field name="name">Sales Manager Dashboard</field>
-            <field name="res_model">board.board</field>
+        <!-- Sale user dashboard -->
+        <record id="action_quotation_for_sale" model="ir.actions.act_window">
+            <field name="name">My Quotations</field>
+            <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_sales_manager_form"/>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+            <field name="view_id" ref="sale.view_order_tree"/>
         </record>
 
-        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
-        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dashboard" sequence="0" groups="base.group_sale_manager"/>
-
-
-    <record id="action_quotation_for_sale" model="ir.actions.act_window">
-        <field name="name">My Quotations</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
-        <field name="view_id" ref="sale.view_order_tree"/>
+        <record id="view_turnover_by_month_tree" model="ir.ui.view">
+            <field name="name">turnover.by.month.tree</field>
+            <field name="model">account.invoice.report</field>
+            <field name="type">tree</field>
+            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+                <tree string="Monthly Turnover">
+                    <field name="month"/>
+                    <field name="price_total"/>
+                </tree>
+            </field>
         </record>
-
-    <record id="view_turnover_by_month_tree" model="ir.ui.view">
-        <field name="name">turnover.by.month.tree</field>
-        <field name="model">account.invoice.report</field>
-        <field name="type">tree</field>
+        <record id="view_turnover_by_month_graph" model="ir.ui.view">
+            <field name="name">turnover.by.month.graph</field>
+            <field name="model">account.invoice.report</field>
             <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-        <field name="priority" eval="32"/>
-        <field name="arch" type="xml">
-            <tree string="Monthly Turnover">
+            <field name="priority" eval="32"/>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Monthly Turnover" type="bar">
                 <field name="month"/>
-                <field name="price_total"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_turnover_by_month_graph" model="ir.ui.view">
-        <field name="name">turnover.by.month.graph</field>
-        <field name="model">account.invoice.report</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-        <field name="priority" eval="32"/>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-        <graph string="Monthly Turnover" type="bar">
-            <field name="month"/>
-            <field name="price_total" operator="+"/>
-        </graph>
-        </field>
-    </record>
-
+                <field name="price_total" operator="+"/>
+            </graph>
+            </field>
+        </record>
         <record model="ir.actions.act_window" id="action_turnover_by_month">
             <field name="name">Monthly Turnover</field>
             <field name="res_model">account.invoice.report</field>
@@ -81,13 +47,11 @@
             <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
             <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
        </record>
-
        <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
             <field name="act_window_id" ref="action_turnover_by_month"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_turnover_by_month_graph"/>
         </record>
-
         <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
             <field name="act_window_id" ref="action_turnover_by_month"/>
             <field name="view_mode">tree</field>
@@ -102,31 +66,53 @@
                 <form string="Sales Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
-                            <action name="%(action_quotation_for_sale)d"
-                                string="My Quotations" creatable="true"/>
-                             <!--groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"-->
+                            <action name="%(action_quotation_for_sale)d" string="My Quotations" creatable="true"/>
                         </column>
                         <column>
-                            <action name="%(action_turnover_by_month)d"
-                                  string="Monthly Turnover"/>
-                             <!--groups="base.group_sale_salesman,account.group_account_manager"-->
+                            <action name="%(action_turnover_by_month)d" string="Monthly Turnover"/>
                         </column>
                     </board>
                 </form>
             </field>
         </record>
-
         <record id="open_board_sales" model="ir.actions.act_window">
-            <field name="name">Sales Dashboard</field>
+            <field name="name">Sales</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_form"/>
         </record>
+        <menuitem id="menu_board_sales" parent="base.menu_reporting_dashboard" action="open_board_sales" sequence="15" groups="base.group_sale_salesman"/>
 
-        <menuitem
-            id="base.menu_base_partner" action="open_board_sales"
-            name="Sales"/>
+        <!-- Sale manager dashboard -->
+        <record id="board_sales_manager_form" model="ir.ui.view">
+            <field name="name">board.sales.manager.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Manager Dashboard" layout="manual">
+                    <board style="2-1">
+                        <column>
+                            <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
+                            <action name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
+                        </column>
+                        <column>
+                            <action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
+                            <action name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
+                            <action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+        <record id="open_board_sales_manager" model="ir.actions.act_window">
+            <field name="name">Sales Manager</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_sales_manager_form"/>
+        </record>
+        <menuitem id="menu_board_sales_manager" parent="base.menu_reporting_dashboard" action="open_board_sales_manager" sequence="16" groups="base.group_sale_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 847e2e8f463..467ccae72a9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,10 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner"
-            id="base.menu_base_partner" name="Sales"
-            sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
-
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 3fefc59c20a..8da96384d0a 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -43,7 +43,6 @@ crm modules.
     'init_xml': [],
     'update_xml': ['wizard/crm_make_sale_view.xml',
                    'sale_crm_view.xml',
-                   'board_sale_crm_view.xml',
                    'process/sale_crm_process.xml',
                    'security/sale_crm_security.xml',
                    'security/ir.model.access.csv'
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
deleted file mode 100644
index a5fa08222e0..00000000000
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
-            <field name="name">board.crm.form.inherit.replace1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="sale.board_sales_form"/>
-            <field name="arch" type="xml">
-            <xpath expr="/form/board/column/action[@string='My Quotations']" position="before">
-                <action name="%(crm.act_my_oppor)d"
-                     string="My Opportunities"
-                    creatable="true"
-                     />
-            </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_form_inherit_replace3">
-            <field name="name">board.crm.form.inherit.replace1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="sale.board_sales_form"/>
-            <field name="arch" type="xml">
-            <xpath expr="/form/board/column/action[@string='Monthly Turnover']" position="before">
-                <action name="%(crm.act_my_oppor_stage)d"
-                     string="My Planned Revenues by Stage"
-                     />
-            </xpath>
-            </field>
-        </record>
-        <menuitem name="Sales"
-            id="base.menu_base_partner" action="sale.open_board_sales"/>
-    </data>
-</openerp>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 32e23a10666..61ced66c4cb 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,9 +8,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
-                <field name="priority" position="after">
-                    <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
-                </field>
+                <data>
+                    <xpath expr="//div[contains(@class,'oe_form_topbar')]/div[contains(@class,'oe_right')]" position="before">
+                        <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
+                    </xpath>
+                </data>
             </field>
         </record>
 
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b99b7e98609..9f15eba5389 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -68,9 +68,8 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
-        <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
+        <menuitem id="menu_board_warehouse" parent="base.menu_reporting_dashboard" action="open_board_warehouse" sequence="20" groups="group_stock_manager"/>
+        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" groups="group_stock_manager" sequence="5"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 5af954a023a..65a1a8c2ef3 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -61,7 +61,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
-                    <label string="Cost Price :" align="1.0"/>
+                    <label string="Cost Price" for="standard_price" align="1.0"/>
                     <group col="2" colspan="1">
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="Update"
@@ -145,6 +145,7 @@
                                 <div class="oe_product_desc">
                                     <h4><a type="edit"><field name="name"></field></a></h4>
                                     <ul>
+                                        <li>Code: <field name="code"/></li>
                                         <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
                                         <li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
                                         <li>Price: <field name="lst_price"></field></li>
diff --git a/addons/web_shortcuts/LICENSE b/addons/web_shortcuts/LICENSE
new file mode 100644
index 00000000000..ff64be448e9
--- /dev/null
+++ b/addons/web_shortcuts/LICENSE
@@ -0,0 +1,15 @@
+OpenERP, Open Source Management Solution
+Copyright © 2010-2011 OpenERP SA (<http://openerp.com>).
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public Lice
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/web_shortcuts/__init__.py b/addons/web_shortcuts/__init__.py
new file mode 100644
index 00000000000..6c74add0cca
--- /dev/null
+++ b/addons/web_shortcuts/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import controllers
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/__openerp__.py b/addons/web_shortcuts/__openerp__.py
new file mode 100644
index 00000000000..150b30909e9
--- /dev/null
+++ b/addons/web_shortcuts/__openerp__.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Web Shortcuts',
+    'version': '1.0',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """
+Enable shortcuts feature in the web client
+==========================================
+
+Add a Shortcut icon in the systray in order to access the user's shortcuts (if any).
+Add a Shortcut icon besides the views title in order to add/remove a shortcut.
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://openerp.com',
+    'depends': ['base'],
+    'update_xml': [],
+    'js' : [
+        'static/src/js/web_shortcuts.js',
+    ],
+    'css' : [
+        'static/src/css/web_shortcuts.css',
+    ],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
+    'installable': True,
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/__init__.py b/addons/web_shortcuts/controllers/__init__.py
new file mode 100644
index 00000000000..9f828025b8e
--- /dev/null
+++ b/addons/web_shortcuts/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/main.py b/addons/web_shortcuts/controllers/main.py
new file mode 100644
index 00000000000..23f4bbd3fbe
--- /dev/null
+++ b/addons/web_shortcuts/controllers/main.py
@@ -0,0 +1,18 @@
+try:
+    # embedded
+    import openerp.addons.web.common.http as openerpweb
+    import openerp.addons.web.controllers.main as webmain
+except ImportError:
+    # standalone
+    import web.common.http as openerpweb
+    import web.controllers.main as webmain
+
+class Shortcuts(openerpweb.Controller):
+    _cp_path = "/web/shortcuts"
+
+    @openerpweb.jsonrequest
+    def list(self, req):
+        return req.session.model('ir.ui.view_sc').get_sc(
+            req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
new file mode 100644
index 00000000000..e2deff8d406
--- /dev/null
+++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css
@@ -0,0 +1,57 @@
+/* Shortcuts*/
+.oe_systray_shortcuts {
+    margin: 3px;
+}
+.oe-shortcut-toggle {
+    height: 20px;
+    margin-top: 3px;
+    padding: 0;
+    width: 24px;
+    cursor: pointer;
+    display: block;
+    background: url(/web/static/src/img/add-shortcut.png) no-repeat center center;
+    float: left;
+}
+.oe-shortcut-remove{
+    background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center;
+}
+.oe-shortcuts {
+    position: absolute;
+    margin: 0;
+    padding: 6px 15px;
+    top: 37px;
+    left: 197px;
+    right: 0;
+    height: 17px;
+    line-height: 1.2;
+}
+.oe-shortcuts ul {
+    display: block;
+    overflow: hidden;
+    list-style: none;
+    white-space: nowrap;
+    padding: 0;
+    margin: 0;
+}
+.oe-shortcuts li {
+    cursor: pointer;
+    display: -moz-inline-stack;
+    display: inline-block;
+    display: inline; /*IE7 */
+    color: #fff;
+    text-align: center;
+    border-left: 1px solid #909090;
+    padding: 0 4px;
+    font-size: 80%;
+    font-weight: normal;
+    vertical-align: top;
+}
+
+.oe-shortcuts li:hover {
+    background-color: #666;
+}
+.oe-shortcuts li:first-child {
+    border-left: none;
+    padding-left: 0;
+}
+
diff --git a/addons/web_shortcuts/static/src/img/icon.png b/addons/web_shortcuts/static/src/img/icon.png
new file mode 100644
index 00000000000..44347e95f45
--- /dev/null
+++ b/addons/web_shortcuts/static/src/img/icon.png
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
new file mode 100644
index 00000000000..ecd07e35c72
--- /dev/null
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -0,0 +1,145 @@
+/*############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################*/
+
+openerp.web_shortcuts = function (instance) {
+
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
+
+instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
+    template: 'Systray.Shortcuts',
+
+    init: function() {
+        this._super();
+        this.on('load', this, this.load);
+        this.on('add', this, this.add);
+        this.on('display', this, this.display);
+        this.on('remove', this, this.remove);
+        this.on('click', this, this.click);
+        this.dataset = new instance.web.DataSet(this, 'ir.ui.view_sc');
+    },
+    start: function() {
+        var self = this;
+        this._super();
+        this.trigger('load');
+        this.$element.on('click', '.oe_systray_shortcuts_items a', function() {
+            self.trigger('click', $(this));
+        });
+    },
+    load: function() {
+        var self = this;
+        this.$element.find('.oe_systray_shortcuts_items').empty();
+        return this.rpc('/web/shortcuts/list', {}, function(shortcuts) {
+            _.each(shortcuts, function(sc) {
+                self.trigger('display', sc);
+            });
+        });
+    },
+    add: function (sc) {
+        var self = this;
+        this.dataset.create(sc, function (out) {
+            self.trigger('display', {
+                name : sc.name,
+                id : out.result,
+                res_id : sc.res_id
+            });
+        });
+    },
+    display: function(sc) {
+        var self = this;
+        this.$element.find('.oe_systray_shortcuts_items').append();
+        var $sc = $(QWeb.render('Systray.Shortcuts.Item', {'shortcut': sc}));
+        $sc.appendTo(self.$element.find('.oe_systray_shortcuts_items'));
+    },
+    remove: function (menu_id) {
+        var menu_id = this.session.active_id;
+        var $shortcut = this.$element.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
+        var shortcut_id = $shortcut.data('shortcut-id');
+        $shortcut.remove();
+        this.dataset.unlink([shortcut_id]);
+    },
+    click: function($link) {
+        var self = this,
+            id = $link.data('id');
+        self.session.active_id = id;
+        self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
+            if (ir_menu_data.action.length){
+                instance.webclient.user_menu.on_action(ir_menu_data.action[0][2]);
+            }
+        });
+        this.$element.find('.oe_systray_shortcuts').trigger('mouseout');
+    },
+    has: function(menu_id) {
+        return !!this.$element.find('a[data-id=' + menu_id + ']').length;
+    }
+});
+
+instance.web.UserMenu.include({
+    do_update: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+        this.update_promise.then(function() {
+            if (self.shortcuts) {
+                self.shortcuts.trigger('load');
+            } else {
+                self.shortcuts = new instance.web_shortcuts.Shortcuts(self);
+                self.shortcuts.appendTo(instance.webclient.$element.find('.oe_systray'));
+            }
+        });
+    },
+});
+
+instance.web.ViewManagerAction.include({
+    on_mode_switch: function (view_type, no_store) {
+        var self = this;
+        this._super.apply(this, arguments).then(function() {
+            self.shortcut_check(self.views[view_type]);
+        });
+    },
+    shortcut_check : function(view) {
+        var self = this;
+        var shortcuts_menu = instance.webclient.user_menu.shortcuts;
+        var grandparent = this.getParent() && this.getParent().getParent();
+        // display shortcuts if on the first view for the action
+        var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
+        if (!this.action.name ||
+                !(view.view_type === this.views_src[0].view_type
+                    && view.view_id === this.views_src[0].view_id)) {
+            $shortcut_toggle.hide();
+            return;
+        }
+        $shortcut_toggle.toggleClass('oe-shortcut-remove', shortcuts_menu.has(self.session.active_id));
+        $shortcut_toggle.unbind("click").click(function() {
+            if ($shortcut_toggle.hasClass("oe-shortcut-remove")) {
+                shortcuts_menu.trigger('remove', self.session.active_id);
+            } else {
+                shortcuts_menu.trigger('add', {
+                    'user_id': self.session.uid,
+                    'res_id': self.session.active_id,
+                    'resource': 'ir.ui.menu',
+                    'name': self.action.name
+                });
+            }
+            $shortcut_toggle.toggleClass("oe-shortcut-remove");
+        });
+    }
+});
+
+};
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
new file mode 100644
index 00000000000..656fded1d75
--- /dev/null
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+<t t-name="Systray.Shortcuts">
+    <div class="oe_systray_shortcuts oe_systray_dropdown">
+        <a href="#"><img src="/web_shortcuts/static/src/img/icon.png" width="22" height="22" border="0"/></a>
+        <ul class="oe_systray_shortcuts_items oe_systray_dropdown_options"/>
+    </div>
+</t>
+<t t-name="Systray.Shortcuts.Item">
+    <li>
+        <a href="#" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
+            <t t-esc="shortcut.name"/>
+        </a>
+    </li>
+</t>
+<t t-extend="ViewManagerAction">
+    <t t-jquery="h2.oe_view_title" t-operation="prepend">
+        <a t-if="widget.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+            href="javascript: void(0)"> </a>
+    </t>
+</t>
+</templates>