diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml index d0ff56924e9..be1776497b3 100644 --- a/addons/account/wizard/account_automatic_reconcile_view.xml +++ b/addons/account/wizard/account_automatic_reconcile_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -26,6 +21,11 @@ + diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml index 322c33aec76..7e33e61eec8 100644 --- a/addons/account/wizard/account_change_currency_view.xml +++ b/addons/account/wizard/account_change_currency_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml index 83c49fe665a..d7820caa647 100644 --- a/addons/account/wizard/account_chart_view.xml +++ b/addons/account/wizard/account_chart_view.xml @@ -7,11 +7,6 @@ form - - - or - - @@ -20,6 +15,11 @@ + diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml index 8827edba591..8c4df8548f6 100644 --- a/addons/account/wizard/account_fiscalyear_close_view.xml +++ b/addons/account/wizard/account_fiscalyear_close_view.xml @@ -7,11 +7,6 @@ form - - - or - - @@ -22,6 +17,11 @@ + diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml index 9d38b2034bd..08db574e9ac 100644 --- a/addons/account/wizard/account_invoice_refund_view.xml +++ b/addons/account/wizard/account_invoice_refund_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -24,6 +19,11 @@ + diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml index 5658143f4e1..0ea2eefebc5 100644 --- a/addons/account/wizard/account_invoice_state_view.xml +++ b/addons/account/wizard/account_invoice_state_view.xml @@ -6,14 +6,14 @@ account.invoice.confirm form - - - - or - - - - + + + + @@ -28,14 +28,14 @@ account.invoice.cancel form - - - - or - - - - + + + + diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml index e2dcc05c266..af0b50168de 100644 --- a/addons/account/wizard/account_journal_select_view.xml +++ b/addons/account/wizard/account_journal_select_view.xml @@ -7,14 +7,14 @@ account.journal.select form - - - - or - - + - + + diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml index 02509137af5..58707c0d605 100644 --- a/addons/account/wizard/account_move_bank_reconcile_view.xml +++ b/addons/account/wizard/account_move_bank_reconcile_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml index 862ffa0956e..1e36cc8bafe 100644 --- a/addons/account/wizard/account_move_line_reconcile_select_view.xml +++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml index 1d405ae02aa..ade86e29c50 100644 --- a/addons/account/wizard/account_move_line_select_view.xml +++ b/addons/account/wizard/account_move_line_select_view.xml @@ -8,12 +8,12 @@ form - + + - + diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml index ff4811f781c..63ba44ba8a7 100644 --- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml +++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml index bedc1028b4a..7f950e4cf53 100644 --- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml +++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml index c285db512cf..c6aa828e3ce 100644 --- a/addons/account/wizard/account_period_close_view.xml +++ b/addons/account/wizard/account_period_close_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml index 552907da0c8..ffa298bf22d 100644 --- a/addons/account/wizard/account_reconcile_partner_process_view.xml +++ b/addons/account/wizard/account_reconcile_partner_process_view.xml @@ -7,15 +7,15 @@ form - - - + diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml index 4fb418e4fad..d6344f2cbc1 100644 --- a/addons/account/wizard/account_reconcile_view.xml +++ b/addons/account/wizard/account_reconcile_view.xml @@ -8,13 +8,6 @@ form - - - - - or - - @@ -23,6 +16,13 @@ + diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml index 575af9370db..0e82603ced1 100644 --- a/addons/account/wizard/account_report_aged_partner_balance_view.xml +++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml @@ -9,11 +9,6 @@ - - - or - - @@ -26,6 +21,11 @@ + diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml index b391764f6c7..2711154a35e 100644 --- a/addons/account/wizard/account_report_common_view.xml +++ b/addons/account/wizard/account_report_common_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -38,6 +33,11 @@ + diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml index 56b72f120d2..5e53fb66d0f 100644 --- a/addons/account/wizard/account_state_open_view.xml +++ b/addons/account/wizard/account_state_open_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml index 2132851a3fe..64ca3beeb11 100644 --- a/addons/account/wizard/account_subscription_generate_view.xml +++ b/addons/account/wizard/account_subscription_generate_view.xml @@ -8,16 +8,16 @@ form - - - or - - + diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml index 0db91912c5e..ea0c68f739f 100644 --- a/addons/account/wizard/account_tax_chart_view.xml +++ b/addons/account/wizard/account_tax_chart_view.xml @@ -8,16 +8,16 @@ form - - - or - - + diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml index bec668c29ec..dc3cf7b748a 100644 --- a/addons/account/wizard/account_unreconcile_view.xml +++ b/addons/account/wizard/account_unreconcile_view.xml @@ -8,13 +8,13 @@ form - + + + - - + diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml index 899befeaa0a..777ab38fddf 100644 --- a/addons/account/wizard/account_use_model_view.xml +++ b/addons/account/wizard/account_use_model_view.xml @@ -8,16 +8,16 @@ form - - - or - - + @@ -40,12 +40,12 @@ form - + + - + diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml index d5b1cff4533..abadb57c4e7 100644 --- a/addons/account/wizard/account_validate_move_view.xml +++ b/addons/account/wizard/account_validate_move_view.xml @@ -8,19 +8,19 @@ validate.account.move form - - - - or - - - - - - - - - + + + + + + + + + @@ -47,15 +47,15 @@ validate.account.move.lines form - - - - or - - + - - + + + diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index 91ea78d7bd6..988c4786bb8 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -25,6 +20,11 @@ + diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml index ae95f0f7584..c25705572d1 100644 --- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml +++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -21,6 +16,11 @@ + diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml index b67e61bafc6..5b8a11f2587 100644 --- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml +++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml @@ -7,12 +7,12 @@ form - + + - + diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po new file mode 100644 index 00000000000..8275f14ed6e --- /dev/null +++ b/addons/account_asset/i18n/mn.po @@ -0,0 +1,793 @@ +# Mongolian 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 01:37+0100\n" +"PO-Revision-Date: 2012-07-10 03:13+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Mongolian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n" +"X-Generator: Launchpad (build 15558)\n" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in draft and open states" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,method_end:0 +#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0 +msgid "Ending date" +msgstr "Дуусах хугацаа" + +#. module: account_asset +#: field:account.asset.asset,value_residual:0 +msgid "Residual Value" +msgstr "Үлдэгдэл дүн" + +#. module: account_asset +#: field:account.asset.category,account_expense_depreciation_id:0 +msgid "Depr. Expense Account" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute Asset" +msgstr "Үндсэн хөрөнгө тооцоолох" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Group By..." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,gross_value:0 +msgid "Gross Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 field:account.asset.asset,name:0 +#: field:account.asset.depreciation.line,asset_id:0 +#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0 +#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0 +#: model:ir.model,name:account_asset.model_account_asset_asset +msgid "Asset" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0 +msgid "" +"Indicates that the first depreciation entry for this asset have to be done " +"from the purchase date instead of the first January" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,name:0 +msgid "History name" +msgstr "Түүхийн нэр" + +#. module: account_asset +#: field:account.asset.asset,company_id:0 +#: field:account.asset.category,company_id:0 view:asset.asset.report:0 +#: field:asset.asset.report,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Modify" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Running" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,amount:0 +msgid "Depreciation Amount" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report +#: model:ir.model,name:account_asset.model_asset_asset_report +#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report +msgid "Assets Analysis" +msgstr "Хөрөнгийн судалгаа шинжилгээ" + +#. module: account_asset +#: field:asset.modify,name:0 +msgid "Reason" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_progress_factor:0 +#: field:account.asset.category,method_progress_factor:0 +msgid "Degressive Factor" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Asset Categories" +msgstr "Хөрөнгийн зэрэглэл" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "" +"This wizard will post the depreciation lines of running assets that belong " +"to the selected period." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,account_move_line_ids:0 +#: field:account.move.line,entry_ids:0 +#: model:ir.actions.act_window,name:account_asset.act_entries_open +msgid "Entries" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,depreciation_line_ids:0 +msgid "Depreciation Lines" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,salvage_value:0 +msgid "It is the amount you plan to have that you cannot depreciate." +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciation_date:0 +#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0 +msgid "Depreciation Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_asset_id:0 +msgid "Asset Account" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,posted_value:0 +msgid "Posted Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_finance_assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets +msgid "Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_depreciation_id:0 +msgid "Depreciation Account" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0 +msgid "Notes" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_id:0 +msgid "Depreciation Entry" +msgstr "" + +#. module: account_asset +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,nbr:0 +msgid "# of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in draft state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_end:0 +#: selection:account.asset.asset,method_time:0 +#: selection:account.asset.category,method_time:0 +#: selection:account.asset.history,method_time:0 +msgid "Ending Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,code:0 +msgid "Reference" +msgstr "" + +#. module: account_asset +#: constraint:account.invoice:0 +msgid "Invalid BBA Structured Communication !" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Account Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard +#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard +msgid "Compute Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,sequence:0 +msgid "Sequence of the depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_period:0 +#: field:account.asset.category,method_period:0 +#: field:account.asset.history,method_period:0 +#: field:asset.modify,method_period:0 +msgid "Period Length" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Draft" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of asset purchase" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_number:0 +msgid "Calculates Depreciation within specified interval" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change Duration" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_analytic_id:0 +msgid "Analytic account" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method:0 field:account.asset.category,method:0 +msgid "Computation Method" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_period:0 +msgid "State here the time during 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "" +"Prorata temporis can be applied only for time method \"number of " +"depreciations\"." +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_time:0 +msgid "" +"The method to use to compute the dates and number of depreciation lines.\n" +"Number of Depreciations: Fix the number of depreciation lines and the time " +"between 2 depreciations.\n" +"Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_value:0 +msgid "Gross value " +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "Error ! You can not create recursive assets." +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_period:0 +msgid "Time in month between two depreciations" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,name:0 +msgid "Year" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_modify +#: model:ir.model,name:account_asset.model_asset_modify +msgid "Modify Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Other Information" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,salvage_value:0 +msgid "Salvage Value" +msgstr "" + +#. module: account_asset +#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0 +msgid "Asset Category" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Close" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute +msgid "Compute assets" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify +msgid "Modify asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in closed state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.history:0 +#: model:ir.model,name:account_asset.model_account_asset_history +msgid "Asset history" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current year" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,state:0 field:asset.asset.report,state:0 +msgid "State" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "" +"The selected account of your Journal Entry forces to provide a secondary " +"currency. You should remove the secondary currency on the account or select " +"a multi-currency view on the journal." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation Board" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,unposted_value:0 +msgid "Unposted Amount" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_time:0 +#: field:account.asset.category,method_time:0 +#: field:account.asset.history,method_time:0 +msgid "Time Method" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Analytic Information" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Asset Durations to Modify" +msgstr "" + +#. module: account_asset +#: 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 "" + +#. module: account_asset +#: field:account.asset.asset,note:0 field:account.asset.category,note:0 +#: field:account.asset.history,note:0 +msgid "Note" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method:0 help:account.asset.category,method:0 +msgid "" +"Choose the method to use to compute the amount of depreciation lines.\n" +" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" +" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_time:0 +#: help:account.asset.category,method_time:0 +msgid "" +"Choose the method to use to compute the dates and number of depreciation " +"lines.\n" +" * Number of Depreciations: Fix the number of depreciation lines and the " +"time between 2 depreciations.\n" +" * Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in running state" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Closed" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +#: field:asset.asset.report,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0 +msgid "Amount of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Posted depreciation lines" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "Company must be the same for its related account and period." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Children Assets" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,user_id:0 +msgid "User" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,date:0 +msgid "Date" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current month" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create journal items on an account of type view." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0 +msgid "Compute" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Search Asset Category" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard +msgid "asset.depreciation.confirmation.wizard" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_close +msgid "Close asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,parent_state:0 +msgid "State of Asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,name:0 +msgid "Depreciation Name" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0 +msgid "History" +msgstr "" + +#. module: account_asset +#: sql_constraint:account.invoice:0 +msgid "Invoice Number must be unique per Company!" +msgstr "" + +#. module: account_asset +#: field:asset.depreciation.confirmation.wizard,period_id:0 +msgid "Period" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0 +msgid "Prorata Temporis" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Accounting Information" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal +msgid "Review Asset Categories" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0 +msgid "Cancel" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0 +msgid "Close" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +msgid "Depreciation Method" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0 +#: field:asset.asset.report,purchase_date:0 +msgid "Purchase Date" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Degressive" +msgstr "" + +#. module: account_asset +#: help:asset.depreciation.confirmation.wizard,period_id:0 +msgid "" +"Choose the period for which you want to automatically post the depreciation " +"lines of running assets" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Current" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,remaining_value:0 +msgid "Amount to Depreciate" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,open_asset:0 +msgid "Skip Draft State" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +#: view:account.asset.history:0 +msgid "Depreciation Dates" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,currency_id:0 +msgid "Currency" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciated_value:0 +msgid "Amount Already Depreciated" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_check:0 +#: view:asset.asset.report:0 field:asset.asset.report,move_check:0 +msgid "Posted" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,state:0 +msgid "" +"When an asset is created, the state is 'Draft'.\n" +"If the asset is confirmed, the state goes in 'Running' and the depreciation " +"lines can be posted in the accounting.\n" +"You can manually close an asset when the depreciation is over. If the last " +"line of depreciation is posted, the asset automatically goes in that state." +msgstr "" + +#. module: account_asset +#: field:account.asset.category,name:0 +msgid "Name" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,open_asset:0 +msgid "" +"Check this if you want to automatically confirm the assets of this category " +"when created by invoices." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Draft" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Linear" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month-1" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 view:account.asset.category:0 +#: field:asset.asset.report,asset_category_id:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in last month" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/wizard/wizard_asset_compute.py:49 +#, python-format +msgid "Created Asset Moves" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create journal items on closed account." +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report +msgid "" +"From this report, you can have an overview on all depreciation. The tool " +"search can also be used to personalise your Assets reports and so, match " +"this analysis to your needs;" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,method_period:0 +msgid "State here the time between 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_number:0 +#: selection:account.asset.asset,method_time:0 +#: field:account.asset.category,method_number:0 +#: selection:account.asset.category,method_time:0 +#: field:account.asset.history,method_number:0 +#: selection:account.asset.history,method_time:0 +#: field:asset.modify,method_number:0 +msgid "Number of Depreciations" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Create Move" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Post Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "" diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml index 1e8f0f969b7..15b11f4dcff 100644 --- a/addons/account_asset/wizard/account_asset_change_duration_view.xml +++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -23,6 +18,11 @@ + diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml index fee7f77d758..45d3aa22625 100644 --- a/addons/account_asset/wizard/wizard_asset_compute_view.xml +++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml @@ -7,16 +7,16 @@ form - - - or - - + diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml index 44e0e9aa3a4..c08f15a7410 100644 --- a/addons/account_budget/wizard/account_budget_analytic_view.xml +++ b/addons/account_budget/wizard/account_budget_analytic_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml index ee83d272edf..5f2ec7ee46c 100644 --- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml +++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml index ddfd3d00068..3e02604b746 100644 --- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml +++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml index afdeb62e8ed..984cbeefeef 100644 --- a/addons/account_budget/wizard/account_budget_report_view.xml +++ b/addons/account_budget/wizard/account_budget_report_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index 058feedcde3..084de5c2ae6 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -8,17 +8,17 @@ form - - - or - - + diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml index 220c592f6b5..ab90144f0e2 100644 --- a/addons/account_payment/wizard/account_payment_create_order_view.xml +++ b/addons/account_payment/wizard/account_payment_create_order_view.xml @@ -8,14 +8,14 @@ form - - - or - - + @@ -26,14 +26,14 @@ form - - - or - - + diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml index ee86ed75a41..1053d47eebd 100644 --- a/addons/account_payment/wizard/account_payment_pay_view.xml +++ b/addons/account_payment/wizard/account_payment_pay_view.xml @@ -8,12 +8,12 @@ form - + + - + diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml index de1885b1014..c2789f95d38 100644 --- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml +++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml index 5ecb4cd07bb..33014f394a7 100644 --- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml +++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml @@ -7,15 +7,15 @@ form - - - or - - + @@ -35,13 +35,13 @@ form - + + + - - + diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml index 3bfb0fcb4ec..04131b643eb 100644 --- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml +++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml @@ -8,13 +8,13 @@ form - + + + - - + diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml index b66173323e2..fdfffb73c23 100644 --- a/addons/audittrail/wizard/audittrail_view_log_view.xml +++ b/addons/audittrail/wizard/audittrail_view_log_view.xml @@ -10,15 +10,15 @@ form - - - or - - + diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml index a16715e0d52..3bdb9144907 100644 --- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml +++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml @@ -10,11 +10,6 @@ form - - - or - - @@ -36,6 +31,11 @@ + diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml index 1abd6ff3570..4072db42318 100644 --- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml +++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml @@ -8,12 +8,12 @@ form - + + - + diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml index 93c38d794f4..281576b0b6a 100644 --- a/addons/base_module_record/wizard/base_module_record_data_view.xml +++ b/addons/base_module_record/wizard/base_module_record_data_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -20,6 +15,11 @@ + diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml index b947c94f871..a621ae69547 100644 --- a/addons/base_module_record/wizard/base_module_record_object_view.xml +++ b/addons/base_module_record/wizard/base_module_record_object_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -20,6 +15,11 @@ + @@ -86,11 +86,6 @@ form - - - or - - @@ -102,6 +97,11 @@ + diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml index 106ad662b0f..39943697d4f 100644 --- a/addons/base_module_record/wizard/base_module_save_view.xml +++ b/addons/base_module_record/wizard/base_module_save_view.xml @@ -8,16 +8,16 @@ form - - - or - - + diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml index c060f4a961a..12ac67e3ba0 100644 --- a/addons/base_report_designer/wizard/base_report_design_view.xml +++ b/addons/base_report_designer/wizard/base_report_design_view.xml @@ -7,15 +7,15 @@ form - + + + + - - - + diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml index 3720e87cf43..122dcfe9586 100644 --- a/addons/board/wizard/board_menu_create_view.xml +++ b/addons/board/wizard/board_menu_create_view.xml @@ -10,15 +10,15 @@ form - - - or - - + diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml index 29f455d764f..0c16fd0eba4 100644 --- a/addons/caldav/wizard/caldav_browse_view.xml +++ b/addons/caldav/wizard/caldav_browse_view.xml @@ -8,9 +8,6 @@ form - - - @@ -37,6 +34,9 @@ + diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml index 3f498504444..014f5500384 100644 --- a/addons/caldav/wizard/calendar_event_import_view.xml +++ b/addons/caldav/wizard/calendar_event_import_view.xml @@ -7,15 +7,15 @@ form - - - or - - + diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml index 590daa34561..0601349690d 100644 --- a/addons/caldav/wizard/calendar_event_subscribe_view.xml +++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml @@ -7,15 +7,15 @@ form - - - or - - + diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 85f9a4aab5d..7d392135195 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -316,7 +316,7 @@ : - + 7 7 + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -351,15 +373,6 @@ Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events. - - form - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + - - + + + + + - - - - - - - - + diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml index b009339d564..4324990a1d8 100644 --- a/addons/event_moodle/event_view.xml +++ b/addons/event_moodle/event_view.xml @@ -7,14 +7,13 @@ form - - - - - + + + - + + @@ -29,12 +28,12 @@ - - + + - - - + + + diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml index cfac9944d1b..b7ab7a55357 100644 --- a/addons/event_project/wizard/event_project_retro_view.xml +++ b/addons/event_project/wizard/event_project_retro_view.xml @@ -8,16 +8,16 @@ form - - - or - - + diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml index acd9e622b01..ddbd4db7ee2 100644 --- a/addons/google_base_account/wizard/google_login_view.xml +++ b/addons/google_base_account/wizard/google_login_view.xml @@ -7,15 +7,15 @@ form - - - or - - + diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml index 3bf762b0f50..c9daaffbe4c 100644 --- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml index e4f6ec33bcb..554355edbb1 100644 --- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml @@ -7,15 +7,15 @@ form - - - or - - + diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml index 0657855c549..4e284cd396c 100644 --- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml @@ -8,17 +8,17 @@ form - - - or - - + diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml index acc1f5e01b0..96d924f88a7 100644 --- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml @@ -7,12 +7,6 @@ form - - - - or - - @@ -22,6 +16,12 @@ + diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml index 5be8871446a..fffdf76f0e9 100644 --- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml +++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml index c5e408a6748..c0bbf741277 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -8,15 +8,15 @@ form - - or - - + diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml index 4ef2dcc96c4..976d732ee69 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -20,6 +15,11 @@ + diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml index 985f6b25eec..cf8a30c9847 100644 --- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml +++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml @@ -8,12 +8,12 @@ form - + + - + diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml index d14646b0249..afcf64808b7 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml @@ -9,16 +9,16 @@ form - - - or - - + diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml index 288a51e34cd..8ead6ea63d6 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml @@ -9,10 +9,6 @@ form - - or - - @@ -25,6 +21,10 @@ + diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml index c7b7f320c37..dc2a6c47b8d 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml @@ -7,15 +7,15 @@ form - - - or - - + @@ -26,11 +26,6 @@ form - - - or - - @@ -40,6 +35,11 @@ + @@ -60,12 +60,6 @@ form - - - - or - - @@ -80,6 +74,12 @@ + diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index 4e4eb7b36d2..f0679de8d95 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -7,27 +7,27 @@ hr.timesheet.analytic.profit form - - - or - - + - + - + - - + - - + + - + + diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml index 28e8662f010..85d9538cc5b 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml @@ -27,11 +27,6 @@ form - - - or - - @@ -39,6 +34,11 @@ + diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml index aec0b52d5e6..1c163a1ac0e 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -28,6 +23,11 @@ + diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml index 2c04f116b48..b2dfabb310e 100644 --- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml +++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/idea/idea.py b/addons/idea/idea.py index cc2c11bdd8a..3be4dd2e28d 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -49,7 +49,7 @@ class idea_idea(osv.osv): 'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True), 'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}), 'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}), - 'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}), + 'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}), 'state': fields.selection([('draft', 'New'), ('open', 'Accepted'), ('cancel', 'Refused'), diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 9cee10c3cbb..8d7a726f015 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -72,11 +72,14 @@ + - - + + + + diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po index dad8acc1860..75e4f08b159 100644 --- a/addons/import_google/i18n/ja.po +++ b/addons/import_google/i18n/ja.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n" +"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n" "X-Generator: Launchpad (build 15558)\n" #. module: import_google diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index 2968b009a51..b8adc71f2a5 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -7,11 +7,6 @@ form - - - or - - @@ -21,6 +16,11 @@ + @@ -33,14 +33,14 @@ form - - - or - - + diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po index 811bd6016fb..6f67aed9ada 100644 --- a/addons/import_sugarcrm/i18n/ja.po +++ b/addons/import_sugarcrm/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-05-09 09:19+0000\n" -"Last-Translator: Tomomi Mengelberg \n" +"PO-Revision-Date: 2012-07-09 18:11+0000\n" +"Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:15+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: import_sugarcrm #: code:addons/import_sugarcrm/import_sugarcrm.py:1105 @@ -28,7 +28,7 @@ msgstr "エラー" #: view:import.sugarcrm:0 msgid "" "Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login." -msgstr "" +msgstr "SugarSoap API URL(ツールヒントを参照)とフルアクセスのSugarCRMログインを使用します。" #. module: import_sugarcrm #: view:import.sugarcrm:0 @@ -51,11 +51,12 @@ 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 "連絡先" +msgstr "コンタクト" #. module: import_sugarcrm #: view:import.sugarcrm:0 @@ -65,12 +66,12 @@ msgstr "人事" #. module: import_sugarcrm #: help:import.sugarcrm,bug:0 msgid "Check this box to import sugarCRM Bugs into OpenERP project issues" -msgstr "" +msgstr "OpenERPのプロジェクト問題にSugarCRMのバグをインポートするには、このボックスをクリックします。" #. module: import_sugarcrm #: field:import.sugarcrm,instance_name:0 msgid "Instance's Name" -msgstr "事例の名前" +msgstr "インスタンスの名前" #. module: import_sugarcrm #: field:import.sugarcrm,project_task:0 @@ -80,7 +81,7 @@ msgstr "プロジェクトのタスク" #. module: import_sugarcrm #: field:import.sugarcrm,email_from:0 msgid "Notify End Of Import To:" -msgstr "へインポートの終了を通知する。" +msgstr "インポート終了の通知先:" #. module: import_sugarcrm #: help:import.sugarcrm,user:0 @@ -89,35 +90,37 @@ msgid "" "user with the same login exist in OpenERP, user information will be erase by " "sugarCRM user information" msgstr "" +"OpenERPユーザにSugarCRMユーザをインポートするには、このボックスをチェックします。OpenERPの中に同じログインユーザが存在する場合は、S" +"ugarCRMユーザ情報によりユーザ情報が消されることに注意して下さい。" #. 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 "Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz - python-zci" +msgstr "Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz - python-zci" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "_Schedule Recurrent Imports" -msgstr "" +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 "インポート完了を通知するEメールを忘れないで下さい。" +msgstr "インポート完了を通知するEメールアドレスを忘れないで下さい。" #. module: import_sugarcrm #: help:import.sugarcrm,call:0 msgid "Check this box to import sugarCRM Calls into OpenERP calls" -msgstr "" +msgstr "OpenERP通話にSugarCRM通話をインポートするには、このボックスをチェックします。" #. 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 "" +msgstr "反復あるいは定時インポートをする場合、OpenERP内のデータはSugarCRMのデータによって更新されます。" #. module: import_sugarcrm #: field:import.sugarcrm,employee:0 @@ -132,12 +135,12 @@ msgstr "ドキュメント" #. module: import_sugarcrm #: help:import.sugarcrm,document:0 msgid "Check this box to import sugarCRM Documents into OpenERP documents" -msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックしてください。" +msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "Import Data From SugarCRM" -msgstr "SugarCRMからデータをインポートする。" +msgstr "SugarCRMからデータのインポート" #. module: import_sugarcrm #: view:import.sugarcrm:0 @@ -149,7 +152,7 @@ msgstr "CRM" 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 "" +msgstr "データインポートのプロセスはバックグラウンドで実行されます。それが定義されている場合、所定のEメールアドレスにEメールが送信されます。" #. module: import_sugarcrm #: field:import.sugarcrm,call:0 @@ -159,19 +162,19 @@ msgstr "通話" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "Multi Instance Management" -msgstr "" +msgstr "複数インスタンスの管理" #. module: import_sugarcrm #: view:import.message:0 msgid "_Ok" -msgstr "_OK" +msgstr "OK" #. module: import_sugarcrm #: help:import.sugarcrm,opportunity:0 msgid "" "Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads " "and Opportunities" -msgstr "" +msgstr "OpenERPのリードと商談の中に、SugarCRMのリードと商談をインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: field:import.sugarcrm,email_history:0 @@ -186,6 +189,9 @@ msgid "" "application " "http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index" msgstr "" +"データを取得するためのWebサービスのURL。例:'http://example.com/sugarcrm/soap.php'、または、あなたのSugar" +"CRMアプリケーションのアドレスをコピーします。 " +"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index" #. module: import_sugarcrm #: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm @@ -196,7 +202,7 @@ msgstr "SugarCRMをインポート" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "_Import" -msgstr "インポート(_I)" +msgstr "インポート" #. module: import_sugarcrm #: field:import.sugarcrm,user:0 @@ -208,18 +214,18 @@ msgstr "ユーザ" #: code:addons/import_sugarcrm/import_sugarcrm.py:1131 #, python-format msgid "%s data required %s Module to be installed, Please install %s module" -msgstr "" +msgstr "%s のデータは %s モジュールがインストールされていることを要求します。%s モジュールをインストールして下さい。" #. module: import_sugarcrm #: field:import.sugarcrm,claim:0 msgid "Cases" -msgstr "お問合せ" +msgstr "案件" #. module: import_sugarcrm #: help:import.sugarcrm,meeting:0 msgid "" "Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings" -msgstr "" +msgstr "OpenERPミーティングにSugarCRMのミーティングとタスクをインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: help:import.sugarcrm,email_history:0 @@ -227,6 +233,7 @@ msgid "" "Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP " "Messages and Attachments" msgstr "" +"OpenERPメッセージと添付ファイにSugarCRMのEメール、ノート、添付ファイルをインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: field:import.sugarcrm,project:0 @@ -240,13 +247,13 @@ msgid "" "Please install SOAP for python - ZSI-2.0-rc3.tar.gz from " "http://pypi.python.org/pypi/ZSI/" msgstr "" -"Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz from " +"Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz from " "http://pypi.python.org/pypi/ZSI/" #. module: import_sugarcrm #: help:import.sugarcrm,project:0 msgid "Check this box to import sugarCRM Projects into OpenERP projects" -msgstr "" +msgstr "OpenERPプロジェクトにSugarCRMプロジェクトをインポートするには、このボックスをチェックして下さい。" #. module: import_sugarcrm #: code:addons/import_sugarcrm/import_sugarcrm.py:1098 @@ -263,12 +270,12 @@ msgstr "ミーティング" #. module: import_sugarcrm #: help:import.sugarcrm,employee:0 msgid "Check this box to import sugarCRM Employees into OpenERP employees" -msgstr "" +msgstr "OpenERP従業員にSugarCRM従業員をインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: field:import.sugarcrm,url:0 msgid "SugarSoap Api url:" -msgstr "SugarSoap Api url:" +msgstr "SugarSoap API URL:" #. module: import_sugarcrm #: view:import.sugarcrm:0 @@ -282,6 +289,8 @@ msgid "" "Authentication error !\n" "Bad Username or Password bad SugarSoap Api url !" msgstr "" +"認証エラー。\n" +"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。" #. module: import_sugarcrm #: field:import.sugarcrm,bug:0 @@ -296,12 +305,12 @@ msgstr "プロジェクト" #. module: import_sugarcrm #: help:import.sugarcrm,project_task:0 msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks" -msgstr "" +msgstr "OpenERPタスクにSugarCRMプロジェクトタスクをインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: field:import.sugarcrm,opportunity:0 msgid "Leads & Opp" -msgstr "見込み客 & 商談" +msgstr "リード & 商談" #. module: import_sugarcrm #: code:addons/import_sugarcrm/import_sugarcrm.py:79 @@ -310,6 +319,8 @@ msgid "" "Authentication error !\n" "Bad Username or Password or bad SugarSoap Api url !" msgstr "" +"認証エラー。\n" +"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。" #. module: import_sugarcrm #: code:addons/import_sugarcrm/import_sugarcrm.py:79 @@ -330,12 +341,12 @@ msgstr "警告" msgid "" "Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come " "from different server." -msgstr "" +msgstr "SugarCRMモデルデータの xml_id を区別するためのSugarCRM IDのサフィックス(接頭辞)は異なるサーバから来ます。" #. module: import_sugarcrm #: help:import.sugarcrm,contact:0 msgid "Check this box to import sugarCRM Contacts into OpenERP addresses" -msgstr "" +msgstr "OpenERP住所録にSugarCRMコンタクトをインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: field:import.sugarcrm,password:0 @@ -350,12 +361,12 @@ msgstr "ログイン情報" #. module: import_sugarcrm #: help:import.sugarcrm,claim:0 msgid "Check this box to import sugarCRM Cases into OpenERP claims" -msgstr "" +msgstr "OpenERP苦情にSugarCRMケースをインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "Email Notification When Import is Finished" -msgstr "" +msgstr "インポート完了時にEメール通知" #. module: import_sugarcrm #: field:import.sugarcrm,username:0 @@ -366,17 +377,17 @@ msgstr "ユーザ名" #: view:import.message:0 #: model:ir.model,name:import_sugarcrm.model_import_message msgid "Import Message" -msgstr "メッセージをインポートする。" +msgstr "メッセージのインポート" #. module: import_sugarcrm #: help:import.sugarcrm,account:0 msgid "Check this box to import sugarCRM Accounts into OpenERP partners" -msgstr "" +msgstr "OpenERPパートナにSugarCRMアカウントをインポートするには、このボックスをチェックします。" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "Online documentation:" -msgstr "" +msgstr "オンラインドキュメンテーション:" #. module: import_sugarcrm #: field:import.sugarcrm,account:0 @@ -386,7 +397,7 @@ msgstr "顧客情報" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "_Cancel" -msgstr "キャンセル(_C)" +msgstr "キャンセル" #. module: import_sugarcrm #: code:addons/import_sugarcrm/sugarsoap_services.py:23 @@ -403,4 +414,4 @@ msgstr "SugarCRMのデータをインポート" #. module: import_sugarcrm #: view:import.sugarcrm:0 msgid "Email Address to Notify" -msgstr "" +msgstr "通知のEメールアドレス" diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml index 357dc78c9d7..30ff9a9ed8f 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -26,6 +21,11 @@ + diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml index d4bcd756922..f0bdb2a2a3f 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml +++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml @@ -8,12 +8,6 @@ form - - - - or - - @@ -33,6 +27,12 @@ + diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml index ed704810e45..222aad3b6b9 100644 --- a/addons/l10n_ch/wizard/bvr_import_view.xml +++ b/addons/l10n_ch/wizard/bvr_import_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml index 1340d869941..7e9d5894dfc 100644 --- a/addons/l10n_ch/wizard/create_dta_view.xml +++ b/addons/l10n_ch/wizard/create_dta_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml index 440c182e336..f5358d9dd42 100644 --- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml +++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml index d9f71c2ef3e..9d9b3b91c71 100644 --- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml +++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml index e5c13e7e4c4..1f60096e815 100644 --- a/addons/l10n_lu/wizard/print_vat_view.xml +++ b/addons/l10n_lu/wizard/print_vat_view.xml @@ -7,15 +7,15 @@ form - - - or - - + diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py index 3b06ea5ce32..8cca4ced465 100644 --- a/addons/lunch/lunch.py +++ b/addons/lunch/lunch.py @@ -134,8 +134,8 @@ class lunch_order(osv.osv): 'product': fields.many2one('lunch.product', 'Product', required=True, \ readonly=True, states={'draft':[('readonly', False)]}, change_default=True), 'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}), - 'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True), - 'descript': fields.char('Description Order', readonly=True, size=250, \ + 'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True), + 'descript': fields.char('Comment', readonly=True, size=250, \ states = {'draft':[('readonly', False)]}), 'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \ 'Status', readonly=True, select=True), diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 55a59f76762..5e870c085c9 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -30,14 +30,18 @@ - - - - - - - - + + + + + + + + + + + + @@ -105,8 +109,10 @@ lunch.cashbox - - + + + + @@ -145,14 +151,16 @@ lunch.cashmove - - - - - - - - + + + + + + + + + + @@ -216,8 +224,9 @@ lunch.category - - + + + @@ -250,18 +259,19 @@ lunch.product - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml index 287d283e212..eb05c0dc304 100644 --- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml +++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml @@ -10,14 +10,14 @@ form - - - or - - + diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml index cd96b9765c9..cb10eb57fd0 100644 --- a/addons/lunch/wizard/lunch_order_cancel_view.xml +++ b/addons/lunch/wizard/lunch_order_cancel_view.xml @@ -10,14 +10,14 @@ form - - - or - - + diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml index ade5b227cc2..282b79539f8 100644 --- a/addons/lunch/wizard/lunch_order_confirm_view.xml +++ b/addons/lunch/wizard/lunch_order_confirm_view.xml @@ -10,15 +10,15 @@ form - - - or - - + diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 5668709af17..cdcaf4f464d 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -69,7 +69,7 @@ class mail_thread(osv.Model): subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context) res[id] = { 'message_ids': message_ids, - 'message_summary': "Msg: %d . Fol: %d" % (len(message_ids), len(subscriber_ids)), + 'message_summary': "9 %d + %d" % (len(message_ids), len(subscriber_ids)), } return res diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 0f68a548590..2140bbe474a 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -540,7 +540,11 @@ openerp.mail = function(session) { this._super.apply(this, arguments); var self = this; this.reinit(); - if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; } + if (! this.view.datarecord.id || + session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) { + this.$element.find('.oe_mail_thread').hide(); + return; + } // fetch followers var fetch_sub_done = this.fetch_subscribers(); // create and render Thread widget diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 3da63fb1adc..bcc11c4111d 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -7,11 +7,6 @@ form - - - or - - @@ -33,6 +28,11 @@ + diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml index 7c26f5486ce..e97ad7445df 100644 --- a/addons/membership/wizard/membership_invoice_view.xml +++ b/addons/membership/wizard/membership_invoice_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml index ee7f5eeb258..87b180f0aad 100644 --- a/addons/mrp/wizard/change_production_qty_view.xml +++ b/addons/mrp/wizard/change_production_qty_view.xml @@ -10,17 +10,17 @@ form - - - or - - + diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml index 6ba09ecbdb0..f8aaa7e3c5d 100644 --- a/addons/mrp/wizard/mrp_price_view.xml +++ b/addons/mrp/wizard/mrp_price_view.xml @@ -10,14 +10,14 @@ form - - - or - - + diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml index 23a51642630..72d0ccfcaa2 100644 --- a/addons/mrp/wizard/mrp_product_produce_view.xml +++ b/addons/mrp/wizard/mrp_product_produce_view.xml @@ -11,15 +11,15 @@ form - - - or - - + diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml index b40be0df0ac..439e180ca3c 100644 --- a/addons/mrp/wizard/mrp_workcenter_load_view.xml +++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml @@ -10,17 +10,17 @@ form - - - or - - + diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml index ee0e47e1da3..b90d822121a 100644 --- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml +++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml @@ -10,14 +10,14 @@ form - - - or - - + diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml index f18eac5ce89..ca4690df210 100644 --- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml +++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml @@ -10,15 +10,15 @@ form - - - or - - - + + diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml index a8a69b2ff69..850ae6729a6 100644 --- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml +++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml index cd556fbb6de..fef823fe403 100644 --- a/addons/point_of_sale/wizard/pos_receipt_view.xml +++ b/addons/point_of_sale/wizard/pos_receipt_view.xml @@ -10,14 +10,14 @@ form - - - or - - + diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml index f197daeebff..09005712b78 100644 --- a/addons/point_of_sale/wizard/pos_return_view.xml +++ b/addons/point_of_sale/wizard/pos_return_view.xml @@ -7,11 +7,11 @@ form - + + diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml index 1809c33d20a..55a8404f54b 100644 --- a/addons/portal/wizard/portal_wizard_view.xml +++ b/addons/portal/wizard/portal_wizard_view.xml @@ -17,18 +17,18 @@ form - - - or - - + diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml index de371db211f..5e18892f464 100644 --- a/addons/procurement/wizard/make_procurement_view.xml +++ b/addons/procurement/wizard/make_procurement_view.xml @@ -10,11 +10,6 @@ form - - - or - - @@ -23,6 +18,11 @@ + diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml index 6e6b038d9fa..ab98e598a3d 100644 --- a/addons/procurement/wizard/mrp_procurement_view.xml +++ b/addons/procurement/wizard/mrp_procurement_view.xml @@ -10,15 +10,15 @@ form - + + + + - - - + diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml index 340624fc822..5a29959949e 100644 --- a/addons/procurement/wizard/orderpoint_procurement_view.xml +++ b/addons/procurement/wizard/orderpoint_procurement_view.xml @@ -10,17 +10,17 @@ form - - - or - - + diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml index dc25dc4c7ef..01712a0cedd 100644 --- a/addons/procurement/wizard/schedulers_all_view.xml +++ b/addons/procurement/wizard/schedulers_all_view.xml @@ -10,14 +10,14 @@ form - - - or - - + diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml index d1a1b4b3a11..dbc57c4f6e7 100644 --- a/addons/product/wizard/product_price_view.xml +++ b/addons/product/wizard/product_price_view.xml @@ -10,11 +10,6 @@ form - - - or - - @@ -23,6 +18,11 @@ + diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml index 26e40b77189..f174c6af445 100644 --- a/addons/product_margin/wizard/product_margin_view.xml +++ b/addons/product_margin/wizard/product_margin_view.xml @@ -7,16 +7,16 @@ form - - - or - - + diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po index 3fda3a1349c..68f60160a76 100644 --- a/addons/project/i18n/ja.po +++ b/addons/project/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-06-20 17:12+0000\n" -"Last-Translator: Akira Hiyama \n" +"PO-Revision-Date: 2012-07-10 00:39+0000\n" +"Last-Translator: Tomomi Mengelberg \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n" -"X-Generator: Launchpad (build 15505)\n" +"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: project #: view:report.project.task.user:0 @@ -1825,7 +1825,7 @@ msgstr "タスク %s は閉じられました。" #. module: project #: field:project.task,id:0 msgid "ID" -msgstr "" +msgstr "ID" #. module: project #: model:ir.actions.act_window,name:project.action_view_task_history_burndown diff --git a/addons/project/project.py b/addons/project/project.py index 487daa834bb..5810f34ad4a 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -215,7 +215,7 @@ class project(osv.osv): 'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'task_count': fields.function(_task_count, type='integer', string="Open Tasks"), 'color': fields.integer('Color Index'), - 'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'), + 'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True), 'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,), 'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers, type='many2many', relation='res.users', string='Followers'), @@ -236,6 +236,7 @@ class project(osv.osv): 'priority': 1, 'sequence': 10, 'type_ids': _get_type_common, + 'privacy_visibility': 'public', } # TODO: Why not using a SQL contraints ? diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 7dd1cdb9465..4bd7e4b5b1d 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -30,6 +25,11 @@ + diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index 066f15582b4..84436c045a6 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml index aa81b9d6c43..ca6a4d5f7a4 100644 --- a/addons/project_gtd/wizard/project_gtd_fill_view.xml +++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml @@ -8,16 +8,16 @@ form - - - or - - + diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po index fcd18045839..6ef4c5b71d2 100644 --- a/addons/project_issue/i18n/ja.po +++ b/addons/project_issue/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-06-11 23:10+0000\n" +"PO-Revision-Date: 2012-07-09 05:11+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n" -"X-Generator: Launchpad (build 15389)\n" +"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: project_issue #: view:project.issue.report:0 @@ -398,7 +398,7 @@ msgstr "プロジェクトの問題" #. module: project_issue #: view:project.issue:0 msgid "Communication & History" -msgstr "コミュニケーションと履歴" +msgstr "通信と履歴" #. module: project_issue #: view:project.issue.report:0 @@ -836,10 +836,10 @@ msgid "" " \n" "If the case needs to be reviewed then the state is set to 'Pending'." msgstr "" -"事象が作成されると、状態はドラフトにセットされます。\n" -"事象が進行中になると、状態は開くにセットされます。\n" -"事業が終了すると、状態は完了にセットされます。\n" -"事象がレビューが必要な場合、状態は保留中にセットされます。" +"案件が作成されると、状態はドラフトにセットされます。\n" +"案件が進行中になると、状態は開くにセットされます。\n" +"案件が終了すると、状態は完了にセットされます。\n" +"案件のレビューが必要な場合、状態は保留中にセットされます。" #. module: project_issue #: selection:project.issue.report,month:0 diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml index 8439244d717..0d5c81984ba 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml index 17779ffa268..8eb9db762dd 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -8,14 +8,14 @@ form - - - or - - + diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml index 9ece8f0eb04..c15c8e4fe09 100644 --- a/addons/purchase/wizard/purchase_line_invoice_view.xml +++ b/addons/purchase/wizard/purchase_line_invoice_view.xml @@ -10,14 +10,14 @@ form - - - or - - + diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml index d82d6f7fb2f..17b1f7eea5f 100644 --- a/addons/purchase/wizard/purchase_order_group_view.xml +++ b/addons/purchase/wizard/purchase_order_group_view.xml @@ -7,11 +7,6 @@ form - - - or - - + diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml index ed6de182f99..aab257827c2 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml @@ -7,14 +7,14 @@ form - - - or - - + diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml index ce410da232e..3d4b5bce6bb 100644 --- a/addons/report_webkit/wizard/report_webkit_actions_view.xml +++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml @@ -8,15 +8,15 @@ form - - - or - - + diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml index 835e5aa80cc..ef7546107c2 100644 --- a/addons/sale_crm/wizard/crm_make_sale_view.xml +++ b/addons/sale_crm/wizard/crm_make_sale_view.xml @@ -9,16 +9,16 @@ form - - - or - - + diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index 58734caa25b..ad4df1a5193 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -21,6 +16,11 @@ string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/> + @@ -31,11 +31,6 @@ form - - - or - - @@ -60,6 +55,11 @@ + @@ -70,10 +70,6 @@ form - - - - @@ -100,6 +96,10 @@ attrs="{'invisible':[('access_mode','=','readonly')]}"/> + diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml index dc00fdbe736..e360f5aa025 100644 --- a/addons/stock/wizard/stock_change_product_qty_view.xml +++ b/addons/stock/wizard/stock_change_product_qty_view.xml @@ -7,17 +7,17 @@ form - - - or - - + diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml index 968a268a5ef..6062c946d07 100644 --- a/addons/stock/wizard/stock_change_standard_price_view.xml +++ b/addons/stock/wizard/stock_change_standard_price_view.xml @@ -7,15 +7,15 @@ form - - - or - - + diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml index ea07955eff2..75a7b13233b 100644 --- a/addons/stock/wizard/stock_fill_inventory_view.xml +++ b/addons/stock/wizard/stock_fill_inventory_view.xml @@ -7,17 +7,17 @@ form - - - or - - + diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml index d8a808ed5db..5072007f210 100644 --- a/addons/stock/wizard/stock_inventory_line_split_view.xml +++ b/addons/stock/wizard/stock_inventory_line_split_view.xml @@ -7,11 +7,6 @@ form - - - or - - @@ -45,6 +40,11 @@ + diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml index 0dcca2de211..0386e429ee6 100644 --- a/addons/stock/wizard/stock_inventory_merge_view.xml +++ b/addons/stock/wizard/stock_inventory_merge_view.xml @@ -8,13 +8,13 @@ form - + + + - - + diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml index 088498292ae..20f05f394fd 100644 --- a/addons/stock/wizard/stock_invoice_onshipping_view.xml +++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml @@ -7,16 +7,16 @@ form - - - or - - + diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml index b1f77576392..f0a52933c8a 100644 --- a/addons/stock/wizard/stock_location_product_view.xml +++ b/addons/stock/wizard/stock_location_product_view.xml @@ -7,17 +7,17 @@ form - - - or - - + diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml index 9655edf49b8..5ecfc9a85a1 100644 --- a/addons/stock/wizard/stock_move_view.xml +++ b/addons/stock/wizard/stock_move_view.xml @@ -9,11 +9,6 @@ form - - - or - - @@ -23,6 +18,11 @@ + @@ -42,11 +42,6 @@ form - - - or - - @@ -57,6 +52,11 @@ + @@ -76,9 +76,6 @@ form - - - @@ -113,6 +110,9 @@ + diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml index 497467025b5..3e0699ec3d8 100644 --- a/addons/stock/wizard/stock_partial_move_view.xml +++ b/addons/stock/wizard/stock_partial_move_view.xml @@ -21,13 +21,13 @@ form - + + + - - + diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index c8da4459efa..fdbcabb9ed7 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -16,11 +16,6 @@ form - - - or - - @@ -36,6 +31,11 @@ + diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml index 06e318c295e..5cdad44f681 100644 --- a/addons/stock/wizard/stock_return_picking_view.xml +++ b/addons/stock/wizard/stock_return_picking_view.xml @@ -59,16 +59,16 @@ form - - - or - - + diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml index 573014b7cac..52b182a3f27 100644 --- a/addons/stock/wizard/stock_splitinto_view.xml +++ b/addons/stock/wizard/stock_splitinto_view.xml @@ -7,15 +7,15 @@ form - - - or - - + diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml index db78799f000..e65f378a638 100644 --- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml +++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml @@ -9,7 +9,11 @@ form - + + + + + - - - - + diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml index e51ab4a3ba0..458994621c1 100644 --- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml +++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml @@ -8,11 +8,6 @@ form - - - or - - @@ -20,6 +15,11 @@ + diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml index 3c31404a070..0f3018350c0 100644 --- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml +++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml @@ -9,11 +9,6 @@ form - - - or - - @@ -21,6 +16,11 @@ + diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css index 0102dc1ade6..c18f584c9ed 100644 --- a/addons/survey/static/src/css/survey.css +++ b/addons/survey/static/src/css/survey.css @@ -1,20 +1,3 @@ -.oe_module_survey{ - font-size: 12px; - border-style:dotted; - border-radius: 15px; - text-align: left; - height:145px; - width:220px; -} - -.oe_survey_title{ - font-size: 15px; - height: auto; - font-size: 16px; - font-weight:bold; - width: 205px; -} - .oe_survey_responsible{ height: auto; width: 200px; @@ -26,12 +9,6 @@ width: 200px; font-size: 14px; } - -.oe_survey_fill{ - align:right; - padding: 1px 165px; -} - .oe_survey_rate{ font-size: 14px; } diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 40f13b226f8..0ebaa2aa586 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -68,6 +68,7 @@ class survey(osv.osv): 'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'), 'send_response': fields.boolean('Email Notification on Answer'), 'type': fields.many2one('survey.type', 'Type'), + 'color': fields.integer('Color Index'), 'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'), } _defaults = { @@ -177,7 +178,7 @@ class survey_page(osv.osv): _columns = { 'title': fields.char('Page Title', size=128, required=1), 'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'), - 'question_ids': fields.one2many('survey.question', 'page_id', 'Question'), + 'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'), 'sequence': fields.integer('Page Nr'), 'note': fields.text('Description'), } diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 01e7de66a3e..cfefc8f7dea 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -26,189 +26,206 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + + + @@ -217,8 +234,8 @@ - - + + @@ -286,32 +303,37 @@ + - - - - - By: - - - Open From: - - - , - - - - - Rate: - - - Fill - - - - - + + + i + + Edit... + Delete + + + + + + + By: + + + + Opened at + + , + + + + + Rate: + Fill + + + @@ -344,149 +366,163 @@ - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + + + + - - - + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml index 29cdd4ad5fb..20c028068bb 100644 --- a/addons/survey/wizard/survey_browse_answer.xml +++ b/addons/survey/wizard/survey_browse_answer.xml @@ -18,7 +18,6 @@ - diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml index 7dc736d3008..15b4af6756f 100644 --- a/addons/survey/wizard/survey_selection.xml +++ b/addons/survey/wizard/survey_selection.xml @@ -16,10 +16,10 @@ or - + - + diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml index 45c4ba6a487..213ca9dd2e2 100644 --- a/addons/wiki/wizard/wiki_create_menu_view.xml +++ b/addons/wiki/wizard/wiki_create_menu_view.xml @@ -10,15 +10,15 @@ form - - - or - - + diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml index c818721c09c..90139c3afac 100644 --- a/addons/wiki/wizard/wiki_make_index_view.xml +++ b/addons/wiki/wizard/wiki_make_index_view.xml @@ -10,13 +10,13 @@ form - + + + - - + diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml index c5b3583b1e5..4729586c858 100644 --- a/addons/wiki/wizard/wiki_show_diff_view.xml +++ b/addons/wiki/wizard/wiki_show_diff_view.xml @@ -10,11 +10,11 @@ form - - - + diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml index 9be2d4d22aa..49f333e453f 100644 --- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml +++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml @@ -10,12 +10,12 @@ form - + + - +