pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge] Merge with main branch

Browse Source 
bzr revid: mdi@tinyerp.com-20120418085511-bltb0bck82adukzg
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-04-18 14:25:11 +05:30
parent 30322ca5c8 38948deaca
commit dcf9b25bff
65 changed files with 4632 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/board_account_view.xml
+1 -1
View File
@@ -38,7 +38,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Board">
<form string="Account Board" layout="manual">
<board style="2-1">
<column>
<action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
addons/account/i18n/ja.po
+97 -84
View File
@@ -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:35+0000\n"
"PO-Revision-Date: 2012-04-17 04:15+0000\n"
"PO-Revision-Date: 2012-04-17 21:27+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-04-17 04:51+0000\n"
"X-Generator: Launchpad (build 15099)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: account
#: view:account.invoice.report:0
@@ -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
@@ -146,7 +146,7 @@ msgstr "参照"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Choose Fiscal Year "
msgstr "年度の選択 "
msgstr "会計年度の選択 "
#. module: account
#: help:account.payment.term,active: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
@@ -263,29 +263,29 @@ msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Sub-Total :"
msgstr ""
msgstr "小計："
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
msgstr ""
msgstr "手動の自動継続"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscalyear"
msgstr ""
msgstr "年度を閉じる"
#. module: account
#: field:account.automatic.reconcile,allow_write_off:0
msgid "Allow write off"
msgstr ""
msgstr "帳消しの許可"
#. module: account
#: view:account.analytic.chart:0
msgid "Select the Period for Analysis"
msgstr ""
msgstr "分析期間の選択"
#. module: account
#: view:account.move.line:0
@@ -296,19 +296,19 @@ msgstr ""
#: code:addons/account/account_invoice.py:551
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
msgstr "請求書行のアカウントの会社が請求書の会社と一致しません。"
#. module: account
#: field:account.journal.column,field:0
msgid "Field Name"
msgstr ""
msgstr "項目名"
#. module: account
#: help:account.installer,charts:0
msgid ""
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
msgstr "あなたの国に基づき、あなたの会社の会計ニーズに可能な限り近くマッチする、ローカル化会計表をインストールします。"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@@ -319,17 +319,21 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Financial Accounting/Accounts/Journals."
msgstr ""
"この会社のために %s タイプのどんな会計仕訳帳も見つけることができません。\n"
"\n"
"メニューからそれを作成することができます： \n"
"設定 / 金融会計 / アカウント / 仕訳帳"
#. module: account
#: model:ir.model,name:account.model_account_unreconcile
msgid "Account Unreconcile"
msgstr ""
msgstr "照合なしアカウント"
#. module: account
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
msgstr ""
msgstr "購入属性"
#. module: account
#: help:account.financial.report,style_overwrite:0
@@ -338,11 +342,13 @@ msgid ""
"leave the automatic formatting, it will be computed based on the financial "
"reports hierarchy (auto-computed field 'level')."
msgstr ""
"このレコードを表示させるための好みのフォーマットをここで設定できます。自動フォーマッティングを残す場合は、それは財務レポートの階層（自動計算項目\"レベル"
"\"）に基づき計算されます。"
#. module: account
#: view:account.installer:0
msgid "Configure"
msgstr ""
msgstr "設定"
#. module: account
#: selection:account.entries.report,month:0
@@ -351,7 +357,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "June"
msgstr ""
msgstr "６月"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -360,11 +366,13 @@ msgid ""
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
"このビューはOpenERPの大量のエントリーを記録するために会計士によって利用されます。銀行明細書、キャッシュレジスター、または顧客 / "
"仕入先支払いを利用する場合、仕訳帳項目はOpenERPによって作成されます。"
#. module: account
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
msgstr "ビュータイプのアカウントでは仕訳項目を作ることはできません。"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -380,49 +388,49 @@ msgstr ""
#: field:account.move.line,date_created:0
#: field:account.move.reconcile,create_date:0
msgid "Creation date"
msgstr ""
msgstr "作成日"
#. module: account
#: selection:account.journal,type:0
msgid "Purchase Refund"
msgstr ""
msgstr "購入の払い戻し"
#. module: account
#: selection:account.journal,type:0
msgid "Opening/Closing Situation"
msgstr ""
msgstr "事態 開く / 閉じる"
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
msgstr ""
msgstr "明細入力に使用される通貨"
#. module: account
#: field:account.open.closed.fiscalyear,fyear_id:0
msgid "Fiscal Year to Open"
msgstr ""
msgstr "会計年度を開く"
#. module: account
#: help:account.journal,sequence_id:0
msgid ""
"This field contains the informatin related to the numbering of the journal "
"entries of this journal."
msgstr ""
msgstr "この項目にはこの仕訳帳の仕訳エントリーのナンバリングに冠する情報が含まれています。"
#. module: account
#: field:account.journal,default_debit_account_id:0
msgid "Default Debit Account"
msgstr ""
msgstr "デフォルト借方アカウント"
#. module: account
#: view:account.move:0
msgid "Total Credit"
msgstr ""
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
@@ -430,17 +438,17 @@ msgstr ""
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
msgstr ""
msgstr "チャートテンプレート"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
msgstr ""
msgstr "オプションの他の通貨で表現された金額"
#. module: account
#: field:accounting.report,enable_filter:0
msgid "Enable Comparison"
msgstr ""
msgstr "比較を可能化"
#. module: account
#: help:account.journal.period,state:0
@@ -449,6 +457,7 @@ msgid ""
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済み状態になります。全ての取引が終了すると完了状態となります。"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -458,6 +467,8 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
"税金のチャートは税金の事実（または税金コード）の構造を反映したツリービューで、現在の税金の状況を示します。税金チャートはあなたの国の税金申告の各領域の金額"
"を表します。それはあなたのニーズに合わせて変更できる階層的な構造で表示されます。"
#. module: account
#: view:account.analytic.line:0
@@ -487,22 +498,22 @@ msgstr ""
#: model:ir.model,name:account.model_account_journal
#: field:validate.account.move,journal_id:0
msgid "Journal"
msgstr ""
msgstr "仕訳帳"
#. module: account
#: model:ir.model,name:account.model_account_invoice_confirm
msgid "Confirm the selected invoices"
msgstr ""
msgstr "選択した請求集書を確認"
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
msgid "Parent target"
msgstr ""
msgstr "親ターゲット"
#. module: account
#: field:account.bank.statement,account_id:0
msgid "Account used in this journal"
msgstr ""
msgstr "この仕訳帳で使用されるアカウント"
#. module: account
#: help:account.aged.trial.balance,chart_account_id:0
@@ -520,17 +531,17 @@ msgstr ""
#: help:account.vat.declaration,chart_account_id:0
#: help:accounting.report,chart_account_id:0
msgid "Select Charts of Accounts"
msgstr ""
msgstr "勘定科目表の選択"
#. module: account
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
msgstr "会社名は固有でなければいけません。"
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
msgid "Invoice Refund"
msgstr ""
msgstr "請求書払い戻し"
#. module: account
#: report:account.overdue:0
@@ -540,31 +551,31 @@ msgstr ""
#. module: account
#: field:account.automatic.reconcile,unreconciled:0
msgid "Not reconciled transactions"
msgstr ""
msgstr "照合なし取引"
#. module: account
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
msgstr "相手方"
#. module: account
#: view:account.fiscal.position:0
#: field:account.fiscal.position,tax_ids:0
#: field:account.fiscal.position.template,tax_ids:0
msgid "Tax Mapping"
msgstr ""
msgstr "税金のマッピング"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
msgid "Close a Fiscal Year"
msgstr ""
msgstr "会計年度を閉じる"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "The accountant confirms the statement."
msgstr ""
msgstr "会計士は明細書を確認します。"
#. module: account
#: selection:account.balance.report,display_account:0
@@ -573,45 +584,45 @@ msgstr ""
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "All"
msgstr ""
msgstr "全て"
#. module: account
#: field:account.invoice.report,address_invoice_id:0
msgid "Invoice Address Name"
msgstr ""
msgstr "請求書住所の名前"
#. module: account
#: selection:account.installer,period:0
msgid "3 Monthly"
msgstr ""
msgstr "３ヶ月毎"
#. module: account
#: view:account.unreconcile.reconcile: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
#: view:analytic.entries.report:0
msgid " 30 Days "
msgstr ""
msgstr " 30日 "
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
msgstr ""
msgstr "順序"
#. module: account
#: field:account.financial.report,account_report_id:0
#: selection:account.financial.report,type:0
msgid "Report Value"
msgstr ""
msgstr "レポート値"
#. module: account
#: view:account.fiscal.position.template:0
msgid "Taxes Mapping"
msgstr ""
msgstr "税金マッピング"
#. module: account
#: report:account.central.journal:0
@@ -621,18 +632,18 @@ msgstr ""
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
msgstr ""
msgstr "主となる順序は現在と異なる必要があります。"
#. module: account
#: code:addons/account/account_move_line.py:1251
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
msgstr "所定の日付のために期間が見つからないか、複数の期間が見つかりました。"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
msgstr ""
msgstr "税金コード金額"
#. module: account
#: code:addons/account/account.py:3116
@@ -644,29 +655,29 @@ msgstr ""
#: view:account.period:0
#: view:account.period.close:0
msgid "Close Period"
msgstr ""
msgstr "期間を閉じる"
#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
msgid "Account Common Partner Report"
msgstr ""
msgstr "アカウント共有パートナレポート"
#. module: account
#: field:account.fiscalyear.close,period_id:0
msgid "Opening Entries Period"
msgstr ""
msgstr "開始エントリーの期間"
#. module: account
#: model:ir.model,name:account.model_account_journal_period
msgid "Journal Period"
msgstr ""
msgstr "仕訳帳期間"
#. module: account
#: code:addons/account/account_move_line.py:750
#: 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
@@ -678,34 +689,34 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_aged_receivable
#, python-format
msgid "Receivable Accounts"
msgstr ""
msgstr "売掛金アカウント"
#. module: account
#: constraint:account.move.line:0
msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
msgstr "仕訳帳エントリーの日付が定義された期間ではありません。日付を変更するか仕訳帳からこの制約を削除する必要があります。"
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
msgid "General Ledger Report"
msgstr ""
msgstr "総勘定元帳レポート"
#. module: account
#: view:account.invoice:0
msgid "Re-Open"
msgstr ""
msgstr "再度開く"
#. module: account
#: view:account.use.model:0
msgid "Are you sure you want to create entries?"
msgstr ""
msgstr "本当にエントリーを作成しますか？"
#. module: account
#: view:account.invoice:0
msgid "Print Invoice"
msgstr ""
msgstr "請求書印刷"
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
@@ -792,7 +803,7 @@ msgstr ""
#. module: account
#: view:account.invoice.report:0
msgid "Supplier Invoices And Refunds"
msgstr ""
msgstr "仕入先請求書と払い戻し"
#. module: account
#: view:account.move.line.unreconcile.select:0
@@ -857,7 +868,7 @@ msgstr ""
msgid ""
"Can not %s invoice which is already reconciled, invoice should be "
"unreconciled first. You can only Refund this invoice"
msgstr ""
msgstr "既に調整済みの %s は請求できません。請求書は未調整であるべきです。この請求書は払い戻しのみできます。"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -872,7 +883,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
@@ -960,7 +971,7 @@ msgstr ""
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
msgstr ""
msgstr "販売払い戻し"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1473,6 +1484,8 @@ msgid ""
"entry per accounting document: invoice, refund, supplier payment, bank "
"statements, etc."
msgstr ""
"仕訳帳エントリーは幾つかの仕訳帳項目を含んでいます。それぞれは借方あるいは貸方取引の何れかです。OpenERPは会計ドキュメントごとにひとつの仕訳帳エント"
"リーを自動的に作成します：請求書、払い戻し、仕入先支払い、銀行明細など"
#. module: account
#: view:account.entries.report:0
@@ -1495,7 +1508,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
msgstr ""
msgstr "仕入先払い戻し"
#. module: account
#: selection:account.account,type:0
@@ -1574,7 +1587,7 @@ msgstr ""
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
msgstr ""
msgstr "払い戻し税金アカウント"
#. module: account
#: view:account.bank.statement:0
@@ -1651,7 +1664,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
@@ -2607,7 +2620,7 @@ msgstr ""
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
msgstr ""
msgstr "ベースコードの払い戻し"
#. module: account
#: selection:account.tax.template,applicable_type:0
@@ -2819,7 +2832,7 @@ msgstr ""
msgid ""
"You can not delete an invoice which is open or paid. We suggest you to "
"refund it instead."
msgstr ""
msgstr "開いているか支払済みの請求書は削除できません。その代わりに払い戻しをすることをお勧めします。"
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
@@ -3643,7 +3656,7 @@ msgstr ""
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
msgstr ""
msgstr "払い戻しのドラフトを作成"
#. module: account
#: view:account.state.open:0
@@ -4447,7 +4460,7 @@ msgstr ""
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
msgstr ""
msgstr "税金コードの払い戻し"
#. module: account
#: view:validate.account.move:0
@@ -4544,7 +4557,7 @@ msgid ""
"Bank Account Number to which the invoice will be paid. A Company bank "
"account if this is a Customer Invoice or Supplier Refund, otherwise a "
"Partner bank account number."
msgstr ""
msgstr "請求書が支払われる先の銀行口座番号です。顧客請求書や仕入れ先払い戻しであれば会社の銀行口座、さもなくばパートナの銀行口座番号です。"
#. module: account
#: view:account.state.open:0
@@ -5177,7 +5190,7 @@ msgstr ""
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Customer Refund"
msgstr ""
msgstr "顧客払い戻し"
#. module: account
#: constraint:account.move:0
@@ -5286,7 +5299,7 @@ msgstr ""
#. module: account
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
msgstr "顧客請求書と払い戻し"
#. module: account
#: field:account.analytic.line,amount_currency:0
@@ -5342,7 +5355,7 @@ msgstr ""
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice Options"
msgstr ""
msgstr "払い戻し請求書オプション"
#. module: account
#: help:account.automatic.reconcile,power:0
@@ -5581,7 +5594,7 @@ msgstr ""
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice"
msgstr ""
msgstr "払い戻し請求書"
#. module: account
#: field:account.invoice,address_invoice_id:0
addons/account/res_config_view.xml
+82 -80
View File
@@ -15,92 +15,94 @@
<field name="model">account.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Accounting">
<field name="has_default_company" invisible="1" />
<field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="expects_chart_of_accounts"/>
<form string="Configure Accounting" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<field name="has_default_company" invisible="1" />
<field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="expects_chart_of_accounts"/>
<field name="has_chart_of_accounts" invisible="1"/>
<group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label string="Please select a chart template to install a chart of accounts." colspan="4"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
<button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/>
<field name ="code_digits" groups="account.group_account_user"/>
<field name ="seq_journal" groups="base.group_extended"/>
<newline/>
<field name ="complete_tax_set" invisible="1"/>
<field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
</group>
<field name="has_chart_of_accounts" invisible="1"/>
<group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label string="Please select a chart template to install a chart of accounts." colspan="4"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
<button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/>
<field name ="code_digits" groups="account.group_account_user"/>
<field name ="seq_journal" groups="base.group_extended"/>
<newline/>
<field name ="complete_tax_set" invisible="1"/>
<field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
</group>
<field name="has_fiscal_year" invisible="1"/>
<group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
<field name="date_start" on_change="onchange_start_date(date_start)"/>
<field name="date_stop"/>
<field name="period" colspan="4"/>
</group>
<field name="has_fiscal_year" invisible="1"/>
<group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
<field name="date_start" on_change="onchange_start_date(date_start)"/>
<field name="date_stop"/>
<field name="period" colspan="4"/>
</group>
<group colspan="4">
<separator string="Accounting Configuration" colspan="4"/>
<field name ="complete_tax_set" invisible="1"/>
<newline/>
<group colspan="2" col="2">
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
<field name="module_account_accountant"/>
<field name="module_account_asset"/>
<group colspan="4">
<separator string="Accounting Configuration" colspan="4"/>
<field name ="complete_tax_set" invisible="1"/>
<newline/>
<group colspan="2" col="2">
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
<field name="module_account_accountant"/>
<field name="module_account_asset"/>
</group>
<group colspan="2" col="2">
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
<field name="currency_id" widget="selection"/>
<field name="module_account_budget"/>
</group>
</group>
<group colspan="2" col="2">
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
<field name="currency_id" widget="selection"/>
<field name="module_account_budget"/>
<separator string="Customer Invoices" colspan="2"/>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
<field name="module_account_invoice_layout"/>
<field name="module_account_voucher"/>
<field name="module_account_followup"/>
<field name="group_proforma_invoices"/>
</group>
</group>
<group colspan="2" col="2">
<separator string="Customer Invoices" colspan="2"/>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
<field name="module_account_invoice_layout"/>
<field name="module_account_voucher"/>
<field name="module_account_followup"/>
<field name="group_proforma_invoices"/>
</group>
<group colspan="2" col="2">
<separator string="Supplier Invoices" colspan="2"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
<field name="purchase_refund_journal_id" invisible="1"/>
<field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
<field name="module_account_payment"/>
</group>
<group colspan="2" col="2">
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account"/>
</group>
<group colspan="2" col="2">
<separator string="Bank &amp; Cash" colspan="2"/>
<label string="Configure Bank Accounts :"/>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
<group colspan="2" col="2">
<separator string="Analytic Accounting" colspan="2"/>
<group name="analytic_accounting" colspan="2"/>
<field name="module_account_analytic_plans"/>
<field name="module_account_analytic_default"/>
</group>
<newline/>
<label colspan="2"/>
<button string="Cancel" icon="gtk-cancel" special="cancel"/>
<button string="Apply" icon="gtk-apply" type="object" name="execute"/>
<group colspan="2" col="2">
<separator string="Supplier Invoices" colspan="2"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
<field name="purchase_refund_journal_id" invisible="1"/>
<field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
<field name="module_account_payment"/>
</group>
<group colspan="2" col="2">
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account"/>
</group>
<group colspan="2" col="2">
<separator string="Bank &amp; Cash" colspan="2"/>
<label string="Configure Bank Accounts :"/>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
<group colspan="2" col="2">
<separator string="Analytic Accounting" colspan="2"/>
<group name="analytic_accounting" colspan="2"/>
<field name="module_account_analytic_plans"/>
<field name="module_account_analytic_default"/>
</group>
</sheet>
</form>
</field>
</record>
addons/account_bank_statement_extensions/i18n/gu.po
+374
View File
@@ -0,0 +1,374 @@
# Gujarati translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
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-04-17 09:03+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Gujarati <gu@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-04-18 04:42+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Search Bank Transactions"
msgstr "બેન્ક વ્યવહારો શોધો"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: selection:account.bank.statement.line,state:0
msgid "Confirmed"
msgstr "સમર્થિત"
#. module: account_bank_statement_extensions
#: view:account.bank.statement:0
#: view:account.bank.statement.line:0
msgid "Glob. Id"
msgstr ""
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "CODA"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,parent_id:0
msgid "Parent Code"
msgstr "પેરેંટ કોડ"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Debit"
msgstr "ઉધાર"
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
msgid "Cancel selected statement lines"
msgstr ""
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
msgid "The RIB and/or IBAN is not valid"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Group By..."
msgstr "ગ્રુપ દ્વારા..."
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,state:0
msgid "State"
msgstr "સ્થિતિ"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: selection:account.bank.statement.line,state:0
msgid "Draft"
msgstr "કાચું"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement"
msgstr "વિધાન"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
msgid "Confirm selected statement lines"
msgstr ""
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
msgid "Bank Statement Balances Report"
msgstr ""
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
msgid "Cancel Lines"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
msgid "Batch Payment Info"
msgstr ""
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Confirm Lines"
msgstr ""
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
#, python-format
msgid ""
"Delete operation not allowed ! Please go to the associated bank "
"statement in order to delete and/or modify this bank statement line"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,type:0
msgid "Type"
msgstr "પ્રકાર"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: field:account.bank.statement.line,journal_id:0
#: report:bank.statement.balance.report:0
msgid "Journal"
msgstr "રોજનામું"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Confirmed Statement Lines."
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit Transactions."
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
msgid "cancel selected statement lines."
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_number:0
msgid "Counterparty Number"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Transactions"
msgstr ""
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
#, python-format
msgid "Warning"
msgstr ""
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Closing Balance"
msgstr ""
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Date"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: field:account.bank.statement.line,globalisation_amount:0
msgid "Glob. Amount"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Debit Transactions."
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Extended Filters..."
msgstr ""
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Confirmed lines cannot be changed anymore."
msgstr ""
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
msgid ""
"\n"
"Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,val_date:0
msgid "Valuta Date"
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
msgid "Confirm selected statement lines."
msgstr ""
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
msgstr ""
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Name"
msgstr ""
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "ISO 20022"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Notes"
msgstr ""
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "Manual"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,amount:0
msgid "Amount"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Fin.Account"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_currency:0
msgid "Counterparty Currency"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_bic:0
msgid "Counterparty BIC"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,child_ids:0
msgid "Child Codes"
msgstr ""
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
msgstr ""
#. module: account_bank_statement_extensions
#: 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 ""
#. module: account_bank_statement_extensions
#: help:account.bank.statement.line,globalisation_id:0
msgid ""
"Code to identify transactions belonging to the same globalisation level "
"within a batch payment"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Draft Statement Lines."
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Glob. Am."
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,code:0
msgid "Code"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_name:0
msgid "Counterparty Name"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,name:0
msgid "Communication"
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
msgid "Bank Accounts"
msgstr ""
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
msgid "Bank Statement"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Line"
msgstr ""
#. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0
msgid "The code must be unique !"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,bank_statement_line_ids:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
msgid "Bank Statement Lines"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Child Batch Payments"
msgstr ""
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
#: view:confirm.statement.line:0
msgid "Cancel"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Lines"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Total Amount"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,globalisation_id:0
msgid "Globalisation ID"
msgstr ""
addons/account_bank_statement_extensions/i18n/ja.po
+3 -3
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-17 04:52+0000\n"
"X-Generator: Launchpad (build 15099)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@@ -186,7 +186,7 @@ msgstr "借方取引"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Extended Filters..."
msgstr "拡張したフィルタ…"
msgstr "拡張フィルタ…"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
addons/account_budget/i18n/sr@latin.po
+5 -5
View File
@@ -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:35+0000\n"
"PO-Revision-Date: 2011-11-10 16:52+0000\n"
"Last-Translator: Milan Milosevic <Unknown>\n"
"PO-Revision-Date: 2012-04-17 05:29+0000\n"
"Last-Translator: Maroje Delibasic <maroje.delibasic@gmail.com>\n"
"Language-Team: Serbian latin <sr@latin@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-02-09 06:48+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
@@ -331,7 +331,7 @@ msgstr "Početak perioda"
#. module: account_budget
#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
msgid "Account Budget crossvered summary report"
msgstr "Izvestaj rezimea budžeta za unakrsni konto"
msgstr "Izveštaj rezimea budžeta za unakrsni konto"
#. module: account_budget
#: report:account.budget:0
addons/base_calendar/security/ir.model.access.csv
+1 -1
View File
@@ -1,5 +1,5 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_calendar_attendee,calendar.attendee,model_calendar_attendee,base.group_user,1,1,1,1
access_calendar_attendee,calendar.attendee,model_calendar_attendee,,1,1,1,1
access_calendar_alarm,calendar.alarm,model_calendar_alarm,base.group_user,1,1,1,1
access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1
access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_calendar_attendee calendar.attendee model_calendar_attendee base.group_user 1 1 1 1
3 access_calendar_alarm calendar.alarm model_calendar_alarm base.group_user 1 1 1 1
4 access_res_alarm res.alarm model_res_alarm base.group_user 1 1 1 1
5 access_calendar_todo calendar.todo model_calendar_todo base.group_user 1 1 1 1
addons/base_setup/base_setup_views.xml
+20 -17
View File
@@ -132,28 +132,31 @@
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Sales">
<group name="config_sale" colspan="4"/>
<form string="Configure Sales" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<group>
<group name="config_sale" colspan="4"/>
<!-- this part is necessary to allow the plugins to extend the view -->
<field name="module_crm" invisible="1"/>
<group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
<separator string="Emails"/>
</group>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<newline/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
<!-- this part is necessary to allow the plugins to extend the view -->
<field name="module_crm" invisible="1"/>
<group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
<separator string="Emails"/>
</group>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<newline/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
<group name="config_crm" colspan="4"/>
<newline/>
<label colspan="2"/>
<button string="Cancel" icon="gtk-cancel" special="cancel"/>
<button string="Apply" icon="gtk-apply" type="object" name="execute"/>
<group name="config_crm" colspan="4"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="base.action_sale_config" model="ir.actions.act_window">
<field name="name">Configure Sales</field>
<field name="type">ir.actions.act_window</field>
addons/board/board_data_admin.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Administration Dashboard">
<form string="Administration Dashboard" layout="manual">
<board style="2-1">
<column>
<action name="%(board_config_overview)d" string="Configuration Overview"/>
addons/board/board_data_home.xml
+1 -1
View File
@@ -43,7 +43,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="">
<form string="" layout="manual">
<board style="1">
<column>
<action name="%(action_application_tiles)d"/>
addons/crm/board_crm_view.xml
+1 -1
View File
@@ -98,7 +98,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sales Dashboard">
<form string="Sales Dashboard" layout="manual">
<board style="2-1">
<column>
<action string="My Opportunities"
addons/crm/crm_lead_view.xml
+35 -39
View File
@@ -51,7 +51,19 @@
<field name="model">crm.lead</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Leads Form">
<form string="Leads Form" layout="manual">
<div class="oe_form_topbar">
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
<button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
<button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</div>
</div>
<sheet layout="auto">
<group colspan="4" col="7">
<field name="name" required="1" string="Subject"/>
<field name="priority"/>
@@ -119,29 +131,6 @@
</group>
<separator colspan="4" string="Notes"/>
<field name="description" nolabel="1" colspan="4"/>
<separator colspan="4"/>
<group col="8" colspan="4">
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
<button name="case_mark_lost" string="Close"
states="open,pending" type="object"
icon="gtk-close" />
<button name="case_pending" string="Pending"
states="open" type="object"
icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate"
states="open,pending" type="object"
groups="base.group_extended"
icon="gtk-go-up" />
<button name="case_reset"
string="Reset to Draft" states="done,cancel"
type="object" icon="gtk-convert" />
</group>
</page>
<page string="Extra Info" groups="base.group_extended">
<group colspan="2" col="2">
@@ -165,7 +154,10 @@
</group>
</page>
</notebook>
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</sheet>
<div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</field>
</record>
@@ -406,7 +398,20 @@
<field name="type">form</field>
<field name="priority">20</field>
<field name="arch" type="xml">
<form string="Opportunities">
<form string="Opportunities" layout="manual">
<div class="oe_form_topbar">
<button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
<button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
<button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</div>
</div>
<sheet layout="auto">
<group colspan="4" col="7">
<field name="name" required="1" string="Opportunity"/>
<label string="Stage:" align="1.0"/>
@@ -473,18 +478,6 @@
<separator colspan="4" string="Details"/>
<field name="description" nolabel="1" colspan="4"/>
<separator colspan="4"/>
<group col="10" colspan="4">
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
<button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
<button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
<button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
</group>
</page>
<page string="Lead">
<group colspan="2" col="4">
@@ -529,7 +522,10 @@
<field name="ref2"/>
</page>
</notebook>
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</sheet>
<div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</field>
</record>
addons/crm/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
"X-Generator: Launchpad (build 15099)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: crm
#: view:crm.lead.report:0
addons/delivery/delivery_view.xml
+1 -1
View File
@@ -304,7 +304,7 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
<xpath expr="//button[@name='order_confirm']" position="after">
<button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
</xpath>
</field>
addons/document/board_document_view.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Document board">
<form string="Document board" layout="manual">
<board style="2-1" >
<column>
<action string="New Files"
@@ -57,7 +57,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Document board">
<form string="Document board" layout="manual">
<board style="2-1">
<column>
<action string="Wall of Shame"
addons/event/board_association_view.xml
+1 -1
View File
@@ -39,7 +39,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Association Dashboard">
<form string="Association Dashboard" layout="manual">
<board style="2-1">
<column>
<action string="Next Events"
addons/hr/hr_board.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="My Board">
<form string="My Board" layout="manual">
<board style="2-1">
<column/>
<column/>
@@ -35,7 +35,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="HR Manager Board">
<form string="HR Manager Board" layout="manual">
<board style="2-1">
<column/>
<column/>
addons/hr/i18n/ja.po
+12 -12
View File
@@ -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 01:37+0100\n"
"PO-Revision-Date: 2012-04-17 01:59+0000\n"
"PO-Revision-Date: 2012-04-17 18:27+0000\n"
"Last-Translator: Masaki Yamaya <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-04-17 04:51+0000\n"
"X-Generator: Launchpad (build 15099)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0
@@ -35,19 +35,19 @@ msgstr "エラー。反復する部署を作ることはできません。"
#. module: hr
#: model:process.transition,name:hr.process_transition_contactofemployee0
msgid "Link the employee to information"
msgstr ""
msgstr "従業員を情報に連携"
#. module: hr
#: field:hr.employee,sinid:0
msgid "SIN No"
msgstr ""
msgstr "社会保険番号"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_main
#: model:ir.ui.menu,name:hr.menu_hr_management
#: model:ir.ui.menu,name:hr.menu_hr_root
msgid "Human Resources"
msgstr ""
msgstr "人材"
#. module: hr
#: view:hr.employee:0 view:hr.job:0
@@ -152,7 +152,7 @@ msgid ""
"Your Company's Department Structure is used to manage all documents related "
"to employees by departments: expenses and timesheet validation, leaves "
"management, recruitments, etc."
msgstr ""
msgstr "部門組織構造は、従業員に関する全てのドキュメントの管理に使われます。例えば、経費、タイムシートの検証、休暇の管理、採用など。"
#. module: hr
#: field:hr.employee,color:0
@@ -189,7 +189,7 @@ msgstr "この職種に必要な従業員の数"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
msgid "Attendance"
msgstr "出欠"
msgstr "勤怠"
#. module: hr
#: view:hr.employee:0
@@ -204,7 +204,7 @@ msgstr "勤務先電話"
#. module: hr
#: field:hr.employee.category,child_ids:0
msgid "Child Categories"
msgstr "子関係の区分"
msgstr "下位区分"
#. module: hr
#: view:hr.job:0 field:hr.job,description:0
@@ -347,7 +347,7 @@ msgstr "従業員を作成する。"
#. module: hr
#: field:hr.employee.category,name:0
msgid "Category"
msgstr "分類"
msgstr "カテゴリー"
#. module: hr
#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -411,7 +411,7 @@ msgstr "下位部門"
#. module: hr
#: view:hr.employee:0
msgid "Status"
msgstr "ステータス"
msgstr "状態"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -582,7 +582,7 @@ msgstr "国籍"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
msgid "Leaves"
msgstr "作業終了"
msgstr "休暇"
#. module: hr
#: view:board.board:0
addons/hr/res_config_view.xml
+22 -41
View File
@@ -13,49 +13,30 @@
<field name="model">hr.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string ="HR Application">
<separator string="Human Resources" colspan="4"/>
<label string="Departments :"/>
<label colspan="1"/>
<group colspan="2">
<button name="%(view_department_form_installer)d" string="Create Your Departments"
type="action" icon="terp-personal+"/>
</group>
<newline/>
<label string="Employees :" />
<label colspan="1"/>
<group colspan="2">
<button name="%(open_view_employee_list_my)d" string="Create Your Employees"
type="action" icon="terp-personal"/>
</group>
<newline/>
<field name="module_hr_timesheet_sheet"/>
<newline/>
<field name="module_hr_holidays"/>
<newline/>
<label string="Salary Rules :"/>
<label colspan="1"/>
<group colspan="2">
<button string="Configure Your Salary Rules" icon="gtk-go-forward"
name="%(open_payroll1_modules)d" type="action" />
</group>
<form string ="Configure Human Resources" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Human Resources" colspan="4"/>
<field name="module_hr_timesheet_sheet"/>
<newline/>
<field name="module_hr_holidays"/>
<separator string="Additional Features" colspan="4"/>
<field name="module_hr_expense"/>
<newline/>
<field name="module_hr_recruitment"/>
<newline/>
<field name="module_hr_evaluation"/>
<newline/>
<field name="module_hr_contract"/>
<separator string="Additional Features" colspan="4"/>
<field name="module_hr_expense"/>
<newline/>
<field name="module_hr_recruitment"/>
<newline/>
<field name="module_hr_evaluation"/>
<newline/>
<field name="module_hr_contract"/>
<group name="config_timesheets" colspan="4"/>
<group name="config_payroll" colspan="4"/>
<group name="config_recruitment" colspan="4"/>
<label colspan="2"/>
<button string="Cancel" icon="gtk-cancel" special="cancel"/>
<button string="Apply" icon="gtk-apply" type="object" name="execute"/>
<group name="config_timesheets" colspan="4"/>
<group name="config_payroll" colspan="4"/>
<group name="config_recruitment" colspan="4"/>
</sheet>
</form>
</field>
</record>
addons/hr_evaluation/hr_evaluation_installer.xml
-16
View File
@@ -10,21 +10,5 @@
<field name="help">You can define appraisal plans (ex: first interview after 6 months, then every year). Then, each employee can be linked to an appraisal plan so that OpenERP can automatically generate interview requests to managers and/or subordinates.</field>
</record>
<!-- Hr Configuration wizard -->
<record id="view_evaluation_config_wizard_inherit" model="ir.ui.view">
<field name="name">hr settings for evaluations</field>
<field name="model">hr.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<field name="module_hr_evaluation" position="after">
<group colspan="2">
<button name="%(action_evaluation_plans_installer)d" string="Review Appraisal Plans"
type="action" icon="terp-stock_align_left_24"/>
</group>
</field>
</field>
</record>
</data>
</openerp>
addons/hr_expense/hr_expense_installer_view.xml
-16
View File
@@ -27,21 +27,5 @@
<field name="help">Define one product for each expense type allowed for an employee (travel by car, hostel, restaurant, etc). If you reimburse the employees at a fixed rate, set a cost and a unit of measure on the product. If you reimburse based on real costs, set the cost at 0.00. The user will set the real price when recording his expense sheet.</field>
</record>
<!-- Hr Configuration wizard -->
<record id="view_expenseconfig_wizard_inherit" model="ir.ui.view">
<field name="name">hr settings for expenses</field>
<field name="model">hr.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<field name="module_hr_expense" position="after">
<group colspan="2">
<button name="%(product_normal_form_view_installer)d" string="Review Expenses Products"
type="action" icon="terp-accessories-archiver"/>
</group>
</field>
</field>
</record>
</data>
</openerp>
addons/hr_holidays/hr_holidays_view.xml
-16
View File
@@ -485,22 +485,6 @@
<field name="help">You can assign remaining Legal Leaves for each employee, OpenERP will automatically create and validate allocation requests.</field>
</record>
<!-- Hr Configuration wizard -->
<record id="view_config_wizard_inherit" model="ir.ui.view">
<field name="name">hr settings for holidays</field>
<field name="model">hr.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<field name="module_hr_holidays" position="after">
<group colspan="2">
<button name="%(hr_holidays.hr_holidays_leaves_assign_legal)d" string="Allocate Leaves"
type="action" icon="gtk-apply"/>
</group>
</field>
</field>
</record>
<!-- Hr employee inherit Legal Leaves -->
<record id="view_employee_form_leave_inherit" model="ir.ui.view">
addons/hr_holidays/i18n/ja.po
+844
View File
@@ -0,0 +1,844 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
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-04-18 04:38+0000\n"
"Last-Translator: Masaki Yamaya <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-04-18 04:41+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Blue"
msgstr "青"
#. module: hr_holidays
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "割振りタイプ"
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
msgid "Waiting Second Approval"
msgstr "2番目の承認待ち"
#. module: hr_holidays
#: help:hr.holidays.status,remaining_leaves:0
msgid "Maximum Leaves Allowed - Leaves Already Taken"
msgstr "休暇の最大値 - 既取得休暇"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Leaves Management"
msgstr "休暇管理"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Group By..."
msgstr "グループ化…"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Allocation Mode"
msgstr "割振りモード"
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,department_id:0
msgid "Department"
msgstr "部門"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
msgid "Requests Approve"
msgstr "承認を申請"
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
msgid "Refused"
msgstr "拒否"
#. module: hr_holidays
#: help:hr.holidays,category_id:0
msgid "Category of Employee"
msgstr "従業員のカテゴリー"
#. module: hr_holidays
#: view:hr.holidays:0
msgid " Month-1"
msgstr " 月-1"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Brown"
msgstr "茶"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Remaining Days"
msgstr "残り日数"
#. module: hr_holidays
#: selection:hr.holidays,holiday_type:0
msgid "By Employee"
msgstr "従業員ごと"
#. module: hr_holidays
#: help:hr.holidays,employee_id:0
msgid ""
"Leave Manager can let this field empty if this leave request/allocation is "
"for every employee"
msgstr "この休暇申請 / 割振りが全ての従業員のためであるならば、この項目を空白にしておくことができます。"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Set to Draft"
msgstr "草稿に設定"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Cyan"
msgstr "薄青緑色"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Green"
msgstr "薄緑"
#. module: hr_holidays
#: field:hr.employee,current_leave_id:0
msgid "Current Leave Type"
msgstr "現在の休暇タイプ"
#. module: hr_holidays
#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
msgid ""
"Leave requests can be recorded by employees and validated by their managers. "
"Once a leave request is validated, it appears automatically in the agenda of "
"the employee. You can define several allowance types (paid holidays, "
"sickness, etc.) and manage allowances per type."
msgstr ""
#. module: hr_holidays
#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
msgid "Summary Of Leaves"
msgstr "休暇の要約"
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
#: selection:hr.holidays,state:0
msgid "Approved"
msgstr "承認済み"
#. module: hr_holidays
#: field:hr.employee,last_login:0
msgid "Latest Connection"
msgstr "最新の接続"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Refuse"
msgstr "拒否"
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:344
#, python-format
msgid ""
"You cannot validate leaves for employee %s: too few remaining days (%s)."
msgstr "この従業員 %s の休暇を承認できません：残りの休暇日数が足りません (%s)"
#. module: hr_holidays
#: help:hr.holidays,state:0
msgid ""
"The state is set to 'Draft', when a holiday request is created. \n"
"The state is 'Waiting Approval', when holiday request is confirmed by user. "
" \n"
"The state is 'Refused', when holiday request is refused by manager. "
" \n"
"The state is 'Approved', when holiday request is approved by manager."
msgstr ""
#. module: hr_holidays
#: view:board.board:0
#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
msgid "Leaves"
msgstr "休暇"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays
msgid "Leave"
msgstr "休暇"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
msgid "Leave Requests to Approve"
msgstr "休暇申請の承認"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
msgid "Leaves by Department"
msgstr "部門ごとの休暇"
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
msgid "Cancelled"
msgstr "キャンセルされました。"
#. module: hr_holidays
#: help:hr.holidays,type:0
msgid ""
"Choose 'Leave Request' if someone wants to take an off-day. \n"
"Choose 'Allocation Request' if you want to increase the number of leaves "
"available for someone"
msgstr ""
"休暇を希望している人がいたら、「休暇申請」を選んでください。　\n"
"誰かの休暇を増やすのであれば、「割当て申請」を選んでください。"
#. module: hr_holidays
#: help:hr.employee,remaining_leaves:0
msgid ""
"Total number of legal leaves allocated to this employee, change this value "
"to create allocation/leave requests."
msgstr "この従業員の法定休暇の日数です。割当て/休暇申請を指定するには、この値を変更して下さい。"
#. module: hr_holidays
#: view:hr.holidays.status:0
msgid "Validation"
msgstr "承認"
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:377
#, python-format
msgid "Warning !"
msgstr "警告"
#. module: hr_holidays
#: field:hr.holidays.status,color_name:0
msgid "Color in Report"
msgstr "報告書の色"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
msgid "HR Holidays Summary Report By Employee"
msgstr "従業員ごとの休暇要約報告書"
#. module: hr_holidays
#: help:hr.holidays,manager_id:0
msgid "This area is automatically filled by the user who validate the leave"
msgstr "この項目は、休暇を承認されたユーザによって自動的に入力されます。"
#. module: hr_holidays
#: field:hr.holidays,holiday_status_id:0
#: field:hr.holidays.remaining.leaves.user,leave_type:0
#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
#: field:hr.holidays.summary.dept,holiday_type:0
#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
#: model:ir.model,name:hr_holidays.model_hr_holidays_status
#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
msgid "Leave Type"
msgstr "休暇タイプ"
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:199
#: code:addons/hr_holidays/hr_holidays.py:344
#, python-format
msgid "Warning!"
msgstr "警告"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Magenta"
msgstr "赤紫色"
#. module: hr_holidays
#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
#, python-format
msgid "You have to select at least 1 Department. And try again"
msgstr "少なくとも一つの部門を指定して、やり直して下さい。"
#. module: hr_holidays
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
msgid "Confirmed"
msgstr "確認済み"
#. module: hr_holidays
#: field:hr.holidays.summary.dept,date_from:0
#: field:hr.holidays.summary.employee,date_from:0
msgid "From"
msgstr "から"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Confirm"
msgstr "確認"
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:384
#, python-format
msgid "Leave Request for %s"
msgstr "%s の休暇申請"
#. module: hr_holidays
#: field:hr.holidays.status,remaining_leaves:0
msgid "Remaining Leaves"
msgstr "残りの休暇日数"
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,state:0
msgid "State"
msgstr "状態"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
msgid "Total holidays by type"
msgstr "タイプごとの休暇日数"
#. module: hr_holidays
#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
#: field:hr.holidays.remaining.leaves.user,name:0
#: model:ir.model,name:hr_holidays.model_hr_employee
msgid "Employee"
msgstr "従業員"
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
msgid "New"
msgstr "新規"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Type"
msgstr "タイプ"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Red"
msgstr "赤色"
#. module: hr_holidays
#: view:hr.holidays.remaining.leaves.user:0
msgid "Leaves by Type"
msgstr "タイプごとの休暇"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Salmon"
msgstr "薄桃色"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Wheat"
msgstr "小麦色"
#. module: hr_holidays
#: constraint:resource.calendar.leaves:0
msgid "Error! leave start-date must be lower then leave end-date."
msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:382
#, python-format
msgid "Allocation for %s"
msgstr "%s の割当て"
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
#: field:hr.holidays,number_of_days_temp:0
msgid "Number of Days"
msgstr "日数"
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:377
#, python-format
msgid ""
"The feature behind the field 'Remaining Legal Leaves' can only be used when "
"there is only one leave type with the option 'Allow to Override Limit' "
"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
"decide on which leave type the update has to be done. \n"
"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
"the employees if the configuration does not allow to use this field."
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.status:0
msgid "Search Leave Type"
msgstr "休暇タイプを検索"
#. module: hr_holidays
#: sql_constraint:hr.holidays:0
msgid "You have to select an employee or a category"
msgstr "従業員あるいはカテゴリーを選んで下さい。"
#. module: hr_holidays
#: help:hr.holidays.status,double_validation:0
msgid ""
"If its True then its Allocation/Request have to be validated by second "
"validator"
msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
msgid "Waiting Approval"
msgstr "承認待ち"
#. module: hr_holidays
#: field:hr.holidays.summary.employee,emp:0
msgid "Employee(s)"
msgstr "従業員"
#. module: hr_holidays
#: help:hr.holidays.status,categ_id:0
msgid ""
"If you set a meeting type, OpenERP will create a meeting in the calendar "
"once a leave is validated."
msgstr "ミーティングのタイプを設定すると、休暇が承認されるとカレンダーにミーティングが設定されます。"
#. module: hr_holidays
#: field:hr.holidays,linked_request_ids:0
msgid "Linked Requests"
msgstr "連係を持った申請"
#. module: hr_holidays
#: field:hr.holidays,parent_id:0
msgid "Parent"
msgstr "上位"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Lavender"
msgstr "薄紫色"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Month"
msgstr "月"
#. module: hr_holidays
#: view:hr.holidays:0
#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
msgid "Leave Requests"
msgstr "休暇申請"
#. module: hr_holidays
#: field:hr.holidays.status,limit:0
msgid "Allow to Override Limit"
msgstr "限界を無効にする。"
#. module: hr_holidays
#: view:hr.holidays.summary.employee:0
#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
msgid "Employee's Holidays"
msgstr "従業員の休暇"
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,category_id:0
msgid "Category"
msgstr "カテゴリー"
#. module: hr_holidays
#: help:hr.holidays.status,max_leaves:0
msgid ""
"This value is given by the sum of all holidays requests with a positive "
"value."
msgstr "この値は休暇申請の総計であり、正数です。"
#. module: hr_holidays
#: view:board.board:0
msgid "All Employee Leaves"
msgstr "全ての従業員の休暇"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Coral"
msgstr "サンゴ色"
#. module: hr_holidays
#: view:hr.holidays.summary.dept:0
#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
msgid "Holidays by Department"
msgstr "部門ごとの休暇"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Black"
msgstr "黒"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
msgid "Allocate Leaves for Employees"
msgstr "従業員に休暇を割当てる。"
#. module: hr_holidays
#: field:resource.calendar.leaves,holiday_id:0
msgid "Holiday"
msgstr "休暇"
#. module: hr_holidays
#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
msgid "Meeting"
msgstr "ミーティング"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Ivory"
msgstr "象牙色"
#. module: hr_holidays
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
msgid "Both Validated and Confirmed"
msgstr "承認済み，確認済み"
#. module: hr_holidays
#: field:hr.holidays.status,leaves_taken:0
msgid "Leaves Already Taken"
msgstr "休暇を取得済み"
#. module: hr_holidays
#: field:hr.holidays,user_id:0
#: field:hr.holidays.remaining.leaves.user,user_id:0
msgid "User"
msgstr "ユーザ"
#. module: hr_holidays
#: sql_constraint:hr.holidays:0
msgid "The start date must be before the end date !"
msgstr "開始日は終了日の前でなければなりません。"
#. module: hr_holidays
#: field:hr.holidays.status,active:0
msgid "Active"
msgstr "有効"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
msgid "Leaves To Validate"
msgstr "承認すべき休暇"
#. module: hr_holidays
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."
msgstr ""
#. module: hr_holidays
#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
msgid "Remaining Legal Leaves"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,manager_id:0
msgid "First Approval"
msgstr ""
#. module: hr_holidays
#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
msgid "Unpaid"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
msgid "Leaves Summary"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Holidays during last month"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
#, python-format
msgid "Error"
msgstr ""
#. module: hr_holidays
#: view:hr.employee:0
msgid "Assign Leaves"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Blue"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "My Department Leaves"
msgstr ""
#. module: hr_holidays
#: field:hr.employee,current_leave_state:0
msgid "Current Leave Status"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,type:0
msgid "Request Type"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,active:0
msgid ""
"If the active field is set to false, it will allow you to hide the leave "
"type without removing it."
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.status:0
msgid "Misc"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "General"
msgstr ""
#. module: hr_holidays
#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
msgid "Compensatory Days"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,notes:0
msgid "Reasons"
msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
msgid "Leaves Analysis"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
msgid "Cancel"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,color_name:0
msgid ""
"This color will be used in the leaves summary located in Reporting\\Leaves "
"by Departement"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
msgid "Validated"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 selection:hr.holidays,type:0
msgid "Allocation Request"
msgstr ""
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
msgid "Leave Detail"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,double_validation:0
#: field:hr.holidays.status,double_validation:0
msgid "Apply Double Validation"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
msgid "Print"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays.status:0
msgid "Details"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
msgid "My Leaves"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,holiday_type:0
msgid "By Employee Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 selection:hr.holidays,type:0
msgid "Leave Request"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,name:0
msgid "Description"
msgstr ""
#. module: hr_holidays
#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
msgid "Legal Leaves"
msgstr ""
#. module: hr_holidays
#: sql_constraint:hr.holidays:0
msgid "The number of days must be greater than 0 !"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays,holiday_type:0
msgid ""
"By Employee: Allocation/Request for individual Employee, By Employee "
"Category: Allocation/Request for group of employees in category"
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/hr_holidays.py:199
#, python-format
msgid "You cannot delete a leave which is not in draft state !"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Search Leave"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays.summary.employee,holiday_type:0
msgid "Select Holiday Type"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
msgid "Remaining leaves"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays.summary.dept,depts:0
msgid "Department(s)"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,manager_id2:0
msgid "Second Approval"
msgstr ""
#. module: hr_holidays
#: field:hr.holidays,date_to:0
msgid "End Date"
msgstr ""
#. module: hr_holidays
#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
msgid "Sick Leaves"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,limit:0
msgid ""
"If you tick this checkbox, the system will allow, for this section, the "
"employees to take more leaves than the available ones."
msgstr ""
#. module: hr_holidays
#: help:hr.holidays.status,leaves_taken:0
msgid ""
"This value is given by the sum of all holidays requests with a negative "
"value."
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Violet"
msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
msgid ""
"You can assign remaining Legal Leaves for each employee, OpenERP will "
"automatically create and validate allocation requests."
msgstr ""
#. module: hr_holidays
#: field:hr.holidays.status,max_leaves:0
msgid "Maximum Allowed"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays,manager_id2:0
msgid ""
"This area is automaticly filled by the user who validate the leave with "
"second level (If Leave type need second validation)"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Mode"
msgstr ""
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
msgid "HR Holidays Summary Report By Department"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Approve"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0 field:hr.holidays,date_from:0
msgid "Start Date"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
msgid "Allocation Requests"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Yellow"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Pink"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Manager"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "To Confirm"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Year"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "To Approve"
msgstr ""
addons/hr_payroll/i18n/ja.po
+6 -6
View File
@@ -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 01:37+0100\n"
"PO-Revision-Date: 2012-04-16 01:14+0000\n"
"PO-Revision-Date: 2012-04-17 18:29+0000\n"
"Last-Translator: Masaki Yamaya <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-04-17 04:51+0000\n"
"X-Generator: Launchpad (build 15099)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: hr_payroll
#: field:hr.payslip.line,condition_select:0
@@ -81,7 +81,7 @@ msgstr "給与明細"
#: field:hr.payroll.structure,parent_id:0
#: field:hr.salary.rule.category,parent_id:0
msgid "Parent"
msgstr "親クラス"
msgstr "上位"
#. module: hr_payroll
#: report:paylip.details:0 report:payslip:0
@@ -151,7 +151,7 @@ msgstr "作成"
#: help:hr.payslip.line,amount_percentage_base:0
#: help:hr.salary.rule,amount_percentage_base:0
msgid "result will be affected to a variable"
msgstr ""
msgstr "結果は変数に影響します。"
#. module: hr_payroll
#: report:contribution.register.lines:0
@@ -381,7 +381,7 @@ msgstr "例えば、50%を適用するには50.0と入れてください。"
#. module: hr_payroll
#: field:hr.payslip,paid:0
msgid "Made Payment Order ? "
msgstr ""
msgstr "支払いの処理をしましたか？ "
#. module: hr_payroll
#: report:contribution.register.lines:0
addons/hr_payroll_account/i18n/ja.po
+5 -5
View File
@@ -8,19 +8,19 @@ 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-04-08 06:04+0000\n"
"PO-Revision-Date: 2012-04-17 18:31+0000\n"
"Last-Translator: Masaki Yamaya <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-04-09 04:56+0000\n"
"X-Generator: Launchpad (build 15060)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: hr_payroll_account
#: field:hr.payslip,move_id:0
msgid "Accounting Entry"
msgstr ""
msgstr "会計入力"
#. module: hr_payroll_account
#: field:hr.salary.rule,account_tax_id:0
@@ -69,7 +69,7 @@ msgstr "給与明細書"
#. module: hr_payroll_account
#: constraint:hr.payslip:0
msgid "Payslip 'Date From' must be before 'Date To'."
msgstr "給与明細書の「開始日付」は「終了日付」の前でなければいけません。"
msgstr "給与明細書の「開始日」は「終了日」の前でなければいけません。"
#. module: hr_payroll_account
#: help:hr.payslip,period_id:0
addons/hr_recruitment/hr_recruitment.py
+7 -6
View File
@@ -69,10 +69,16 @@ class hr_recruitment_stage(osv.osv):
'name': fields.char('Name', size=64, required=True, translate=True),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep tempy this field."),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16,
help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\
\nWhen the case is over, the state is set to \'Done\'.\
\nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
'requirements': fields.text('Requirements')
}
_defaults = {
'sequence': 1,
'state': 'draft',
}
hr_recruitment_stage()
@@ -144,11 +150,7 @@ class hr_applicant(crm.crm_case, osv.osv):
'create_date': fields.datetime('Creation Date', readonly=True, select=True),
'write_date': fields.datetime('Update Date', readonly=True),
'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\
\nWhen the case is over, the state is set to \'Done\'.\
\nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
'state': fields.related('stage_id','state', type='char', selection=AVAILABLE_STATES, string="State", store=True, readonly=True),
'company_id': fields.many2one('res.company', 'Company'),
'user_id': fields.many2one('res.users', 'Responsible'),
# Applicant Columns
@@ -169,7 +171,6 @@ class hr_applicant(crm.crm_case, osv.osv):
'partner_mobile': fields.char('Mobile', size=32),
'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
'department_id': fields.many2one('hr.department', 'Department'),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
'survey': fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
'response': fields.integer("Response"),
'reference': fields.char('Refered By', size=128),
addons/hr_recruitment/hr_recruitment_view.xml
+43 -20
View File
@@ -73,30 +73,42 @@
<field name="model">hr.applicant</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Jobs - Recruitment Form">
<group colspan="4" col="8">
<field name="name" string="Subject"/>
<form layout="manual">
<div class="oe_form_topbar">
<button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
<button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
<button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</div>
</div>
<sheet string="Jobs - Recruitment Form" layout="auto">
<group colspan="4" col="4">
<field name="name" string="Subject"/>
<group colspan="2" col="4">
<field name="partner_name"/>
<field name="job_id" on_change="onchange_job(job_id)"/>
<button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
<button string="Send New Email"
name="%(mail.action_email_compose_message_wizard)d"
icon="terp-mail-message-new" type="action"/>
<newline/>
<button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
</group>
<field name="user_id"/>
<field name="job_id" on_change="onchange_job(job_id)"/>
<field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
<group colspan="2" col="4">
<field name="stage_id" domain="['|',('department_id','=',department_id),('department_id','=',False)]"/>
<button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
<button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
</group>
<field name="user_id"/>
<field name="survey" invisible="1"/>
<button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
<button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
<field name="response" invisible="1"/>
<newline/>
<field name="date_action"/>
<field name="title_action"/>
<group colspan="2" col="8">
<field name="title_action"/>
<field name="survey" invisible="1"/>
<button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
<button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
<field name="response" invisible="1"/>
</group>
<newline/>
</group>
<notebook colspan="4">
<page string="Job Info">
@@ -126,12 +138,19 @@
<field name="source_id"/>
<field name="reference"/>
</group>
<separator colspan="4" string="Status"/>
<group col="8" colspan="4">
<group col="2" colspan="2">
<separator colspan="2" string="Dates"/>
<field name="create_date"/>
<field name="write_date"/>
<field name="date_closed"/>
<field name="date_open"/>
</group>
<separator colspan="4" string="Status" groups="base.group_no_one"/>
<group col="8" colspan="4" groups="base.group_no_one">
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
<button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
<button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel" />
<button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward" />
<button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
<button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
<button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
</group>
@@ -140,7 +159,10 @@
<field name="description" nolabel="1" colspan="4"/>
</page>
</notebook>
</sheet>
<div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</field>
</record>
@@ -368,6 +390,7 @@
<field name="name" select="1"/>
<field name="department_id" groups="base.group_extended"/>
<field name="sequence"/>
<field name="state"/>
</group>
<separator string="Requirements" colspan="4"/>
<field name="requirements" nolabel="1" colspan="4"/>
addons/hr_recruitment/i18n/ja.po
+7 -7
View File
@@ -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 01:37+0100\n"
"PO-Revision-Date: 2012-04-15 03:51+0000\n"
"PO-Revision-Date: 2012-04-17 18:35+0000\n"
"Last-Translator: Masaki Yamaya <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-04-16 04:41+0000\n"
"X-Generator: Launchpad (build 15099)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: hr_recruitment
#: help:hr.applicant,active:0
@@ -107,7 +107,7 @@ msgstr "この応募者のための業務を定義しなければいけません
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "Job"
msgstr "仕事"
msgstr "職務"
#. module: hr_recruitment
#: field:hr.recruitment.partner.create,close:0
@@ -401,7 +401,7 @@ msgstr "予定日"
#: view:hr.applicant:0 field:hr.applicant,priority:0
#: field:hr.recruitment.report,priority:0
msgid "Appreciation"
msgstr ""
msgstr "好意的評価"
#. module: hr_recruitment
#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
@@ -732,7 +732,7 @@ msgstr "件名なし"
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "Status"
msgstr ""
msgstr "状態"
#. module: hr_recruitment
#: view:hr.applicant:0
@@ -956,7 +956,7 @@ msgstr "主題 / 応募者"
#. module: hr_recruitment
#: help:hr.recruitment.degree,sequence:0
msgid "Gives the sequence order when displaying a list of degrees."
msgstr ""
msgstr "学位の一覧が表示されたら、順番を指定してください。"
#. module: hr_recruitment
#: view:hr.applicant:0 field:hr.applicant,user_id:0
addons/hr_recruitment/res_config_view.xml
-6
View File
@@ -7,12 +7,6 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<field name="module_hr_recruitment" position="after">
<group colspan="2">
<button name="%(hr_recruitment_stage_form_installer)d" string="Review Recruitment Stages"
type="action" icon="terp-stage"/>
</group>
</field>
<group name="config_recruitment" position="after">
<separator string="Recruitment" colspan="4"/>
<field name="module_document_ftp"/>
addons/hr_timesheet/i18n/ja.po
+11 -9
View File
@@ -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-04-14 00:48+0000\n"
"PO-Revision-Date: 2012-04-17 22:36+0000\n"
"Last-Translator: Masaki Yamaya <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-04-15 04:42+0000\n"
"X-Generator: Launchpad (build 15070)\n"
"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -33,7 +33,7 @@ msgstr "（現在、空白）"
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "No employee defined for your user !"
msgstr "従業員はユーザとして定義されていません。"
msgstr "このユーザには従業員が定義されていません。"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -254,17 +254,17 @@ msgstr "開始日"
#. module: hr_timesheet
#: view:hr.employee:0
msgid "Categories"
msgstr "分類"
msgstr "カテゴリ"
#. module: hr_timesheet
#: constraint:hr.analytic.timesheet:0
msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
msgstr "確認済みの勤務表のエントリーを変更することはできません。"
msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
#. module: hr_timesheet
#: help:hr.employee,product_id:0
msgid "Specifies employee's designation as a product with type 'service'."
msgstr "従業員の割振りを「サービス」という商品項目で指定する。"
msgstr "従業員の割当てを「サービス」という製品項目で指定する。"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -283,7 +283,7 @@ msgstr "9月"
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
msgid "Timesheet Line"
msgstr "タイムシートの行"
msgstr "勤務表の行"
#. module: hr_timesheet
#: field:hr.analytical.timesheet.users,employee_ids:0
@@ -527,7 +527,7 @@ msgstr "この機能で月間勤務表を印刷できます。"
#: view:hr.analytic.timesheet:0
#: field:hr.employee,product_id:0
msgid "Product"
msgstr "商品"
msgstr "製品"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -602,6 +602,8 @@ msgid ""
"No analytic account defined on the project.\n"
"Please set one or we can not automatically fill the timesheet."
msgstr ""
"このプロジェクトには分析アカウントが定義されていません。\n"
"これを設定しないと、勤務表を自動的に記録できません。"
#. module: hr_timesheet
#: view:account.analytic.account:0
addons/hr_timesheet_invoice/i18n/ja.po
+1147
View File
File diff suppressed because it is too large Load Diff
addons/hr_timesheet_sheet/i18n/ja.po
+1042
View File
File diff suppressed because it is too large Load Diff
addons/hr_timesheet_sheet/res_config_view.xml
-6
View File
@@ -7,12 +7,6 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<field name="module_hr_timesheet_sheet" position="after">
<group colspan="2">
<button name="%(hr_timesheet.action_define_analytic_structure)d" string="Create Your Timesheet Accounts"
type="action" icon="terp-folder-green"/>
</group>
</field>
<group name="config_timesheets" position="after">
<separator string="Timesheets" colspan="4"/>
<field name="timesheet_range"/>
addons/html_view/i18n/ja.po
+49
View File
@@ -0,0 +1,49 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
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-04-18 01:30+0000\n"
"Last-Translator: Masaki Yamaya <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-04-18 04:42+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: html_view
#: field:html.view,name:0
msgid "Name"
msgstr "氏名"
#. module: html_view
#: field:html.view,comp_id:0
msgid "Company"
msgstr "会社"
#. module: html_view
#: model:ir.actions.act_window,name:html_view.action_html_view_form
#: model:ir.ui.menu,name:html_view.html_form
msgid "Html Test"
msgstr "HTMLテスト"
#. module: html_view
#: view:html.view:0
msgid "Html Example"
msgstr "HTML例"
#. module: html_view
#: field:html.view,bank_ids:0
msgid "Banks"
msgstr "銀行"
#. module: html_view
#: model:ir.model,name:html_view.model_html_view
msgid "html.view"
msgstr "HTMLビュー"
addons/import_sugarcrm/i18n/fr.po
+404
View File
@@ -0,0 +1,404 @@
# French translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
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-04-17 13:55+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: French <fr@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-04-18 04:42+0000\n"
"X-Generator: Launchpad (build 15108)\n"
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
#, python-format
msgid "Error !!"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid ""
"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "(Coming Soon)"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,document:0
msgid "Documents"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Import your data from SugarCRM :"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid ""
"Choose data you want to import. Click 'Import' to get data manually or "
"'Schedule Reccurent Imports' to get recurrently and automatically data."
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,contact:0
msgid "Contacts"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "HR"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,bug:0
msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,instance_name:0
msgid "Instance's Name"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,project_task:0
msgid "Project Tasks"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,email_from:0
msgid "Notify End Of Import To:"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,user:0
msgid ""
"Check this box to import sugarCRM Users into OpenERP users, warning if a "
"user with the same login exist in OpenERP, user information will be erase by "
"sugarCRM user information"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/sugarsoap_services.py:23
#, python-format
msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "_Schedule Recurrent Imports"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid ""
"Do not forget the email address to be notified of the success of the import."
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,call:0
msgid "Check this box to import sugarCRM Calls into OpenERP calls"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid ""
"If you make recurrent or ponctual import, data already in OpenERP will be "
"updated by SugarCRM data."
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,employee:0
msgid "Employee"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Document"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,document:0
msgid "Check this box to import sugarCRM Documents into OpenERP documents"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Import Data From SugarCRM"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "CRM"
msgstr ""
#. module: import_sugarcrm
#: view:import.message:0
msgid ""
"Data are importing, the process is running in the background, an email will "
"be sent to the given email address if it was defined."
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,call:0
msgid "Calls"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Multi Instance Management"
msgstr ""
#. module: import_sugarcrm
#: view:import.message:0
msgid "_Ok"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,opportunity:0
msgid ""
"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
"and Opportunities"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,email_history:0
msgid "Email and Note"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,url:0
msgid ""
"Webservice's url where to get the data. example : "
"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
"application "
"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
msgstr ""
#. module: import_sugarcrm
#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
msgid "Import SugarCRM"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "_Import"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,user:0
msgid "User"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
#, python-format
msgid "%s data required %s Module to be installed, Please install %s module"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,claim:0
msgid "Cases"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,meeting:0
msgid ""
"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,email_history:0
msgid ""
"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
"Messages and Attachments"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,project:0
msgid "Projects"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
#, python-format
msgid ""
"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
"http://pypi.python.org/pypi/ZSI/"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,project:0
msgid "Check this box to import sugarCRM Projects into OpenERP projects"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
#, python-format
msgid "Select Module to Import."
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,meeting:0
msgid "Meetings"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,employee:0
msgid "Check this box to import sugarCRM Employees into OpenERP employees"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,url:0
msgid "SugarSoap Api url:"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Address Book"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/sugar.py:60
#, python-format
msgid ""
"Authentication error !\n"
"Bad Username or Password bad SugarSoap Api url !"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,bug:0
msgid "Bugs"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Project"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,project_task:0
msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,opportunity:0
msgid "Leads & Opp"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:79
#, python-format
msgid ""
"Authentication error !\n"
"Bad Username or Password or bad SugarSoap Api url !"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:79
#: code:addons/import_sugarcrm/sugar.py:60
#, python-format
msgid "Error !"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
#, python-format
msgid "Warning !"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,instance_name:0
msgid ""
"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
"from different server."
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,contact:0
msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,password:0
msgid "Password"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Login Information"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,claim:0
msgid "Check this box to import sugarCRM Cases into OpenERP claims"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Email Notification When Import is finished"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,username:0
msgid "User Name"
msgstr ""
#. module: import_sugarcrm
#: view:import.message:0
#: model:ir.model,name:import_sugarcrm.model_import_message
msgid "Import Message"
msgstr ""
#. module: import_sugarcrm
#: help:import.sugarcrm,account:0
msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Online documentation:"
msgstr ""
#. module: import_sugarcrm
#: field:import.sugarcrm,account:0
msgid "Accounts"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "_Cancel"
msgstr ""
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/sugarsoap_services.py:23
#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
#, python-format
msgid "ZSI Import Error!"
msgstr ""
#. module: import_sugarcrm
#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
msgid "Import SugarCRM DATA"
msgstr ""
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Email Address to Notify"
msgstr ""
addons/mail/__openerp__.py
+1
View File
@@ -66,6 +66,7 @@ The main features are:
'security/mail_security.xml',
'security/ir.model.access.csv',
'mail_data.xml',
'mail_group_data.xml',
'res_users_view.xml',
],
'installable': True,
addons/mail/mail_data.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
<record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
<field name="name">Email Queue Manager</field>
<field name="user_id" ref="base.user_root"/>
<field name="interval_number">1</field>
addons/mail/mail_group_data.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="mail.group" id="group_all_company">
<field name="name">All Company</field>
</record>
<record model="mail.group" id="group_sales">
<field name="name">Sales</field>
</record>
</data>
</openerp>
addons/mail/mail_group_view.xml
+1 -1
View File
@@ -112,6 +112,6 @@
</record>
<!-- left-side menu: Groups !-->
<menuitem id="mail_allgroups" name="All groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
<menuitem id="mail_allgroups" name="All Groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
</data>
</openerp>
addons/mail/mail_message_view.xml
+1 -1
View File
@@ -234,7 +234,7 @@
<menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/>
<record id="action_mail_all_feeds" model="ir.actions.client">
<field name="name">All Feeds</field>
<field name="name">Wall</field>
<field name="tag">mail.all_feeds</field>
<field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
</record>
addons/mail/mail_thread_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<!-- left-side menu: Feeds !-->
<menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
<record id="mail_wallfeeds" model="ir.ui.menu">
<field name="name">All Feeds</field>
<field name="name">Wall</field>
<field name="sequence" eval="10"/>
<field name="action" ref="action_mail_all_feeds"/>
<field name="parent_id" ref="mail_feeds"/>
addons/mail/security/ir.model.access.csv
+5 -4
View File
@@ -1,7 +1,8 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_mail_message,mail.message,model_mail_message,base.group_user,1,1,1,1
access_mail_message,mail.message,model_mail_message,,1,0,1,0
access_mail_message_all,mail.message.all,model_mail_message,base.group_user,1,1,1,1
access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
access_mail_subscription,mail.subscription,model_mail_subscription,base.group_user,1,1,1,1
access_mail_notification,mail.notification,model_mail_notification,base.group_user,1,1,1,1
access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
access_mail_message_report,mail.message.report,model_mail_message_report,base.group_user,1,0,0,0
access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_mail_message mail.message model_mail_message base.group_user 1 1 0 1 1 0
3 access_mail_message_all mail.message.all model_mail_message base.group_user 1 1 1 1
4 access_mail_thread mail.thread model_mail_thread base.group_user 1 1 1 0
5 access_mail_subscription mail.subscription model_mail_subscription base.group_user 1 1 1 1
6 access_mail_notification mail.notification model_mail_notification base.group_user 1 1 1 1
7 access_mail_group mail.group model_mail_group base.group_user 1 1 1 1
8 access_mail_message_report mail.message.report model_mail_message_report base.group_user 1 0 0 0
addons/mail/static/src/css/mail.css
+52 -21
View File
@@ -4,17 +4,23 @@
div.oe_mail_wall {
overflow: auto;
padding: 5px;
padding: 0;
background: white;
}
div.oe_mail_wall_search {
width: 55%;
/*div.oe_mail_wall_search {*/
/*width: 550px;*/
/*}*/
.oe_mail_wall_button_comment {
float: right;
}
/* 2 columns view */
div.oe_mail_wall_left {
float: left;
width: 65%;
width: 560px;
margin: 8px;
}
div.oe_mail_wall_right {
@@ -22,6 +28,10 @@ div.oe_mail_wall_right {
width: 34%;
}
.oe_mail_wall_threads {
margin-top: 8px;
}
.oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
height: 20px;
padding: 2px;
@@ -47,16 +57,15 @@ div.oe_mail_wall_more {
.oe_mail_recthread {
overflow: auto;
padding: 5px 5px 5px 5px;
}
/* Left-side CSS */
.oe_mail_recthread_actions {
margin-bottom: 10px;
margin-bottom: 8px;
}
.oe_mail_recthread_followers {
margin-bottom: 10px;
margin-bottom: 8px;
}
.oe_mail_followers_action, .oe_mail_followers_display {
@@ -70,21 +79,16 @@ div.oe_mail_wall_more {
.oe_mail_recthread_right {
float: right;
width: 25%;
margin-right: 5%;
width: 240px;
}
.oe_mail_button_follow, .oe_mail_button_unfollow {
width: 120px;
/*width: 120px;*/
}
.oe_mail_button_followers {
display: inline;
width: 120px;
}
.oe_mail_followers h4 {
margin: 0 0 8px;
display: inline-block;
width: 240px;
}
/* ------------------------------ */
@@ -99,7 +103,7 @@ div.oe_mail_thread_act {
div.oe_mail_thread_display {
white-space: normal;
margin-bottom: 5px;
/*margin-bottom: 5px;*/
}
div.oe_mail_thread_subthread {
@@ -116,8 +120,7 @@ li.oe_mail_thread_msg {
padding: 1px;
}
.notification, .email {
background: #E0E0E0;
.notification, .comment {
padding: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -126,8 +129,16 @@ li.oe_mail_thread_msg {
border-radius: 4px;
}
.comment {
padding: 4px;
.oe_mail_thread_msg > .comment {
background: #eee;
}
.oe_mail_thread_subthread .comment {
background: white;
}
.notification {
background: #eee;
}
.notification:after, .email:after, .comment:after {
@@ -215,6 +226,14 @@ input.oe_mail, textarea.oe_mail {
border-radius: 3px;
}
.oe_mail_wall .oe_mail_wall_act textarea {
width: 550px;
}
textarea.oe_mail {
height: 60px;
}
input.oe_mail:focus, textarea.oe_mail:focus {
outline: 0;
border-color: rgba(82, 168, 236, 0.8);
@@ -246,6 +265,10 @@ p.oe_mail_msg {
font-weight: bold;
}
.oe_mail_msg_reply, .oe_mail_msg_delete {
margin-right: 4px;
}
a.oe_mail_oe_intlink {
color: #8786b7;
}
@@ -257,3 +280,11 @@ a.oe_mail_oe_intlink {
.oe_mail_oe_space {
margin-left: 15px;
}
.oe_mail_recthread_actions button {
width: 120px;
}
addons/mail/static/src/img/groupdefault.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

addons/mail/static/src/xml/mail.xml
+23 -6
View File
@@ -2,13 +2,17 @@
<template>
<div t-name="Wall" class="oe_mail_wall">
<div class="oe_mail_wall_search">
<div class="oe_view_manager_header">
<div class="oe_view_manager_row">
<h2 class="oe_view_title">All Feeds</h2>
</div>
</div>
<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..."/><br />
<textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
<button class="oe_mail_wall_button_comment" type="button">Post comment</button>
</div>
<div class="oe_clear"></div>
<div class="oe_mail_wall_threads">
</div>
<div class="oe_mail_wall_more">
@@ -28,7 +32,7 @@
<div class="oe_mail_recthread_right">
<div class="oe_mail_recthread_actions">
<button type="button" class="oe_mail_button_follow">Not following</button>
<button type="button" class="oe_mail_button_unfollow">Following</button>
<button type="button" class="oe_mail_button_unfollow following">Following</button>
<button type="button" class="oe_mail_button_followers">Display followers</button>
</div>
<div class="oe_mail_recthread_followers">
@@ -65,7 +69,9 @@
<t t-name="NoteDisplay">
<p class="oe_mail_msg">
<a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
<t t-if="params.thread_level > 0">
<a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
</t>
<span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
<t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
<br />
@@ -73,9 +79,9 @@
<a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
on <t t-raw="record.date"/>
</span>
<t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t>
<t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
<t t-if="display['show_delete']">
<t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t>
<t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
</t>
<t t-if="display['show_hide']">
<t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
@@ -85,6 +91,10 @@
<t t-name="EmailDisplay">
<p class="oe_mail_msg oe_mail_msg_p_email_header">
<t t-if="params.thread_level > 0">
<a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
</t>
<br />
<span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
<span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
<span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
@@ -92,6 +102,13 @@
<p class="oe_mail_msg">
<span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
<t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
<br />
<t t-if="display['show_delete']">
<t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
</t>
<t t-if="display['show_hide']">
<t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
</t>
</p>
</t>
addons/mrp/board_manufacturing_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Manufacturing board">
<form string="Manufacturing board" layout="manual">
<board style="2-1">
<column>
<action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
addons/mrp/res_config_view.xml
+17 -16
View File
@@ -6,24 +6,25 @@
<field name="model">mrp.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Manufacturing">
<separator string="Manufacturing Order" colspan="4"/>
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
<form string="Configure Manufacturing" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Manufacturing Order" colspan="4"/>
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
<newline/>
<label colspan="2"/>
<button string="Cancel" icon="gtk-cancel" special="cancel"/>
<button string="Apply" icon="gtk-apply" type="object" name="execute"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
</sheet>
</form>
</field>
</record>
addons/point_of_sale/static/src/js/pos.js
+107 -83
View File
@@ -34,72 +34,90 @@ openerp.point_of_sale = function(db) {
};
};
var _t = db.web._t;
/*
Local store access. Read once from localStorage upon construction and persist on every change.
There should only be one store active at any given time to ensure data consistency.
*/
var Store = db.web.Class.extend({
init: function() {
this.data = {};
var DAOInterface = {
add_operation: function(operation) {},
remove_operation: function(id) {},
get_operations: function() {},
};
var LocalStorageDAO = db.web.Class.extend({
add_operation: function(operation) {
var self = this;
return $.async_when().pipe(function() {
var tmp = self._get('oe_pos_operations', []);
var last_id = self._get('oe_pos_operations_sequence', 1);
tmp.push({'id': last_id, 'data': operation});
self._set('oe_pos_operations', tmp);
self._set('oe_pos_operations_sequence', last_id + 1);
});
},
get: function(key, _default) {
if (this.data[key] === undefined) {
var stored = localStorage['oe_pos_' + key];
if (stored)
this.data[key] = JSON.parse(stored);
else
return _default;
}
return this.data[key];
remove_operation: function(id) {
var self = this;
return $.async_when().pipe(function() {
var tmp = self._get('oe_pos_operations', []);
tmp = _.filter(tmp, function(el) {
return el.id !== id;
});
self._set('oe_pos_operations', tmp);
});
},
set: function(key, value) {
this.data[key] = value;
localStorage['oe_pos_' + key] = JSON.stringify(value);
get_operations: function() {
var self = this;
return $.async_when().pipe(function() {
return self._get('oe_pos_operations', []);
});
},
_get: function(key, default_) {
var txt = localStorage[key];
if (! txt)
return default_;
return JSON.parse(txt);
},
_set: function(key, value) {
localStorage[key] = JSON.stringify(value);
},
});
var fetch = function(osvModel, fields, domain) {
var dataSetSearch;
dataSetSearch = new db.web.DataSetSearch(null, osvModel, {}, domain);
return dataSetSearch.read_slice(fields, 0);
};
/*
Gets all the necessary data from the OpenERP web client (session, shop data etc.)
*/
var Pos = Backbone.Model.extend({
initialize: function(session, attributes) {
Backbone.Model.prototype.initialize.call(this, attributes);
this.store = new Store();
this.dao = new LocalStorageDAO();
this.ready = $.Deferred();
this.flush_mutex = new $.Mutex();
this.build_tree = _.bind(this.build_tree, this);
this.session = session;
var attributes = {
'pending_operations': [],
this.set({'nbr_pending_operations': 0,
'currency': {symbol: '$', position: 'after'},
'shop': {},
'company': {},
'user': {},
};
_.each(attributes, _.bind(function(def, attr) {
var to_set = {};
to_set[attr] = this.store.get(attr, def);
this.set(to_set);
this.bind('change:' + attr, _.bind(function(unused, val) {
this.store.set(attr, val);
}, this));
}, this));
$.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'product_image_small'], [['pos_categ_id', '!=', 'false']]),
this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
[['state', '=', 'open'], ['user_id', '=', this.session.uid]]),
this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']),
this.fetch('account.tax', ['amount', 'price_include', 'type']),
this.get_app_data())
.pipe(_.bind(this.build_tree, this));
},
fetch: function(osvModel, fields, domain) {
var dataSetSearch;
'user': {}});
var self = this;
dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain);
return dataSetSearch.read_slice(fields, 0).then(function(result) {
return self.store.set(osvModel, result);
var cat_def = fetch('pos.category', ['name', 'parent_id', 'child_id']).pipe(function(result) {
return self.set({'categories': result});
});
var prod_def = fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id',
'product_image_small'], [['pos_categ_id', '!=', 'false']]).then(function(result) {
return self.set({'product_list': result});
});
var bank_def = fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
[['state', '=', 'open'], ['user_id', '=', this.session.uid]]).then(function(result) {
return self.set({'bank_statements': result});
});
var tax_def = fetch('account.tax', ['amount', 'price_include', 'type']).then(function(result) {
return self.set({'taxes': result});
});
$.when(cat_def, prod_def, bank_def, tax_def, this.get_app_data(), this.flush())
.pipe(_.bind(this.build_tree, this));
},
get_app_data: function() {
var self = this;
@@ -120,10 +138,10 @@ openerp.point_of_sale = function(db) {
}));
},
pushOrder: function(record) {
var ops = _.clone(this.get('pending_operations'));
ops.push(record);
this.set({pending_operations: ops});
return this.flush();
var self = this;
return this.dao.add_operation(record).pipe(function() {
return self.flush();
});
},
flush: function() {
return this.flush_mutex.exec(_.bind(function() {
@@ -131,26 +149,32 @@ openerp.point_of_sale = function(db) {
}, this));
},
_int_flush : function() {
var ops = this.get('pending_operations');
if (ops.length === 0)
return $.when();
var op = ops[0];
/* we prevent the default error handler and assume errors
* are a normal use case, except we stop the current iteration
*/
return new db.web.Model("pos.order").get_func("create_from_ui")([op]).fail(function(unused, event) {
event.preventDefault();
}).pipe(_.bind(function() {
console.debug('saved 1 record');
var ops2 = this.get('pending_operations');
this.set({'pending_operations': _.without(ops2, op)});
return this._int_flush();
}, this), function() {return $.when()});
var self = this;
this.dao.get_operations().pipe(function(ops) {
self.set({"nbr_pending_operations": ops.length});
if (ops.length === 0)
return $.when();
var op = ops[0].data;
var op_id = ops[0].id;
/* we prevent the default error handler and assume errors
* are a normal use case, except we stop the current iteration
*/
return new db.web.Model("pos.order").get_func("create_from_ui")([op]).fail(function(unused, event) {
event.preventDefault();
}).pipe(function() {
console.debug('saved 1 record');
self.dao.remove_operation(op_id).pipe(function() {
return self._int_flush();
});
}, function() {
return $.when();
});
});
},
categories: {},
build_tree: function() {
var c, id, _i, _len, _ref, _ref2;
_ref = this.store.get('pos.category');
_ref = this.get('categories');
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
c = _ref[_i];
this.categories[c.id] = {
@@ -173,7 +197,7 @@ openerp.point_of_sale = function(db) {
ancestors: [],
children: (function() {
var _j, _len2, _ref3, _results;
_ref3 = this.store.get('pos.category');
_ref3 = this.get('categories');
_results = [];
for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
c = _ref3[_j];
@@ -185,7 +209,7 @@ openerp.point_of_sale = function(db) {
}).call(this),
subtree: (function() {
var _j, _len2, _ref3, _results;
_ref3 = this.store.get('pos.category');
_ref3 = this.get('categories');
_results = [];
for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
c = _ref3[_j];
@@ -313,10 +337,10 @@ openerp.point_of_sale = function(db) {
var totalTax = base;
var totalNoTax = base;
var products = pos.store.get('product.product');
var product = _.detect(products, function(el) {return el.id === self.get('id');});
var product_list = pos.get('product_list');
var product = _.detect(product_list, function(el) {return el.id === self.get('id');});
var taxes_ids = product.taxes_id;
var taxes = pos.store.get('account.tax');
var taxes = pos.get('taxes');
var taxtotal = 0;
_.each(taxes_ids, function(el) {
var tax = _.detect(taxes, function(t) {return t.id === el;});
@@ -530,7 +554,7 @@ openerp.point_of_sale = function(db) {
products: new ProductCollection()
});
this.set({
cashRegisters: new CashRegisterCollection(pos.store.get('account.bank.statement')),
cashRegisters: new CashRegisterCollection(pos.get('bank_statements')),
});
return (this.get('orders')).bind('remove', _.bind( function(removedOrder) {
if ((this.get('orders')).isEmpty()) {
@@ -1244,7 +1268,7 @@ openerp.point_of_sale = function(db) {
this.category();
};
App.prototype.category = function(id) {
var c, products;
var c, product_list;
if (id == null) {
id = 0;
}
@@ -1253,28 +1277,28 @@ openerp.point_of_sale = function(db) {
this.categoryView.children = c.children;
this.categoryView.renderElement();
this.categoryView.start();
products = pos.store.get('product.product').filter( function(p) {
product_list = pos.get('product_list').filter( function(p) {
var _ref;
return _ref = p.pos_categ_id[0], _.indexOf(c.subtree, _ref) >= 0;
});
(this.shop.get('products')).reset(products);
(this.shop.get('products')).reset(product_list);
var self = this;
$('.searchbox input').keyup(function() {
var m, s;
s = $(this).val().toLowerCase();
if (s) {
m = products.filter( function(p) {
m = product_list.filter( function(p) {
return p.name.toLowerCase().indexOf(s) != -1;
});
$('.search-clear').fadeIn();
} else {
m = products;
m = product_list;
$('.search-clear').fadeOut();
}
return (self.shop.get('products')).reset(m);
});
return $('.search-clear').click( function() {
(self.shop.get('products')).reset(products);
(self.shop.get('products')).reset(product_list);
$('.searchbox input').val('').focus();
return $('.search-clear').fadeOut();
});
@@ -1317,7 +1341,7 @@ openerp.point_of_sale = function(db) {
this.synch_notification.replace($('.oe_pos_synch-notification', this.$element));
this.synch_notification.on_synch.add(_.bind(pos.flush, pos));
pos.bind('change:pending_operations', this.changed_pending_operations, this);
pos.bind('change:nbr_pending_operations', this.changed_pending_operations, this);
this.changed_pending_operations();
this.$element.find("#loggedas button").click(function() {
@@ -1327,7 +1351,7 @@ openerp.point_of_sale = function(db) {
pos.app = new App(self.$element);
db.webclient.set_content_full_screen(true);
if (pos.store.get('account.bank.statement').length === 0)
if (pos.get('bank_statements').length === 0)
return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_open_statement']], ['res_id']).pipe(
_.bind(function(res) {
return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
@@ -1341,12 +1365,12 @@ openerp.point_of_sale = function(db) {
return qweb_template("PointOfSale")();
},
changed_pending_operations: function () {
this.synch_notification.on_change_nbr_pending(pos.get('pending_operations').length);
this.synch_notification.on_change_nbr_pending(pos.get('nbr_pending_operations'));
},
try_close: function() {
pos.flush().then(_.bind(function() {
var close = _.bind(this.close, this);
if (pos.get('pending_operations').length > 0) {
if (pos.get('nbr_pending_operations') > 0) {
var confirm = false;
$(QWeb.render('pos-close-warning')).dialog({
resizable: false,
addons/project/board_project_view.xml
+1 -1
View File
@@ -80,7 +80,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="My Board">
<form string="My Board" layout="manual">
<board style="2-1">
<column>
<action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
addons/project/project_view.xml
+36 -30
View File
@@ -18,7 +18,20 @@
<field name="model">project.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Project">
<form string="Project" layout="manual">
<div class="oe_form_topbar">
<button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
<button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
<button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
<button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
<button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
<button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
<button string="New Project Based on Template" name="duplicate_template" type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
</div>
</div>
<sheet string="Project" layout="auto">
<group colspan="6" col="6">
<field name="name" string="Project Name" select="1"/>
<field name="analytic_account_id" invisible="1" required="0"/>
@@ -43,21 +56,6 @@
<field name="priority"/>
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
</group>
<newline/>
<separator colspan="4"/>
<group col="9" colspan="8">
<field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
<button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
<button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
<button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
<button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
<button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
<button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
<button
string="New Project Based on Template"
name="duplicate_template" type="object"
states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
</group>
</page>
<page string="Members">
<field colspan="4" name="members" nolabel="1">
@@ -96,7 +94,10 @@
</page>
</notebook>
<newline/>
</sheet>
<div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</field>
</record>
@@ -221,7 +222,20 @@
<field name="type">form</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<form string="Task edition">
<form string="Project" layout="manual">
<div class="oe_form_topbar">
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
<button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
<button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
</div>
</div>
<sheet string="Task edition" layout="auto">
<group colspan="6" col="6">
<field name="name" select="1"/>
<field name="project_id" select="1" on_change="onchange_project(project_id)"/>
@@ -247,7 +261,7 @@
<button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
</group>
<field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
<field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
<field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
<tree string="Task Work" editable="top">
<field name="name" />
@@ -256,17 +270,6 @@
<field name="date" />
</tree>
</field>
<newline/>
<group col="11" colspan="4">
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
<button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
<button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
<button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
</group>
</page>
<page groups="base.group_extended" string="Delegations History">
<separator string="Parent Tasks" colspan="4"/>
@@ -305,7 +308,10 @@
<field colspan="4" name="notes" nolabel="1"/>
</page>
</notebook>
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</sheet>
<div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</field>
</record>
addons/project/res_config_view.xml
+17 -16
View File
@@ -7,24 +7,25 @@
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Configure Project">
<separator string="Project" colspan="4"/>
<field name="module_project_mrp"/>
<field name="module_project_timesheet"/>
<field name="module_pad"/>
<form string="Configure Project" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Project" colspan="4"/>
<field name="module_project_mrp"/>
<field name="module_project_timesheet"/>
<field name="module_pad"/>
<separator string="Planning" colspan="4"/>
<field name="module_project_long_term"/>
<separator string="Planning" colspan="4"/>
<field name="module_project_long_term"/>
<separator string="Helpdesk and support" colspan="4"/>
<field name="module_project_issue"/>
<field name="module_project_issue_sheet"/>
<group name="support" colspan="4"/>
<newline/>
<label colspan="2"/>
<button string="Cancel" icon="gtk-cancel" special="cancel"/>
<button string="Apply" icon="gtk-apply" type="object" name="execute"/>
<separator string="Helpdesk and support" colspan="4"/>
<field name="module_project_issue"/>
<field name="module_project_issue_sheet"/>
<group name="support" colspan="4"/>
</sheet>
</form>
</field>
</record>
addons/project_issue/board_project_issue_view.xml
+1 -1
View File
@@ -56,7 +56,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Issues Dashboard">
<form string="Issues Dashboard" layout="manual">
<board style="2-1">
<column>
<action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
addons/project_mailgate/project_mailgate_view.xml
+21 -21
View File
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_task_mailgate_form" model="ir.ui.view">
<field name="name">task.mailgate.form</field>
<field name="model">project.task</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Extra Info']" position="before">
<page string="History">
<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
<tree string="History">
<field name="display_text" string="History Information"/>
</tree>
</field>
</page>
</xpath>
</field>
</record>
</data>
</openerp>
<openerp>
<data>
<record id="view_task_mailgate_form" model="ir.ui.view">
<field name="name">task.mailgate.form</field>
<field name="model">project.task</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<xpath expr="//notebook/page[@string='Extra Info']" position="before">
<page string="History">
<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
<tree string="History">
<field name="display_text" string="History Information"/>
</tree>
</field>
</page>
</xpath>
</field>
</record>
</data>
</openerp>
addons/project_mrp/project_mrp_view.xml
+6 -8
View File
@@ -12,8 +12,7 @@
</field>
</field>
</record>
<record id="view_product_task_form" model="ir.ui.view">
<record id="view_product_task_form" model="ir.ui.view">
<field name="name">product.form.view.inherit</field>
<field name="model">product.product</field>
<field name="type">form</field>
@@ -24,18 +23,17 @@
</field>
</field>
</record>
<record id="view_project_mrp_inherit_form2" model="ir.ui.view">
<record id="view_project_mrp_inherit_form2" model="ir.ui.view">
<field name="name">project.mrp.form.view.inherit</field>
<field name="model">project.task</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
<xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
<field name="sale_line_id"/>
</xpath>
</xpath>
</field>
</record>
</record>
</data>
</openerp>
addons/project_scrum/board_project_scrum_view.xml
+1 -1
View File
@@ -75,7 +75,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="My Board">
<form string="My Board" layout="manual">
<board style="2-1">
<column>
<action name="%(action_sprint_all_dashboard_tree)d" string="Sprints"/>
addons/project_scrum/project_scrum_view.xml
+4 -4
View File
@@ -545,9 +545,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<xpath expr="/form/group/field[@name='progress']" position="after">
<field name="progress" position="after">
<field domain="[('project_id','=',project_id),]" name="product_backlog_id" select="1"/>
</xpath>
</field>
</field>
</record>
@@ -557,9 +557,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Extra Info']/group/field[@name='sequence']" position="after">
<field name="sequence" position="after">
<field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" readonly="1"/>
</xpath>
</field>
</field>
</record>
addons/purchase/board_purchase_view.xml
+1 -1
View File
@@ -88,7 +88,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Purchase Dashboard">
<form string="Purchase Dashboard" layout="manual">
<board style="2-1">
<column>
<action name="%(purchase_draft)d" string="Request for Quotations" creatable="true"/>
addons/purchase/res_config_view.xml
+18 -17
View File
@@ -6,25 +6,26 @@
<field name="model">purchase.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Purchases">
<separator string="Invoicing" colspan="4"/>
<field name="default_invoice_method" />
<form string="Configure Purchases" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Invoicing" colspan="4"/>
<field name="default_invoice_method" />
<separator string="Purchase Order" colspan="4"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
<field name="module_purchase_double_validation"/>
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
<separator string="Purchase Order" colspan="4"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
<field name="module_purchase_double_validation"/>
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
<separator string="Products" colspan="4"/>
<field name="module_product_manufacturer"/>
<newline/>
<label colspan="2"/>
<button string="Cancel" icon="gtk-cancel" special="cancel"/>
<button string="Apply" icon="gtk-apply" type="object" name="execute"/>
<separator string="Products" colspan="4"/>
<field name="module_product_manufacturer"/>
</sheet>
</form>
</field>
</record>
addons/sale/board_sale_view.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sales Manager Dashboard">
<form string="Sales Manager Dashboard" layout="manual">
<board style="2-1">
<column>
<action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
@@ -99,7 +99,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sales Dashboard">
<form string="Sales Dashboard" layout="manual">
<board style="2-1">
<column>
<action name="%(action_quotation_for_sale)d"
addons/sale/sale_view.xml
+38 -28
View File
@@ -2,7 +2,7 @@
<data>
<menuitem icon="terp-partner"
id="base.menu_base_partner" name="Sales"
sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
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"/>
@@ -96,8 +96,27 @@
<field name="model">sale.order</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sales Order">
<group col="6" colspan="4">
<form layout="manual">
<div class="oe_form_topbar">
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
<button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
<button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
<button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
<button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
<button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
<button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
<button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
<button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
</div>
</div>
<sheet string="Sales Order" layout="auto">
<group col="6" colspan="4" class="oe_form_header">
<group col="4" colspan="4">
<field name="name"/>
<field name="date_order"/>
@@ -187,30 +206,18 @@
<field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
</tree>
</field>
<newline/>
<group col="13" colspan="10">
<field name="amount_untaxed" sum="Untaxed amount"/>
<field name="amount_tax"/>
<field name="amount_total"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
<button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
</group>
<group col="17" colspan="4">
<field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
<button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
<button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
<button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
<button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
<button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
<button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
<button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
<button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
</group>
<div class="oe_right">
<group col="2">
<field name="amount_untaxed" sum="Untaxed amount"/>
<field name="amount_tax"/>
<field name="amount_total"/>
</group>
</div>
<div class="oe_clear"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="Other Information">
<group colspan="2" col="2" groups="base.group_extended" name="logistics">
@@ -241,7 +248,10 @@
<field colspan="4" name="picking_ids" nolabel="1"/>
</page>
</notebook>
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</sheet>
<div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</field>
</record>
addons/sale_layout/sale_layout_view.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<field name="priority">1000</field>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
<xpath expr="//field[@name='order_line']" position="replace">
<field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
<form string="Order Line">
<notebook>
addons/share/wizard/share_wizard.py
+5 -1
View File
@@ -189,7 +189,7 @@ class share_wizard(osv.osv_memory):
'invite': False,
'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
'access_mode': 'readonly',
'access_mode': 'readwrite',
'embed_option_title': True,
'embed_option_search': True,
}
@@ -502,6 +502,8 @@ class share_wizard(osv.osv_memory):
# Create required rights if allowed by current user rights and not
# already granted
for dummy, model in fields_relations:
# mail.message is transversal: it should not received directly the access rights
if model.model in ['mail.message']: continue
values = {
'name': _('Copied access for sharing'),
'group_id': group_id,
@@ -632,6 +634,8 @@ class share_wizard(osv.osv_memory):
domain = safe_eval(wizard_data.domain)
if domain:
for rel_field, model in fields_relations:
# mail.message is transversal: it should not received directly the access rights
if model.model in ['mail.message']: continue
related_domain = []
if not rel_field: continue
for element in domain:
addons/stock/board_warehouse_view.xml
+1 -1
View File
@@ -44,7 +44,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Warehouse board">
<form string="Warehouse board" layout="manual">
<board style="2-1">
<column>
<action name="%(action_incoming_product_board)d" string="Incoming Shipments" creatable="true"/>
addons/stock/res_config_view.xml
+25 -24
View File
@@ -7,33 +7,34 @@
<field name="model">stock.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string ="Configure Warehouse">
<separator string="Traceability" colspan="4"/>
<field name="group_stock_production_lot"/>
<field name="module_product_expiry"
attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
<newline/>
<field name="group_stock_tracking_lot"/>
<form string ="Configure Warehouse" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Traceability" colspan="4"/>
<field name="group_stock_production_lot"/>
<field name="module_product_expiry"
attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
<newline/>
<field name="group_stock_tracking_lot"/>
<separator string="Logistics" colspan="4"/>
<field name="group_stock_multiple_locations"/>
<field name="module_stock_no_autopicking"/>
<field name="module_stock_location"/>
<field name="module_stock_invoice_directly"/>
<separator string="Logistics" colspan="4"/>
<field name="group_stock_multiple_locations"/>
<field name="module_stock_no_autopicking"/>
<field name="module_stock_location"/>
<field name="module_stock_invoice_directly"/>
<separator string="Products" colspan="4"/>
<field name="group_stock_packaging"/>
<field name="group_stock_inventory_valuation"/>
<field name="group_uom"/>
<field name="group_uos"/>
<separator string="Products" colspan="4"/>
<field name="group_stock_packaging"/>
<field name="group_stock_inventory_valuation"/>
<field name="group_uom"/>
<field name="group_uos"/>
<separator string="Partners" colspan="4"/>
<field name="module_claim_from_delivery"/>
<newline/>
<label colspan="2"/>
<button string="Cancel" icon="gtk-cancel" special="cancel"/>
<button string="Apply" icon="gtk-apply" type="object" name="execute"/>
<separator string="Partners" colspan="4"/>
<field name="module_claim_from_delivery"/>
</sheet>
</form>
</field>
</record>
addons/wiki/static/src/js/wiki.js
+3 -4
View File
@@ -1,8 +1,6 @@
openerp.wiki = function (openerp) {
openerp.web.form.widgets.add(
'text_wiki', 'openerp.web.form.FieldText');
openerp.web.page.readonly.add(
'text_wiki', 'openerp.wiki.FieldWikiReadonly');
openerp.web.form.widgets.add( 'text_wiki', 'openerp.web.form.FieldText');
/*
openerp.wiki = {};
openerp.wiki.FieldWikiReadonly = openerp.web.page.FieldCharReadonly.extend({
set_value: function (value) {
@@ -11,4 +9,5 @@ openerp.wiki = function (openerp) {
return show_value;
}
});
*/
};