diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-04-26 10:19:27 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-04-26 10:19:27 +0530 |
| commit | f8917d90dbd019b7bcd893131ca51050b32e2e7a (patch) | |
| tree | 127d6875ea3847eb5c175cd124d5a72c70b193f2 | |
| parent | 77032d3dae62594478aa14ef2fe70534a2c4a710 (diff) | |
| parent | 8d240b5775da32dc41bb0d9b5fc7255d1b49ea78 (diff) | |
[MERGE]
bzr revid: apa@tinyerp.com-20120426044927-12rd6ervm605pzad
152 files changed, 3743 insertions, 1137 deletions
diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml index df754da7f90..6ee69184ce1 100644 --- a/addons/account/account_bank_view.xml +++ b/addons/account/account_bank_view.xml @@ -13,7 +13,7 @@ <field name="inherit_id" ref="base.view_partner_bank_form"/> <field name="arch" type="xml"> <group name="bank" position="after"> - <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}" groups="base.group_extended"> + <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}"> <separator string="Accounting Information" colspan="2"/> <field name="journal_id"/> <field name="currency_id"/> diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index 650bffc58e9..ecfc1c813b1 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -14,7 +14,7 @@ action="action_account_period_tree" id="menu_action_account_period_close_tree" parent="account.menu_account_end_year_treatments" - sequence="0" groups="base.group_extended"/> + sequence="0"/> </data> </openerp> diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index ca8530fb082..462e7d56937 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -39,7 +39,7 @@ <field name="quantity"/> <field name="uos_id"/> <field name="price_unit"/> - <field name="discount" groups="base.group_extended"/> + <field name="discount"/> <field name="price_subtotal"/> </tree> </field> @@ -60,7 +60,7 @@ </group> <field name="price_unit"/> <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/> - <field name="discount" groups="base.group_extended"/> + <field name="discount"/> <field domain="[('type','<>','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field name="company_id" groups="base.group_multi_company" readonly="1"/> <separator string="Notes" colspan="4"/> @@ -153,7 +153,7 @@ <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/> <newline/> <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}' domain="[('supplier', '=', True)]"/> - <field name="fiscal_position" groups="base.group_extended" widget="selection"/> + <field name="fiscal_position" widget="selection"/> <newline/> <field name="date_invoice"/> <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/> @@ -221,24 +221,24 @@ <field name="payment_term" widget="selection"/> <field name="name"/> <newline/> - <field name="origin" groups="base.group_extended"/> + <field name="origin"/> <field name="user_id"/> <field name="move_id" groups="account.group_account_user"/> <separator colspan="4" string="Additional Information"/> <field colspan="4" name="comment" nolabel="1"/> </page> - <page string="Payments" groups="base.group_extended"> + <page string="Payments"> <field name="payment_ids" colspan="4" nolabel="1" > <tree string="Payments"> <field name="date" string="Payment Date"/> <field name="move_id"/> <field name="ref"/> - <field name="name" groups="base.group_extended"/> + <field name="name"/> <field name="journal_id"/> <field name="debit"/> <field name="credit"/> - <field name="amount_currency" groups="base.group_extended"/> - <field name="currency_id" groups="base.group_extended"/> + <field name="amount_currency"/> + <field name="currency_id"/> </tree> </field> </page> @@ -262,14 +262,14 @@ <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/> <newline/> <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/> - <field name="fiscal_position" groups="base.group_extended" widget="selection" options='{"quick_create": false}'/> + <field name="fiscal_position" widget="selection" options='{"quick_create": false}'/> <newline/> <field name="date_invoice"/> <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/> <field name="payment_term" widget="selection"/> <newline/> <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/> - <field name="name" groups="base.group_extended"/> + <field name="name"/> </group> <notebook colspan="4"> <page string="Invoice"> @@ -316,8 +316,7 @@ <field name="date_due"/> <field name="user_id"/> <newline/> - <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id" - groups="base.group_extended"/> + <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/> <field name="origin"/> <field name="move_id" groups="account.group_account_user"/> <separator colspan="4" string="Additional Information"/> diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index f06a456037f..3713606c490 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -34,8 +34,7 @@ <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" /> <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" - parent="menu_finance_periodical_processing" sequence="15" - groups="base.group_extended"/> + parent="menu_finance_periodical_processing" sequence="15"/> <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 66e5201e214..7829dc91e03 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -18,7 +18,7 @@ <field name="date_start"/> <field name="date_stop"/> <field name="company_id" groups="base.group_multi_company"/> - <field name="end_journal_period_id" groups="base.group_extended"/> + <field name="end_journal_period_id"/> </group> <separator colspan="4" string="Periods"/> <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list"> @@ -169,7 +169,7 @@ <field name="parent_id"/> <field name="type" select="1"/> <field name="user_type" select="1"/> - <field name="active" groups="base.group_extended" /> + <field name="active"/> <newline/> <field name="debit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/> <field name="credit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/> @@ -403,7 +403,7 @@ <field name="help">Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it.</field> </record> - <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_journals" sequence="20" groups="base.group_extended"/> + <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_journals" sequence="20"/> <!-- # Account Journal @@ -476,16 +476,16 @@ <group colspan="2" col="2"> <separator string="Company" colspan="4"/> <field name="company_id" groups="base.group_multi_company"/> - <field name="user_id" groups="base.group_extended"/> - <field name="currency" groups="base.group_extended"/> + <field name="user_id"/> + <field name="currency"/> </group> - <group colspan="2" col="2" groups="base.group_extended"> + <group colspan="2" col="2"> <separator string="Validations" colspan="4"/> <field name="allow_date"/> </group> <group colspan="2" col="2"> <separator string="Other Configuration" colspan="4"/> - <field name="centralisation" groups="base.group_extended"/> + <field name="centralisation"/> <field name="entry_posted"/> </group> <group colspan="2" col="2"> @@ -498,7 +498,7 @@ <field name="sequence_id" required="0"/> </group> </page> - <page string="Entry Controls" groups="base.group_extended"> + <page string="Entry Controls"> <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/> <field colspan="4" name="type_control_ids" nolabel="1"/> <separator colspan="4" string="Accounts Allowed (empty for no control)"/> @@ -609,7 +609,7 @@ <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}"> <tree editable="bottom" string="Statement lines"> <field name="sequence" readonly="1" invisible="1"/> - <field name="date" groups="base.group_extended"/> + <field name="date"/> <field name="name"/> <field name="ref"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> @@ -938,7 +938,7 @@ <field name="arch" type="xml"> <tree string="Account Tax"> <field name="name"/> - <field name="price_include" groups="base.group_extended"/> + <field name="price_include"/> <field name="description"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> </tree> @@ -992,21 +992,21 @@ <field name="ref_base_sign"/> <field name="ref_tax_code_id"/> <field name="ref_tax_sign"/> - <separator groups="base.group_extended" colspan="4" string="Children Definition"/> - <field groups="base.group_extended" name="child_depend"/> - <field groups="base.group_extended" name="sequence"/> - <field groups="base.group_extended" name="include_base_amount"/> - <field groups="base.group_extended" colspan="4" name="child_ids"> + <separator colspan="4" string="Children Definition"/> + <field name="child_depend"/> + <field name="sequence"/> + <field name="include_base_amount"/> + <field colspan="4" name="child_ids"> <tree string="Account Tax"> <field name="sequence"/> <field name="name"/> - <field name="price_include" groups="base.group_extended"/> + <field name="price_include"/> <field name="description"/> </tree> </field> </group> </page> - <page groups="base.group_extended" string="Special Computation"> + <page string="Special Computation"> <separator colspan="4" string="Applicability Options"/> <field name="applicable_type"/> <field name="domain"/> @@ -1062,11 +1062,11 @@ <field name="journal_id"/> <field name="debit" sum="Total debit"/> <field name="credit" sum="Total credit"/> - <field name="account_tax_id" groups="base.group_extended"/> + <field name="account_tax_id"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/> - <field name="amount_currency" groups="base.group_extended" attrs="{'readonly':[('state','=','valid')]}"/> - <field name="currency_id" groups="base.group_extended" attrs="{'readonly':[('state','=','valid')]}"/> - <field name="reconcile_partial_id" groups="base.group_extended"/> + <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/> + <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}"/> + <field name="reconcile_partial_id"/> <field name="reconcile_id"/> <field name="state"/> </tree> @@ -1138,9 +1138,9 @@ <field name="blocked"/> </group> - <group col="2" colspan="2" groups="base.group_extended"> + <group col="2" colspan="2" groups="analytic.group_analytic_accounting"> <separator colspan="2" string="Analytic"/> - <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/> + <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/> </group> <separator string="Internal Note" colspan="4"/> <field name="narration" colspan="4" nolabel="1"/> @@ -1331,7 +1331,7 @@ <field name="journal_id"/> <field name="partner_id"/> <field name="amount" sum="Total Amount"/> - <field name="to_check" groups="base.group_extended"/> + <field name="to_check"/> <field name="state"/> <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/> </tree> @@ -1346,7 +1346,7 @@ <group colspan="4" col="6"> <field name="name" readonly="True"/> <field name="ref"/> - <field name="to_check" groups="base.group_extended"/> + <field name="to_check"/> <field name="journal_id"/> <field name="period_id"/> <field name="date"/> @@ -1419,9 +1419,9 @@ <field name="blocked"/> </group> - <group col="2" colspan="2" groups="base.group_extended"> + <group col="2" colspan="2" groups="analytic.group_analytic_accounting"> <separator colspan="2" string="Analytic"/> - <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/> + <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/> </group> <separator string="Internal Note" colspan="4"/> <field name="narration" colspan="4" nolabel="1"/> @@ -1441,13 +1441,13 @@ <field name="debit" sum="Total Debit"/> <field name="credit" sum="Total Credit"/> <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/> - <field name="amount_currency" groups="base.group_extended"/> - <field name="currency_id" groups="base.group_extended"/> + <field name="amount_currency"/> + <field name="currency_id"/> <field name="tax_code_id"/> <field name="tax_amount"/> <field name="state"/> <field name="reconcile_id"/> - <field name="reconcile_partial_id" groups="base.group_extended"/> + <field name="reconcile_partial_id"/> </tree> </field> <separator colspan="4" string="Internal Note"/> @@ -1473,7 +1473,7 @@ <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="Journal Entries to Review"/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/> <separator orientation="vertical"/> <field name="name"/> <field name="ref"/> @@ -1722,7 +1722,7 @@ </record> <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" - parent="account.menu_configuration_misc" groups="base.group_extended"/> + parent="account.menu_configuration_misc"/> <!-- # Payment Terms @@ -1939,7 +1939,6 @@ </record> <menuitem name="Define Recurring Entries" action="action_subscription_form" - groups="base.group_extended" id="menu_action_subscription_form" sequence="1" parent="account.menu_finance_recurrent_entries"/> @@ -2047,8 +2046,7 @@ id="act_account_partner_account_move_all" name="Receivables & Payables" res_model="account.move.line" - src_model="res.partner" - groups="base.group_extended"/> + src_model="res.partner"/> <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/> @@ -2282,15 +2280,15 @@ <page string="Tax Definition"> <field name="applicable_type"/> <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/> - <field groups="base.group_extended" name="include_base_amount"/> - <field groups="base.group_extended" name="domain"/> + <field name="include_base_amount"/> + <field name="domain"/> <newline/> <field name="account_collected_id"/> <label colspan="2" nolabel="1" string="Keep empty to use the income account"/> <field name="account_paid_id"/> <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/> - <field groups="base.group_extended" name="child_depend"/> - <field groups="base.group_extended" name="sequence"/> + <field name="child_depend"/> + <field name="sequence"/> </page> <page string="Tax Declaration"> <separator colspan="4" string="Invoices"/> @@ -2305,7 +2303,7 @@ <field name="ref_tax_code_id"/> <field name="ref_tax_sign"/> </page> - <page groups="base.group_extended" string="Special Computation"> + <page string="Special Computation"> <separator colspan="4" string="Compute Code (if type=code)"/> <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/> <separator colspan="4" string="Compute Code for Taxes included prices"/> @@ -2442,9 +2440,9 @@ </xpath> <group string="res_config_contents" position="replace"> <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> - <field name ="code_digits" groups="account.group_account_user"/> + <field name="code_digits" groups="account.group_account_user"/> <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/> - <field name ="seq_journal" groups="base.group_extended"/> + <field name="seq_journal"/> <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/> <field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/> <newline/> @@ -2456,12 +2454,12 @@ <form string="Bank Information"> <field name="acc_name"/> <field name="account_type"/> - <field name="currency_id" widget="selection" groups="base.group_extended"/> + <field name="currency_id" widget="selection"/> </form> <tree editable="bottom" string="Bank Information"> <field name="acc_name"/> <field name="account_type"/> - <field name="currency_id" widget="selection" groups="base.group_extended"/> + <field name="currency_id" widget="selection"/> </tree> </field> </group> @@ -2628,7 +2626,7 @@ action = pool.get('res.config').next(cr, uid, [], context) <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}"> <tree editable="bottom" string="Statement lines"> <field name="sequence" invisible="1"/> - <field name="date" groups="base.group_extended"/> + <field name="date"/> <field name="name"/> <field name="ref"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> @@ -2705,7 +2703,7 @@ action = pool.get('res.config').next(cr, uid, [], context) </group> <group col="8" colspan="4"> <field name="state" widget="statusbar" statusbar_visible="draft,confirm" colspan="4"/> - <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/> + <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object"/> <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/> <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/> </group> diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 037e90d1a77..7daa54b2ed8 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-04-24 03:35+0000\n" +"PO-Revision-Date: 2012-04-26 03:22+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-24 04:53+0000\n" -"X-Generator: Launchpad (build 15135)\n" +"X-Launchpad-Export-Date: 2012-04-26 04:41+0000\n" +"X-Generator: Launchpad (build 15149)\n" #. module: account #: view:account.invoice.report:0 @@ -181,7 +181,7 @@ msgstr "全ての分析エントリー" #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard msgid "Invoices Created Within Past 15 Days" -msgstr "過去15日以内に作成済み請求書" +msgstr "過去15日以内に作成済の請求書" #. module: account #: field:accounting.report,label_filter:0 @@ -366,7 +366,7 @@ msgid "" "OpenERP. Journal items are created by OpenERP if you use Bank Statements, " "Cash Registers, or Customer/Supplier payments." msgstr "" -"このビューはOpenERPの大量のエントリーを記録するために会計士によって利用されます。銀行明細書、キャッシュレジスター、または顧客 / " +"このビューはOpenERPの大量のエントリーを記録するために会計士によって利用されます。銀行取引明細書、キャッシュレジスター、または顧客 / " "仕入先支払いを利用する場合、仕訳帳項目はOpenERPによって作成されます。" #. module: account @@ -457,7 +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 @@ -575,7 +575,7 @@ 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 @@ -627,7 +627,7 @@ msgstr "税金マッピング" #. module: account #: report:account.central.journal:0 msgid "Centralized Journal" -msgstr "" +msgstr "一元化仕訳帳" #. module: account #: sql_constraint:account.sequence.fiscalyear:0 @@ -721,7 +721,7 @@ msgstr "請求書印刷" #. module: account #: field:account.partner.reconcile.process,today_reconciled:0 msgid "Partners Reconciled Today" -msgstr "" +msgstr "本日パートナ調整後" #. module: account #: view:report.hr.timesheet.invoice.journal:0 @@ -833,7 +833,7 @@ msgstr "自動調整" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 msgid "J.C./Move name" -msgstr "" +msgstr "J.C. / Move 名前" #. module: account #: model:ir.actions.act_window,help:account.action_account_gain_loss @@ -872,7 +872,7 @@ msgstr "これをチェックした場合、アカウントの新しいチャー msgid "" "Can not %s invoice which is already reconciled, invoice should be " "unreconciled first. You can only Refund this invoice" -msgstr "請求書 %s は既に調整済みのためできません。請求書は最初に未調整であるべきです。この請求書の返金のみができます。" +msgstr "請求書 %s は既に調整済のため変更できません。請求書は最初に未調整であるべきです。この請求書の返金のみができます。" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -980,7 +980,7 @@ msgstr "販売返金" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 msgid "Bank statement" -msgstr "銀行明細書" +msgstr "銀行取引明細書" #. module: account #: field:account.analytic.line,move_id:0 @@ -1157,7 +1157,7 @@ msgstr "期間の開始" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement" -msgstr "明細書の確認" +msgstr "取引明細書の確認" #. module: account #: help:account.account,foreign_balance:0 @@ -1248,7 +1248,7 @@ msgstr "この仕訳帳にはこの一般的なアカウントを使うことが #. module: account #: field:account.move.line.reconcile,trans_nbr:0 msgid "# of Transaction" -msgstr "取引番号" +msgstr "取引数" #. module: account #: report:account.general.ledger:0 @@ -1455,7 +1455,7 @@ msgstr "エントリー作成" #. module: account #: field:account.entries.report,nbr:0 msgid "# of Items" -msgstr "項目番号" +msgstr "項目数" #. module: account #: field:account.automatic.reconcile,max_amount:0 @@ -1498,7 +1498,7 @@ msgstr "" #. module: account #: view:account.entries.report:0 msgid "# of Entries " -msgstr "エントリー番号 " +msgstr "エントリー数 " #. module: account #: help:account.fiscal.position,active:0 @@ -1532,7 +1532,7 @@ msgstr "閉じた" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries msgid "Recurring Entries" -msgstr "" +msgstr "定期エントリー" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template @@ -1697,7 +1697,7 @@ msgstr "年間合計" #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." -msgstr "あなたが選択した測定単位は製品との互換性がありません。" +msgstr "あなたが選択した単位は製品との互換性がありません。" #. module: account #: view:account.change.currency:0 @@ -1722,7 +1722,7 @@ msgstr "保留中のアカウント" #. module: account #: view:account.tax.template:0 msgid "Tax Declaration" -msgstr "" +msgstr "税金申告" #. module: account #: help:account.journal.period,active:0 @@ -2432,7 +2432,7 @@ msgstr "請求書の税金のリストを表示する時に、並べ順を指定 #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" -msgstr "" +msgstr "基本コードの記号" #. module: account #: view:account.vat.declaration:0 @@ -2746,7 +2746,7 @@ msgstr "アカウント別売上" #. module: account #: view:account.use.model:0 msgid "This wizard will create recurring accounting entries" -msgstr "このウィザードは定期的な会計エントリーを作成します。" +msgstr "このウィザードは定期会計エントリーを作成します。" #. module: account #: code:addons/account/account.py:1321 @@ -2768,7 +2768,7 @@ msgstr "%s 仕訳帳に分析仕訳を定義しなければなりません。" msgid "" "You need an Opening journal with centralisation checked to set the initial " "balance!" -msgstr "初期残高を設定するために一元的にチェック済みの開始仕訳帳が必要です。" +msgstr "初期残高を設定するために一元的にチェック済の開始仕訳帳が必要です。" #. module: account #: view:account.invoice.tax:0 @@ -2865,7 +2865,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 @@ -3285,7 +3285,7 @@ msgstr "消費税:" #. module: account #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "無効なBBA構造のコミュニケーション" +msgstr "無効なBBA(ブロードバンドアクセス)構造の通信" #. module: account #: help:account.analytic.line,amount_currency:0 @@ -3386,7 +3386,7 @@ msgstr "ドラフト請求書" msgid "" "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' " "or 'Done' state!" -msgstr "選択した請求書は既にキャンセルあるいは完了状態であるためキャンセルできません。" +msgstr "選択した請求書は既にキャンセルあるいは終了状態であるためキャンセルできません。" #. module: account #: view:account.invoice.line:0 @@ -3582,7 +3582,7 @@ msgstr "" #: code:addons/account/account_move_line.py:837 #, python-format msgid "Some entries are already reconciled !" -msgstr "幾つかのエントリーは既に調整済みです。" +msgstr "幾つかのエントリーは既に調整済です。" #. module: account #: view:account.tax:0 @@ -4217,7 +4217,7 @@ msgid "" "* When all the payments are done it will be in 'Valid' state." msgstr "" "新しい移動行が作成された時はドラフト状態になります。\n" -"・ 全ての支払いが完了した時に、有効状態になります。" +"・ 全ての支払いが終了した時に、有効状態になります。" #. module: account #: field:account.journal,view_id:0 @@ -4756,7 +4756,7 @@ msgstr "銀行詳細" msgid "" "This report is analysis by partner. It is a PDF report containing one line " "per partner representing the cumulative credit balance." -msgstr "" +msgstr "このレポートはパートナによる分析です。それは累積する貸方残高を表すパートナ毎に1行のPDFレポートです。" #. module: account #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree @@ -5071,7 +5071,7 @@ msgstr "今期" #: field:account.analytic.line,product_uom_id:0 #: field:account.move.line,product_uom_id:0 msgid "UoM" -msgstr "測定単位" +msgstr "単位" #. module: account #: code:addons/account/wizard/account_invoice_refund.py:146 @@ -5186,7 +5186,7 @@ msgstr "分析エントリーの統計値" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Cash and Banks" -msgstr "" +msgstr "現金と銀行" #. module: account #: model:ir.model,name:account.model_account_installer @@ -5196,30 +5196,30 @@ msgstr "" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "" +msgstr "基本金額に含む" #. module: account #: help:account.payment.term.line,days:0 msgid "" "Number of days to add before computation of the day of month.If Date=15/01, " "Number of Days=22, Day of Month=-1, then the due date is 28/02." -msgstr "" +msgstr "月の日の計算前に加算する日数。日付が1月15日、日数は22日、月の日は -1、その時の期日は2月28日です。" #. module: account #: view:account.payment.term.line:0 msgid "Amount Computation" -msgstr "" +msgstr "金額計算" #. module: account #: view:account.journal:0 msgid "Entry Controls" -msgstr "" +msgstr "エントリー制御" #. module: account #: view:account.analytic.chart:0 #: view:project.account.analytic.line:0 msgid "(Keep empty to open the current situation)" -msgstr "" +msgstr "(現在の状態を開くために空のままとして下さい)" #. module: account #: field:account.analytic.balance,date1:0 @@ -5228,29 +5228,29 @@ msgstr "" #: field:account.analytic.inverted.balance,date1:0 #: field:account.analytic.journal.report,date1:0 msgid "Start of period" -msgstr "" +msgstr "期間の開始" #. module: account #: model:ir.model,name:account.model_account_common_account_report msgid "Account Common Account Report" -msgstr "" +msgstr "アカウント共通アカウントレポート" #. module: account #: field:account.bank.statement.line,name:0 #: field:account.invoice,reference:0 msgid "Communication" -msgstr "" +msgstr "通信" #. module: account #: model:ir.ui.menu,name:account.menu_analytic_accounting msgid "Analytic Accounting" -msgstr "" +msgstr "分析会計" #. module: account #: field:account.partner.ledger,initial_balance:0 #: field:account.report.general.ledger,initial_balance:0 msgid "Include Initial Balances" -msgstr "" +msgstr "初期残高を含む" #. module: account #: selection:account.invoice,type:0 @@ -5263,7 +5263,7 @@ msgstr "顧客返金" #: constraint:account.move:0 msgid "" "You can not create more than one move per period on centralized journal" -msgstr "" +msgstr "一元化仕訳帳上では期間毎に1回以上の移動を作成することは出来ません。" #. module: account #: field:account.tax,ref_tax_sign:0 @@ -5271,22 +5271,22 @@ msgstr "" #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" -msgstr "" +msgstr "税金コード記号" #. module: account #: model:ir.model,name:account.model_report_invoice_created msgid "Report of Invoices Created within Last 15 days" -msgstr "" +msgstr "過去15日以内に作成した請求書のレポート" #. module: account #: view:account.payment.term.line:0 msgid " Number of Days: 14" -msgstr "" +msgstr " 日数:14" #. module: account #: field:account.fiscalyear,end_journal_period_id:0 msgid "End of Year Entries Journal" -msgstr "" +msgstr "年度エントリー仕訳帳の末尾" #. module: account #: code:addons/account/account.py:3446 @@ -5299,12 +5299,12 @@ msgstr "" #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" -msgstr "" +msgstr "設定エラー。" #. module: account #: field:account.payment.term.line,value_amount:0 msgid "Amount To Pay" -msgstr "" +msgstr "支払金額" #. module: account #: help:account.partner.reconcile.process,to_reconcile:0 @@ -5312,17 +5312,17 @@ msgid "" "This is the remaining partners for who you should check if there is " "something to reconcile or not. This figure already count the current partner " "as reconciled." -msgstr "" +msgstr "これは調整有無によらず、何らかの確認しなければならない残りのパートナです。調整としてこの数値には既に現在のパートナが含まれています。" #. module: account #: view:account.subscription.line:0 msgid "Subscription lines" -msgstr "" +msgstr "サブスクリプション行" #. module: account #: field:account.entries.report,quantity:0 msgid "Products Quantity" -msgstr "" +msgstr "製品数量" #. module: account #: view:account.entries.report:0 @@ -5331,37 +5331,37 @@ msgstr "" #: selection:account.move,state:0 #: view:account.move.line:0 msgid "Unposted" -msgstr "" +msgstr "未記帳" #. module: account #: view:account.change.currency:0 #: model:ir.actions.act_window,name:account.action_account_change_currency #: model:ir.model,name:account.model_account_change_currency msgid "Change Currency" -msgstr "" +msgstr "通貨変更" #. module: account #: view:account.invoice:0 msgid "This action will erase taxes" -msgstr "" +msgstr "このアクションは税金を消去します。" #. module: account #: model:process.node,note:account.process_node_accountingentries0 #: model:process.node,note:account.process_node_supplieraccountingentries0 msgid "Accounting entries." -msgstr "" +msgstr "会計エントリー" #. module: account #: view:account.invoice:0 msgid "Payment Date" -msgstr "" +msgstr "支払日" #. module: account #: view:account.analytic.account:0 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form #: model:ir.ui.menu,name:account.account_analytic_def_account msgid "Analytic Accounts" -msgstr "" +msgstr "分析アカウント" #. module: account #: view:account.invoice.report:0 @@ -5374,7 +5374,7 @@ msgstr "顧客請求書と返金" #: field:account.model.line,amount_currency:0 #: field:account.move.line,amount_currency:0 msgid "Amount Currency" -msgstr "" +msgstr "通貨金額" #. module: account #: code:addons/account/wizard/account_validate_account_move.py:39 @@ -5382,12 +5382,12 @@ msgstr "" msgid "" "Specified Journal does not have any account move entries in draft state for " "this period" -msgstr "" +msgstr "指定された仕訳帳はこの期間にひとつもドラフト状態のアカウント移動エントリーを持っていません。" #. module: account #: model:ir.actions.act_window,name:account.action_view_move_line msgid "Lines to reconcile" -msgstr "" +msgstr "調整行" #. module: account #: report:account.analytic.account.balance:0 @@ -5402,22 +5402,22 @@ msgstr "" #: field:report.account.sales,quantity:0 #: field:report.account_type.sales,quantity:0 msgid "Quantity" -msgstr "" +msgstr "数量" #. module: account #: view:account.move.line:0 msgid "Number (Move)" -msgstr "" +msgstr "番号(移動)" #. module: account #: view:analytic.entries.report:0 msgid "Analytic Entries during last 7 days" -msgstr "" +msgstr "過去7日間の分析エントリー" #. module: account #: selection:account.financial.report,style_overwrite:0 msgid "Normal Text" -msgstr "" +msgstr "通常のテキスト" #. module: account #: view:account.invoice.refund:0 @@ -5429,14 +5429,14 @@ msgstr "返金請求書オプション" msgid "" "Number of partial amounts that can be combined to find a balance point can " "be chosen as the power of the automatic reconciliation" -msgstr "" +msgstr "バランスポイントを見つけるために組み合わせることのできる部分的な金額の数は、自動調整の能力として選択されます" #. module: account #: help:account.payment.term.line,sequence:0 msgid "" "The sequence field is used to order the payment term lines from the lowest " "sequences to the higher ones" -msgstr "" +msgstr "順序項目は低い順序から高いものへ支払期間行を並べるために使われます。" #. module: account #: view:account.fiscal.position.template:0 @@ -5449,7 +5449,7 @@ msgstr "会計ポジションテンプレート" #: view:account.chart:0 #: view:account.tax.chart:0 msgid "Open Charts" -msgstr "" +msgstr "チャートを開く" #. module: account #: view:account.fiscalyear.close.state:0 @@ -5459,6 +5459,8 @@ msgid "" "impossible any new entry record. Close a fiscal year when you need to " "finalize your end of year results definitive " msgstr "" +"会計年度上において追加エントリーを記録する必要がない時、ここから閉じることができます。それはどんな新しいレコードの入力も不可能にして、今年度の全ての開いて" +"いる期間を閉じます。最終的な年度末の結果を確定する必要がある場合は会計年度を閉じて下さい。 " #. module: account #: field:account.central.journal,amount_currency:0 @@ -5468,17 +5470,17 @@ msgstr "" #: field:account.print.journal,amount_currency:0 #: field:account.report.general.ledger,amount_currency:0 msgid "With Currency" -msgstr "" +msgstr "通貨で" #. module: account #: view:account.bank.statement:0 msgid "Open CashBox" -msgstr "" +msgstr "金庫を開く" #. module: account #: selection:account.financial.report,style_overwrite:0 msgid "Automatic formatting" -msgstr "" +msgstr "自動フォーマット" #. module: account #: code:addons/account/account.py:963 @@ -5487,106 +5489,108 @@ msgid "" "No fiscal year defined for this date !\n" "Please create one from the configuration of the accounting menu." msgstr "" +"この日付での会計年度が定義されていません。\n" +"会計メニューの設定からそれを作成して下さい。" #. module: account #: view:account.move.line.reconcile:0 msgid "Reconcile With Write-Off" -msgstr "" +msgstr "償却して調整" #. module: account #: selection:account.payment.term.line,value:0 #: selection:account.tax,type:0 msgid "Fixed Amount" -msgstr "" +msgstr "固定金額" #. module: account #: view:account.subscription:0 msgid "Valid Up to" -msgstr "" +msgstr "有効な最大値" #. module: account #: view:account.journal:0 msgid "Invoicing Data" -msgstr "" +msgstr "請求日" #. module: account #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile msgid "Account Automatic Reconcile" -msgstr "" +msgstr "アカウント自動調整" #. module: account #: view:account.move:0 #: view:account.move.line:0 msgid "Journal Item" -msgstr "" +msgstr "仕訳帳項目" #. module: account #: model:ir.model,name:account.model_account_move_journal msgid "Move journal" -msgstr "" +msgstr "仕訳帳移動" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close #: model:ir.ui.menu,name:account.menu_wizard_fy_close msgid "Generate Opening Entries" -msgstr "" +msgstr "開始エントリーの生成" #. module: account #: code:addons/account/account_move_line.py:759 #, python-format msgid "Already Reconciled!" -msgstr "" +msgstr "既に調整済です。" #. module: account #: help:account.tax,type:0 msgid "The computation method for the tax amount." -msgstr "税額のための計算方法" +msgstr "税額の計算方法" #. module: account #: view:account.payment.term.line:0 msgid "Due Date Computation" -msgstr "" +msgstr "期日計算" #. module: account #: field:report.invoice.created,create_date:0 msgid "Create Date" -msgstr "" +msgstr "作成日" #. module: account #: view:account.analytic.journal:0 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form #: model:ir.ui.menu,name:account.account_def_analytic_journal msgid "Analytic Journals" -msgstr "" +msgstr "分析仕訳帳" #. module: account #: field:account.account,child_id:0 msgid "Child Accounts" -msgstr "" +msgstr "子アカウント" #. module: account #: code:addons/account/account_move_line.py:1214 #, python-format msgid "Move name (id): %s (%s)" -msgstr "" +msgstr "移動名(ID):%s(%s)" #. module: account #: view:account.move.line.reconcile:0 #: code:addons/account/account_move_line.py:857 #, python-format msgid "Write-Off" -msgstr "" +msgstr "償却" #. module: account #: field:res.partner,debit:0 msgid "Total Payable" -msgstr "" +msgstr "買掛金合計" #. module: account #: model:account.account.type,name:account.data_account_type_income #: model:account.financial.report,name:account.account_financial_report_income0 msgid "Income" -msgstr "" +msgstr "収益" #. module: account #: selection:account.bank.statement.line,type:0 @@ -5595,7 +5599,7 @@ msgstr "" #: code:addons/account/account_invoice.py:339 #, python-format msgid "Supplier" -msgstr "" +msgstr "仕入先" #. module: account #: selection:account.entries.report,month:0 @@ -5604,12 +5608,12 @@ msgstr "" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "March" -msgstr "" +msgstr "3月" #. module: account #: view:account.account.template:0 msgid "Account Template" -msgstr "" +msgstr "アカウントテンプレート" #. module: account #: report:account.journal.period.print.sale.purchase:0 @@ -5619,18 +5623,18 @@ msgstr "消費税" #. module: account #: report:account.analytic.account.journal:0 msgid "Account n°" -msgstr "" +msgstr "アカウント番号" #. module: account #: code:addons/account/account_invoice.py:88 #, python-format msgid "Free Reference" -msgstr "" +msgstr "自由参照" #. module: account #: field:account.payment.term.line,value:0 msgid "Valuation" -msgstr "" +msgstr "評価" #. module: account #: selection:account.aged.trial.balance,result_selection:0 @@ -5640,23 +5644,23 @@ msgstr "" #: code:addons/account/report/account_partner_balance.py:301 #, python-format msgid "Receivable and Payable Accounts" -msgstr "" +msgstr "売掛金と買掛金" #. module: account #: field:account.fiscal.position.account.template,position_id:0 msgid "Fiscal Mapping" -msgstr "" +msgstr "会計マッピング" #. module: account #: model:ir.actions.act_window,name:account.action_account_state_open #: model:ir.model,name:account.model_account_state_open msgid "Account State Open" -msgstr "" +msgstr "アカウント状態を開く" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 msgid "Max Qty:" -msgstr "" +msgstr "最大数量" #. module: account #: view:account.invoice.refund:0 @@ -5666,7 +5670,7 @@ msgstr "返金請求書" #. module: account #: field:account.invoice,address_invoice_id:0 msgid "Invoice Address" -msgstr "" +msgstr "請求書住所" #. module: account #: model:ir.actions.act_window,help:account.action_account_entries_report_all @@ -5675,6 +5679,7 @@ msgid "" "document shows your debit and credit taking in consideration some criteria " "you can choose by using the search tool." msgstr "" +"このビューから異なる財務アカウントの分析を行います。このドキュメントは検索ツールを使って選択できる幾つかの基準で考察された借方と貸方を示します。" #. module: account #: model:ir.actions.act_window,help:account.action_tax_code_list @@ -5683,6 +5688,8 @@ msgid "" "OpenERP allows you to define the tax structure and manage it from this menu. " "You can define both numeric and alphanumeric tax codes." msgstr "" +"税金コードの定義はあなたの国の税金定義に依存します。OpenERPのこのメニューから税金構造と管理のための定義ができます。税金コードは数字と英数字の両方を" +"定義できます。" #. module: account #: help:account.partner.reconcile.process,progress:0 @@ -5690,6 +5697,8 @@ msgid "" "Shows you the progress made today on the reconciliation process. Given by \n" "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)" msgstr "" +"本日の調整処理の進捗状況を示してます。それは次式で計算されます。\n" +"本日のパートナ調整後 / (残りのパートナ + 本日のパートナ調整後 )" #. module: account #: help:account.payment.term.line,value:0 @@ -5698,6 +5707,8 @@ msgid "" "that you should have your last line with the type 'Balance' to ensure that " "the whole amount will be threated." msgstr "" +"ここではこの支払期間行に関連する評価の種類を選択して下さい。全体の金額が扱われることを保証するために、最終行が残高タイプを持つべきであることに注意して下さ" +"い。" #. module: account #: field:account.invoice,period_id:0 @@ -5705,13 +5716,13 @@ msgstr "" #: field:report.account.sales,period_id:0 #: field:report.account_type.sales,period_id:0 msgid "Force Period" -msgstr "" +msgstr "強制期間" #. module: account #: view:account.invoice.report:0 #: field:account.invoice.report,nbr:0 msgid "# of Lines" -msgstr "" +msgstr "行数" #. module: account #: field:account.aged.trial.balance,filter:0 @@ -5730,60 +5741,60 @@ msgstr "" #: field:accounting.report,filter:0 #: field:accounting.report,filter_cmp:0 msgid "Filter by" -msgstr "" +msgstr "フィルタ" #. module: account #: code:addons/account/account.py:2256 #, python-format msgid "You have a wrong expression \"%(...)s\" in your model !" -msgstr "" +msgstr "モデルの中に誤った式があります:%(...)s" #. module: account #: field:account.bank.statement.line,date:0 msgid "Entry Date" -msgstr "" +msgstr "入力日" #. module: account #: code:addons/account/account_move_line.py:1155 #: code:addons/account/account_move_line.py:1238 #, python-format msgid "You can not use an inactive account!" -msgstr "" +msgstr "非アクティブなアカウントを使うことはできません。" #. module: account #: code:addons/account/account_move_line.py:830 #, python-format msgid "Entries are not of the same account or already reconciled ! " -msgstr "" +msgstr "エントリーは同じアカウントのものでないか、または既に調整済です。 " #. module: account #: help:account.bank.statement,balance_end:0 msgid "Balance as calculated based on Starting Balance and transaction lines" -msgstr "" +msgstr "開始残高と取引行を基本に計算された残高" #. module: account #: code:addons/account/wizard/account_change_currency.py:64 #: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not configured properly !" -msgstr "" +msgstr "現在の通貨が正しく設定されていません。" #. module: account #: field:account.tax,account_collected_id:0 #: field:account.tax.template,account_collected_id:0 msgid "Invoice Tax Account" -msgstr "" +msgstr "請求書税金アカウント" #. module: account #: model:ir.actions.act_window,name:account.action_account_general_journal #: model:ir.model,name:account.model_account_general_journal msgid "Account General Journal" -msgstr "" +msgstr "アカウント一般仕訳帳" #. module: account #: field:account.payment.term.line,days:0 msgid "Number of Days" -msgstr "" +msgstr "日数" #. module: account #: code:addons/account/account_bank_statement.py:402 @@ -5791,41 +5802,41 @@ msgstr "" #: code:addons/account/wizard/account_period_close.py:51 #, python-format msgid "Invalid action !" -msgstr "" +msgstr "無効なアクションです。" #. module: account #: code:addons/account/wizard/account_move_journal.py:102 #, python-format msgid "Period: %s" -msgstr "" +msgstr "期間:%s" #. module: account #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer msgid "Review your Financial Journals" -msgstr "" +msgstr "財務仕訳帳のレビュー" #. module: account #: help:account.tax,name:0 msgid "This name will be displayed on reports" -msgstr "" +msgstr "この名前はレポートに表示されます。" #. module: account #: report:account.analytic.account.cost_ledger:0 #: report:account.analytic.account.quantity_cost_ledger:0 msgid "Printing date" -msgstr "" +msgstr "印刷日" #. module: account #: selection:account.account.type,close_method:0 #: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "None" -msgstr "" +msgstr "なし" #. module: account #: view:analytic.entries.report:0 msgid " 365 Days " -msgstr "" +msgstr " 365日 " #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree3 @@ -5836,28 +5847,28 @@ msgstr "顧客返金" #. module: account #: field:account.account,foreign_balance:0 msgid "Foreign Balance" -msgstr "" +msgstr "国外残高" #. module: account #: field:account.journal.period,name:0 msgid "Journal-Period Name" -msgstr "" +msgstr "仕訳帳期間名" #. module: account #: field:account.invoice.tax,factor_base:0 msgid "Multipication factor for Base code" -msgstr "" +msgstr "基本コードの倍率" #. module: account #: code:addons/account/wizard/account_report_common.py:150 #, python-format msgid "not implemented" -msgstr "" +msgstr "未実装" #. module: account #: help:account.journal,company_id:0 msgid "Company related to this journal" -msgstr "" +msgstr "この仕訳帳と関係する会社" #. module: account #: code:addons/account/wizard/account_invoice_state.py:44 @@ -5865,12 +5876,12 @@ msgstr "" msgid "" "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-" "Forma' state!" -msgstr "" +msgstr "選択された請求書はドラフトでもプロフォーマ状態でもないため確認できません。" #. module: account #: view:account.subscription:0 msgid "Running Subscription" -msgstr "" +msgstr "サブスクリプション期間中" #. module: account #: report:account.invoice:0 @@ -5882,12 +5893,12 @@ msgstr "会計ポジション注釈:" #: model:ir.actions.act_window,name:account.action_analytic_entries_report #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report msgid "Analytic Entries Analysis" -msgstr "" +msgstr "分析エントリーの分析" #. module: account #: selection:account.aged.trial.balance,direction_selection:0 msgid "Past" -msgstr "" +msgstr "過去" #. module: account #: constraint:account.account:0 @@ -5896,24 +5907,26 @@ msgid "" "You can not define children to an account with internal type different of " "\"View\"! " msgstr "" +"設定エラー。 \n" +"ビューと異なる内部タイプのアカウントには子を定義することはできません。 " #. module: account #: help:res.partner.bank,journal_id:0 msgid "" "This journal will be created automatically for this bank account when you " "save the record" -msgstr "" +msgstr "このレコードを保存する時に、この銀行口座のための仕訳帳が自動的に作成されます。" #. module: account #: view:account.analytic.line:0 msgid "Analytic Entry" -msgstr "" +msgstr "分析エントリー" #. module: account #: view:res.company:0 #: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" -msgstr "" +msgstr "支払延滞のメッセージ" #. module: account #: model:ir.actions.act_window,help:account.action_account_moves_all_a @@ -5929,7 +5942,7 @@ msgstr "" #. module: account #: field:account.entries.report,date_created:0 msgid "Date Created" -msgstr "" +msgstr "作成日" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form @@ -5939,68 +5952,68 @@ msgstr "" #. module: account #: view:account.invoice:0 msgid "(keep empty to use the current period)" -msgstr "" +msgstr "(当期を使う場合は空のままとして下さい)" #. module: account #: model:process.transition,note:account.process_transition_supplierreconcilepaid0 msgid "" "As soon as the reconciliation is done, the invoice's state turns to “done” " "(i.e. paid) in the system." -msgstr "" +msgstr "調整を終了するや否や、請求書の状態はシステム内で終了(すなわち支払済)となります。" #. module: account #: view:account.chart.template:0 #: field:account.chart.template,account_root_id:0 msgid "Root Account" -msgstr "" +msgstr "ルートアカウント" #. module: account #: field:res.partner,last_reconciliation_date:0 msgid "Latest Reconciliation Date" -msgstr "" +msgstr "最終調整日" #. module: account #: model:ir.model,name:account.model_account_analytic_line msgid "Analytic Line" -msgstr "" +msgstr "分析行" #. module: account #: field:product.template,taxes_id:0 msgid "Customer Taxes" -msgstr "" +msgstr "顧客の税金" #. module: account #: help:account.model,name:0 msgid "This is a model for recurring accounting entries" -msgstr "" +msgstr "これは定期会計エントリーのモデルです。" #. module: account #: field:wizard.multi.charts.accounts,sale_tax_rate:0 msgid "Sales Tax(%)" -msgstr "" +msgstr "消費税(%)" #. module: account #: view:account.addtmpl.wizard:0 msgid "Create an Account based on this template" -msgstr "" +msgstr "このテンプレートに基づくアカウントの作成" #. module: account #: view:account.account.type:0 #: view:account.tax.code:0 msgid "Reporting Configuration" -msgstr "" +msgstr "レポート設定" #. module: account #: field:account.tax,type:0 #: field:account.tax.template,type:0 msgid "Tax Type" -msgstr "" +msgstr "税金タイプ" #. module: account #: model:ir.actions.act_window,name:account.action_account_template_form #: model:ir.ui.menu,name:account.menu_action_account_template_form msgid "Account Templates" -msgstr "" +msgstr "アカウントテンプレート" #. module: account #: help:wizard.multi.charts.accounts,complete_tax_set:0 @@ -6010,26 +6023,28 @@ msgid "" "choice assumes that the set of tax defined for the chosen template is " "complete" msgstr "" +"このブール値はユーザに売買レートのコード化を提案する、あるいは通常のオーダーメイド項目を使うのどちらを望むかの選択を助けます。この最終選択は選択したテンプ" +"レート上に定義された税金のセットが完全であると想定しています。" #. module: account #: report:account.vat.declaration:0 msgid "Tax Statement" -msgstr "" +msgstr "税金明細書" #. module: account #: model:ir.model,name:account.model_res_company msgid "Companies" -msgstr "" +msgstr "会社" #. module: account #: view:account.invoice.report:0 msgid "Open and Paid Invoices" -msgstr "" +msgstr "開いていて支払済の請求書" #. module: account #: selection:account.financial.report,display_detail:0 msgid "Display children flat" -msgstr "" +msgstr "子を平坦に表示" #. module: account #: code:addons/account/account.py:629 @@ -6037,17 +6052,17 @@ msgstr "" msgid "" "You can not remove/desactivate an account which is set on a customer or " "supplier." -msgstr "" +msgstr "顧客や仕入先に設定されたアカウントを削除したり無効にすることはできません。" #. module: account #: help:account.fiscalyear.close.state,fy_id:0 msgid "Select a fiscal year to close" -msgstr "" +msgstr "閉じる会計年度の選択" #. module: account #: help:account.chart.template,tax_template_ids:0 msgid "List of all the taxes that have to be installed by the wizard" -msgstr "" +msgstr "ウィザードによりインストールされるべき全ての税金のリスト" #. module: account #: model:ir.actions.report.xml,name:account.account_intracom @@ -6057,17 +6072,17 @@ msgstr "" #. module: account #: view:account.move.line.reconcile.writeoff:0 msgid "Information addendum" -msgstr "" +msgstr "情報の追加" #. module: account #: field:account.chart,fiscalyear:0 msgid "Fiscal year" -msgstr "" +msgstr "会計年度" #. module: account #: view:account.move.reconcile:0 msgid "Partial Reconcile Entries" -msgstr "" +msgstr "部分調整エントリー" #. module: account #: view:account.addtmpl.wizard:0 @@ -6109,7 +6124,7 @@ msgstr "" #: view:validate.account.move.lines:0 #, python-format msgid "Cancel" -msgstr "" +msgstr "キャンセル" #. module: account #: selection:account.account,type:0 @@ -6117,52 +6132,52 @@ msgstr "" #: model:account.account.type,name:account.data_account_type_receivable #: selection:account.entries.report,type:0 msgid "Receivable" -msgstr "" +msgstr "売掛金" #. module: account #: constraint:account.move.line:0 msgid "Company must be the same for its related account and period." -msgstr "" +msgstr "会社は関連するアカウントと期間は同じでなければなりません。" #. module: account #: view:account.invoice:0 msgid "Other Info" -msgstr "" +msgstr "他の情報" #. module: account #: field:account.journal,default_credit_account_id:0 msgid "Default Credit Account" -msgstr "" +msgstr "デフォルト貸方勘定" #. module: account #: help:account.analytic.line,currency_id:0 msgid "The related account currency if not equal to the company one." -msgstr "" +msgstr "会社の通貨と等しくない場合は関連するアカウントの通貨" #. module: account #: view:account.analytic.account:0 msgid "Current" -msgstr "" +msgstr "現在" #. module: account #: view:account.bank.statement:0 msgid "CashBox" -msgstr "" +msgstr "金庫" #. module: account #: model:account.account.type,name:account.account_type_cash_equity msgid "Equity" -msgstr "" +msgstr "株式" #. module: account #: selection:account.tax,type:0 msgid "Percentage" -msgstr "" +msgstr "パーセンテージ" #. module: account #: selection:account.report.general.ledger,sortby:0 msgid "Journal & Partner" -msgstr "" +msgstr "仕訳帳とパートナ" #. module: account #: field:account.automatic.reconcile,power:0 @@ -6184,35 +6199,35 @@ msgstr "アカウント分析行の表示" #: field:account.invoice,internal_number:0 #: field:report.invoice.created,number:0 msgid "Invoice Number" -msgstr "" +msgstr "請求書番号" #. module: account #: help:account.tax,include_base_amount:0 msgid "" "Indicates if the amount of tax must be included in the base amount for the " "computation of the next taxes" -msgstr "" +msgstr "次回税金の計算のために基本金額に税額が含まれるべきかを示して下さい。" #. module: account #: model:ir.actions.act_window,name:account.action_account_partner_reconcile msgid "Reconciliation: Go to Next Partner" -msgstr "" +msgstr "調整:次のパートナへ" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance msgid "Inverted Analytic Balance" -msgstr "" +msgstr "反転分析残高" #. module: account #: field:account.tax.template,applicable_type:0 msgid "Applicable Type" -msgstr "" +msgstr "適切なタイプ" #. module: account #: field:account.invoice.line,invoice_id:0 msgid "Invoice Reference" -msgstr "" +msgstr "請求書参照" #. module: account #: help:account.tax.template,sequence:0 @@ -6221,19 +6236,21 @@ msgid "" "higher ones. The order is important if you have a tax that has several tax " "children. In this case, the evaluation order is important." msgstr "" +"この順序項目は低い順序から高い順序に税金行を並べるのに使用されます。幾つかの子の税金を持つ税金がある場合、この順序は重要です。このケースには評価順序が重要" +"となります。" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 #: view:account.journal:0 msgid "Liquidity" -msgstr "" +msgstr "流動性" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form #: model:ir.ui.menu,name:account.account_analytic_journal_entries msgid "Analytic Journal Items" -msgstr "" +msgstr "分析仕訳帳項目" #. module: account #: view:account.fiscalyear.close:0 @@ -6242,11 +6259,13 @@ msgid "" "year. Note that you can run this wizard many times for the same fiscal year: " "it will simply replace the old opening entries with the new ones." msgstr "" +"このウィザードは選択した会計年度の年度仕訳帳項目の終わりを生成します。このウィザードは同じ会計年度で何度も実行できることに注意して下さい:これは単純に古い" +"開始エントリーを新しいもので置き換えます。" #. module: account #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash msgid "Bank and Cash" -msgstr "" +msgstr "銀行と現金" #. module: account #: model:ir.actions.act_window,help:account.action_analytic_entries_report @@ -6256,16 +6275,18 @@ msgid "" "the tool search to analyse information about analytic entries generated in " "the system." msgstr "" +"このビューから、あなたのビジネスニーズへの適合を定義した分析アカウントに従った異なった分析エントリーの分析を行って下さい。システム内に生成された分析アカウ" +"ントについての情報を分析するために検索ツールを使用して下さい。" #. module: account #: sql_constraint:account.journal:0 msgid "The name of the journal must be unique per company !" -msgstr "" +msgstr "仕訳帳の名前は会社ごとに固有でなければなりません、" #. module: account #: field:account.account.template,nocreate:0 msgid "Optional create" -msgstr "" +msgstr "作成オプション" #. module: account #: code:addons/account/account.py:664 @@ -6273,13 +6294,13 @@ msgstr "" msgid "" "You cannot change the owner company of an account that already contains " "journal items." -msgstr "" +msgstr "既に仕訳帳項目に含めれるアカウントの所有会社を変更することはできません。" #. module: account #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 #, python-format msgid "Enter a Start date !" -msgstr "" +msgstr "開始日を入力して下さい。" #. module: account #: report:account.invoice:0 @@ -6292,12 +6313,12 @@ msgstr "仕入先返金" #. module: account #: model:ir.ui.menu,name:account.menu_dashboard_acc msgid "Dashboard" -msgstr "" +msgstr "ダッシュボード" #. module: account #: field:account.bank.statement,move_line_ids:0 msgid "Entry lines" -msgstr "" +msgstr "エントリー行" #. module: account #: field:account.move.line,centralisation:0 @@ -6325,34 +6346,34 @@ msgstr "一元化" #: view:account.tax.code.template:0 #: view:analytic.entries.report:0 msgid "Group By..." -msgstr "" +msgstr "グループ化…" #. module: account #: field:account.journal.column,readonly:0 msgid "Readonly" -msgstr "" +msgstr "リードオンリー" #. module: account #: view:account.payment.term.line:0 msgid " Valuation: Balance" -msgstr "" +msgstr " 評価:残高" #. module: account #: field:account.invoice.line,uos_id:0 msgid "Unit of Measure" -msgstr "" +msgstr "単位" #. module: account #: constraint:account.payment.term.line:0 msgid "" "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for " "2% " -msgstr "" +msgstr "支払条件行のパーセンテージは0から1まででなければなりません。例:0%の場合は、0.02 " #. module: account #: field:account.installer,has_default_company:0 msgid "Has Default Company" -msgstr "" +msgstr "デフォルト会社を持つ" #. module: account #: model:ir.model,name:account.model_account_sequence_fiscalyear @@ -6368,45 +6389,45 @@ msgstr "" #: model:ir.actions.report.xml,name:account.analytic_journal_print #: model:ir.model,name:account.model_account_analytic_journal msgid "Analytic Journal" -msgstr "" +msgstr "分析仕訳帳" #. module: account #: code:addons/account/account.py:622 #, python-format msgid "You can not desactivate an account that contains some journal items." -msgstr "" +msgstr "幾つかの仕訳帳項目を含むアカウントを無効にすることはできません。" #. module: account #: view:account.entries.report:0 msgid "Reconciled" -msgstr "" +msgstr "調整済" #. module: account #: report:account.invoice:0 #: field:account.invoice.tax,base:0 msgid "Base" -msgstr "" +msgstr "基本" #. module: account #: field:account.model,name:0 msgid "Model Name" -msgstr "" +msgstr "モデル名" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "" +msgstr "経費分類のアカウント" #. module: account #: view:account.bank.statement:0 msgid "Cash Transactions" -msgstr "" +msgstr "現金取引" #. module: account #: code:addons/account/wizard/account_state_open.py:37 #, python-format msgid "Invoice is already reconciled" -msgstr "" +msgstr "請求書は既に調整済です。" #. module: account #: view:account.account:0 @@ -6419,41 +6440,41 @@ msgstr "" #: view:account.invoice.line:0 #: field:account.invoice.line,note:0 msgid "Notes" -msgstr "" +msgstr "注記" #. module: account #: model:ir.model,name:account.model_analytic_entries_report msgid "Analytic Entries Statistics" -msgstr "" +msgstr "分析エントリーの統計値" #. module: account #: code:addons/account/account.py:624 #, python-format msgid "You can not remove an account containing journal items." -msgstr "" +msgstr "仕訳帳項目を含むアカウントは削除できません。" #. module: account #: code:addons/account/account_analytic_line.py:145 #: code:addons/account/account_move_line.py:933 #, python-format msgid "Entries: " -msgstr "" +msgstr "エントリー: " #. module: account #: view:account.use.model:0 msgid "Create manual recurring entries in a chosen journal." -msgstr "" +msgstr "選択された仕訳帳の中に手作業で定期エントリー作成して下さい。" #. module: account #: help:res.partner.bank,currency_id:0 msgid "Currency of the related account journal." -msgstr "" +msgstr "関連するアカウント仕訳帳の通貨です。" #. module: account #: code:addons/account/account.py:1563 #, python-format msgid "Couldn't create move between different companies" -msgstr "" +msgstr "異なる会社の間に移動の作成はできませんでした。" #. module: account #: model:ir.actions.act_window,help:account.action_account_type_form @@ -6489,39 +6510,39 @@ msgstr "銀行照合は、銀行取引明細書が会計システムのそのア #. module: account #: model:process.node,note:account.process_node_draftstatement0 msgid "State is draft" -msgstr "" +msgstr "ドラフト状態" #. module: account #: view:account.move.line:0 #: code:addons/account/account_move_line.py:1043 #, python-format msgid "Total debit" -msgstr "" +msgstr "借方合計" #. module: account #: code:addons/account/account_move_line.py:808 #, python-format msgid "Entry \"%s\" is not valid !" -msgstr "" +msgstr "エントリー %s は有効ではありません。" #. module: account #: report:account.invoice:0 msgid "Fax :" -msgstr "" +msgstr "FAX:" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "" "This will automatically configure your chart of accounts, bank accounts, " "taxes and journals according to the selected template" -msgstr "" +msgstr "これは自動的に選択したテンプレートにしたがって、勘定科目表、銀行口座、税金、仕訳帳を設定します。" #. module: account #: help:res.partner,property_account_receivable:0 msgid "" "This account will be used instead of the default one as the receivable " "account for the current partner" -msgstr "" +msgstr "このアカウントは現在のパートナのためにデフォルトアカウントの代わりに売掛金アカウントとして使用されます。" #. module: account #: field:account.tax,python_applicable:0 @@ -6532,29 +6553,29 @@ msgstr "" #: field:account.tax.template,python_compute:0 #: selection:account.tax.template,type:0 msgid "Python Code" -msgstr "" +msgstr "Pythonコード" #. module: account #: view:account.entries.report:0 msgid "Journal Entries with period in current period" -msgstr "" +msgstr "当期の仕訳帳エントリー" #. module: account #: help:account.journal,update_posted:0 msgid "" "Check this box if you want to allow the cancellation the entries related to " "this journal or of the invoice related to this journal" -msgstr "" +msgstr "この仕訳帳に関連するエントリー、またはこの仕訳帳に関連する請求書のキャンセルを許す場合は、このボックスをチェックして下さい。" #. module: account #: view:account.fiscalyear.close:0 msgid "Create" -msgstr "" +msgstr "作成" #. module: account #: model:process.transition.action,name:account.process_transition_action_createentries0 msgid "Create entry" -msgstr "" +msgstr "エントリー作成" #. module: account #: selection:account.account.type,report_type:0 @@ -6592,46 +6613,46 @@ msgstr "損益計算書(費用勘定)" #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" -msgstr "" +msgstr "エラー" #. module: account #: field:account.financial.report,style_overwrite:0 msgid "Financial Report Style" -msgstr "" +msgstr "財務レポートのスタイル" #. module: account #: selection:account.financial.report,sign:0 msgid "Preserve balance sign" -msgstr "" +msgstr "残高符号の維持" #. module: account #: view:account.vat.declaration:0 #: model:ir.actions.report.xml,name:account.account_vat_declaration #: model:ir.ui.menu,name:account.menu_account_vat_declaration msgid "Taxes Report" -msgstr "" +msgstr "税金レポート" #. module: account #: selection:account.journal.period,state:0 msgid "Printed" -msgstr "" +msgstr "印刷済" #. module: account #: code:addons/account/account_move_line.py:584 #: code:addons/account/account_move_line.py:591 #, python-format msgid "Error :" -msgstr "" +msgstr "エラー:" #. module: account #: view:account.analytic.line:0 msgid "Project line" -msgstr "" +msgstr "プロジェクト行" #. module: account #: field:account.invoice.tax,manual:0 msgid "Manual" -msgstr "" +msgstr "手動" #. module: account #: view:account.automatic.reconcile:0 @@ -6649,7 +6670,7 @@ msgstr "" #: view:account.move:0 #: field:account.move,to_check:0 msgid "To Review" -msgstr "" +msgstr "レビュー" #. module: account #: help:account.partner.ledger,initial_balance:0 @@ -6659,6 +6680,7 @@ msgid "" "row to display the amount of debit/credit/balance that precedes the filter " "you've set." msgstr "" +"日付あるいは期間によるフィルタを選択した場合、この項目は、あなたが設定したフィルタに優先して借方 / 貸方 / 残高の金額を表示する列の追加ができます。" #. module: account #: view:account.bank.statement:0 @@ -6667,7 +6689,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Journal Entries" -msgstr "" +msgstr "仕訳帳エントリー" #. module: account #: help:account.partner.ledger,page_split:0 @@ -6682,6 +6704,8 @@ msgid "" "some non legal fields or you must unreconcile first!\n" "%s" msgstr "" +"調整済エントリーにはこの変更はできません。変更できるのは幾つかの非法定項目のみです。または最初に未調整にしなければなりません。\n" +"%s" #. module: account #: report:account.general.ledger:0 @@ -6689,7 +6713,7 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "JRNL" -msgstr "" +msgstr "仕訳帳" #. module: account #: view:account.partner.balance:0 @@ -6697,14 +6721,14 @@ msgstr "" msgid "" "This report is an analysis done by a partner. It is a PDF report containing " "one line per partner representing the cumulative credit balance" -msgstr "" +msgstr "このレポートはパートナによって行われた分析です。それは累積する貸方残高を表すパートナ毎に1行のPDFレポートです。" #. module: account #: code:addons/account/wizard/account_validate_account_move.py:61 #, python-format msgid "" "Selected Entry Lines does not have any account move enties in draft state" -msgstr "" +msgstr "選択エントリー行はドラフト状態でありどんなアカウント移動エントリーも持っていません。" #. module: account #: selection:account.aged.trial.balance,target_move:0 @@ -6727,18 +6751,18 @@ msgstr "" #: code:addons/account/report/common_report_header.py:67 #, python-format msgid "All Entries" -msgstr "" +msgstr "全エントリー" #. module: account #: constraint:product.template:0 msgid "" "Error: The default UOM and the purchase UOM must be in the same category." -msgstr "" +msgstr "エラー:デフォルトの単位と発注単位は同じ分類でなければいけません。" #. module: account #: view:account.journal.select:0 msgid "Journal Select" -msgstr "" +msgstr "仕訳帳選択" #. module: account #: view:account.bank.statement:0 @@ -6746,12 +6770,12 @@ msgstr "" #: code:addons/account/account.py:432 #, python-format msgid "Opening Balance" -msgstr "" +msgstr "開始残高" #. module: account #: model:ir.model,name:account.model_account_move_reconcile msgid "Account Reconciliation" -msgstr "" +msgstr "調整アカウント" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax @@ -6767,12 +6791,12 @@ msgstr "税金会計ポジション" #: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" -msgstr "" +msgstr "総勘定元帳" #. module: account #: model:process.transition,note:account.process_transition_paymentorderbank0 msgid "The payment order is sent to the bank." -msgstr "" +msgstr "支払オーダーは銀行に送信されます" #. module: account #: view:account.balance.report:0 @@ -6787,23 +6811,23 @@ msgstr "このレポートは1枚のレポートでアカウントのそれぞ msgid "" "Check this box if you are unsure of that journal entry and if you want to " "note it as 'to be reviewed' by an accounting expert." -msgstr "" +msgstr "その仕訳帳エントリーに確信がなく、会計専門家によるレビューされることを付記したい場合はこのボックスをチェックして下さい。" #. module: account #: field:account.chart.template,complete_tax_set:0 #: field:wizard.multi.charts.accounts,complete_tax_set:0 msgid "Complete Set of Taxes" -msgstr "" +msgstr "税金の完全なセット" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "属性" #. module: account #: model:ir.model,name:account.model_account_tax_chart msgid "Account tax chart" -msgstr "" +msgstr "会計税金表" #. module: account #: constraint:res.partner.bank:0 @@ -6812,6 +6836,8 @@ msgid "" "Please define BIC/Swift code on bank for bank type IBAN Account to make " "valid payments" msgstr "" +"\n" +"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC/Swiftコードを定義して下さい。" #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -6823,7 +6849,7 @@ msgstr "" #: report:account.journal.period.print.sale.purchase:0 #: report:account.partner.balance:0 msgid "Total:" -msgstr "" +msgstr "合計:" #. module: account #: code:addons/account/account.py:2229 @@ -6838,6 +6864,14 @@ msgid "" "\n" "e.g. My model on %(date)s" msgstr "" +"次のラベルを利用してモデルの名前により年、月、日付を指定できます:You can specify year, month and date in the " +"name of the model using the following labels:\n" +"\n" +"%(year)s:年の指定\n" +"%(month)s:月の指定\n" +"%(date)s:現在の日付\n" +"\n" +"例えば、%(date)s の私のモデル" #. module: account #: model:ir.actions.act_window,name:account.action_aged_income @@ -6847,47 +6881,47 @@ msgstr "損益勘定" #. module: account #: help:report.invoice.created,origin:0 msgid "Reference of the document that generated this invoice report." -msgstr "" +msgstr "この請求書レポートを生成したドキュメントの参照" #. module: account #: field:account.tax.code,child_ids:0 #: field:account.tax.code.template,child_ids:0 msgid "Child Codes" -msgstr "" +msgstr "子コード" #. module: account #: view:account.tax.template:0 msgid "Taxes used in Sales" -msgstr "" +msgstr "受注で使われる税金" #. module: account #: code:addons/account/account_invoice.py:495 #: code:addons/account/wizard/account_invoice_refund.py:145 #, python-format msgid "Data Insufficient !" -msgstr "" +msgstr "データが不足しています。" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1 msgid "Customer Invoices" -msgstr "" +msgstr "顧客請求書" #. module: account #: field:account.move.line.reconcile,writeoff:0 msgid "Write-Off amount" -msgstr "" +msgstr "償却勘定" #. module: account #: view:account.analytic.line:0 msgid "Sales" -msgstr "" +msgstr "受注" #. module: account #: view:account.journal.column:0 #: model:ir.model,name:account.model_account_journal_column msgid "Journal Column" -msgstr "" +msgstr "仕訳帳カラム" #. module: account #: selection:account.invoice.report,state:0 @@ -6895,7 +6929,7 @@ msgstr "" #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 msgid "Done" -msgstr "" +msgstr "終了" #. module: account #: model:ir.actions.act_window,help:account.action_bank_tree @@ -6905,6 +6939,8 @@ msgid "" "accounting application of OpenERP, journals and accounts will be created " "automatically based on these data." msgstr "" +"会社の銀行口座を設定して、そしてレポートフッターに現れるべきそれを選択して下さい。リストビューの中の銀行を並べ替えることが出来ます。OpenERPの会計ア" +"プリケーションを使用する場合は、仕訳帳とアカウントはそれらのデータを基に自動的に作成されます。" #. module: account #: model:process.transition,note:account.process_transition_invoicemanually0 @@ -6929,13 +6965,13 @@ msgstr "" #: field:account.invoice,origin:0 #: field:report.invoice.created,origin:0 msgid "Source Document" -msgstr "" +msgstr "基となるドキュメント" #. module: account #: code:addons/account/account.py:1432 #, python-format msgid "You can not delete a posted journal entry \"%s\"!" -msgstr "" +msgstr "記帳された仕訳帳エントリー %s を削除することはできません。" #. module: account #: selection:account.partner.ledger,filter:0 @@ -6943,27 +6979,27 @@ msgstr "" #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled #, python-format msgid "Unreconciled Entries" -msgstr "" +msgstr "未調整エントリー" #. module: account #: model:ir.ui.menu,name:account.menu_menu_Bank_process msgid "Statements Reconciliation" -msgstr "" +msgstr "取引明細書調整" #. module: account #: model:ir.model,name:account.model_accounting_report msgid "Accounting Report" -msgstr "" +msgstr "会計レポート" #. module: account #: report:account.invoice:0 msgid "Taxes:" -msgstr "" +msgstr "税金:" #. module: account #: help:account.tax,amount:0 msgid "For taxes of type percentage, enter % ratio between 0-1." -msgstr "" +msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力して下さい。" #. module: account #: model:ir.actions.act_window,help:account.action_subscription_form @@ -6973,18 +7009,20 @@ msgid "" "an agreement with a customer or a supplier. With Define Recurring Entries, " "you can create such entries to automate the postings in the system." msgstr "" +"定期エントリーは特定の日付に基づき定期的に発生する、すなわち、顧客や仕入先との契約や合意の署名に対応する雑多なエントリーです。定期エントリーを定義すると、" +"システム内で自動的に記帳するエントリーを作成することができます。" #. module: account #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy msgid "Financial Reports Hierarchy" -msgstr "" +msgstr "財務レポートの階層" #. module: account #: field:account.entries.report,product_uom_id:0 #: view:analytic.entries.report:0 #: field:analytic.entries.report,product_uom_id:0 msgid "Product UOM" -msgstr "" +msgstr "製品単位" #. module: account #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree @@ -6994,6 +7032,8 @@ msgid "" "basis. You can enter the coins that are in your cash box, and then post " "entries when money comes in or goes out of the cash box." msgstr "" +"キャッシュレジスタは現金仕訳帳の現金エントリーを管理することができます。この機能は日々の現金支払いを追跡する簡単な方法を提供します。現金箱の中にはコインを" +"入れることができ、そして、現金箱へのお金の出入りがある時に、エントリーを記帳することができます。" #. module: account #: help:account.invoice.refund,date:0 @@ -7005,34 +7045,34 @@ msgstr "返金請求書と期間のための請求日付として使用される #. module: account #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation msgid "Monthly Turnover" -msgstr "" +msgstr "月次売上高" #. module: account #: view:account.move:0 #: view:account.move.line:0 msgid "Analytic Lines" -msgstr "" +msgstr "分析行" #. module: account #: field:account.analytic.journal,line_ids:0 #: field:account.tax.code,line_ids:0 msgid "Lines" -msgstr "" +msgstr "行" #. module: account #: view:account.tax.template:0 msgid "Account Tax Template" -msgstr "" +msgstr "アカウント税金テンプレート" #. module: account #: view:account.journal.select:0 msgid "Are you sure you want to open Journal Entries?" -msgstr "" +msgstr "仕訳帳エントリーを本当に開きますか?" #. module: account #: view:account.state.open:0 msgid "Are you sure you want to open this invoice ?" -msgstr "" +msgstr "この請求書を本当に開きますか?" #. module: account #: code:addons/account/account_invoice.py:528 @@ -7041,7 +7081,7 @@ msgstr "" msgid "" "Can not find a chart of account, you should create one from the " "configuration of the accounting menu." -msgstr "" +msgstr "勘定科目表を見つけることができません。会計メニューの設定からそれを作成する必要があります。" #. module: account #: field:account.chart.template,property_account_expense_opening:0 @@ -7052,17 +7092,17 @@ msgstr "費用勘定エントリーを開く" #: code:addons/account/account_move_line.py:999 #, python-format msgid "Accounting Entries" -msgstr "" +msgstr "会計エントリー" #. module: account #: field:account.account.template,parent_id:0 msgid "Parent Account Template" -msgstr "" +msgstr "親アカウントテンプレート" #. module: account #: model:ir.actions.act_window,name:account.action_account_configuration_installer msgid "Install your Chart of Accounts" -msgstr "" +msgstr "会計表のインストール" #. module: account #: view:account.bank.statement:0 @@ -7070,12 +7110,12 @@ msgstr "" #: field:account.move.line,statement_id:0 #: model:process.process,name:account.process_process_statementprocess0 msgid "Statement" -msgstr "" +msgstr "取引明細書" #. module: account #: help:account.journal,default_debit_account_id:0 msgid "It acts as a default account for debit amount" -msgstr "" +msgstr "これは借方金額のデフォルトアカウントとして動作します。" #. module: account #: model:ir.actions.act_window,help:account.action_account_journal_period_tree @@ -7083,16 +7123,17 @@ msgid "" "You can search for individual account entries through useful information. To " "search for account entries, open a journal, then select a record line." msgstr "" +"有益な情報を介して個別のアカウントエントリーのための検索ができます。アカウントエントリーの検索のためには仕訳帳を開き、そしてレコード行を選択して下さい。" #. module: account #: view:account.entries.report:0 msgid "Posted entries" -msgstr "" +msgstr "記帳済エントリー" #. module: account #: help:account.payment.term.line,value_amount:0 msgid "For percent enter a ratio between 0-1." -msgstr "" +msgstr "パーセントは0から1までの比率を入力して下さい。" #. module: account #: report:account.invoice:0 @@ -7100,17 +7141,17 @@ msgstr "" #: field:account.invoice,date_invoice:0 #: field:report.invoice.created,date_invoice:0 msgid "Invoice Date" -msgstr "" +msgstr "請求日" #. module: account #: view:account.invoice.report:0 msgid "Group by year of Invoice Date" -msgstr "" +msgstr "請求日の年毎のグループ" #. module: account #: help:res.partner,credit:0 msgid "Total amount this customer owes you." -msgstr "" +msgstr "この顧客はあなたに合計金額の支払義務があります。" #. module: account #: model:ir.model,name:account.model_ir_sequence @@ -7120,18 +7161,18 @@ msgstr "" #. module: account #: field:account.journal.period,icon:0 msgid "Icon" -msgstr "" +msgstr "アイコン" #. module: account #: view:account.automatic.reconcile:0 #: view:account.use.model:0 msgid "Ok" -msgstr "" +msgstr "OK" #. module: account #: field:account.chart.template,tax_code_root_id:0 msgid "Root Tax Code" -msgstr "" +msgstr "ルート税金コード" #. module: account #: help:account.journal,centralisation:0 @@ -7146,7 +7187,7 @@ msgstr "" #. module: account #: field:account.bank.statement,closing_date:0 msgid "Closed On" -msgstr "" +msgstr "閉鎖済" #. module: account #: model:ir.model,name:account.model_account_bank_statement_line @@ -7156,12 +7197,12 @@ msgstr "銀行取引明細書行" #. module: account #: field:account.automatic.reconcile,date2:0 msgid "Ending Date" -msgstr "" +msgstr "終了日" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 msgid "Default Purchase Tax" -msgstr "" +msgstr "デフォルト消費税" #. module: account #: field:account.chart.template,property_account_income_opening:0 @@ -7171,7 +7212,7 @@ msgstr "損益勘定の開始エントリー" #. module: account #: view:account.bank.statement:0 msgid "Confirm" -msgstr "" +msgstr "確認" #. module: account #: help:account.tax,domain:0 @@ -7179,38 +7220,38 @@ msgstr "" msgid "" "This field is only used if you develop your own module allowing developers " "to create specific taxes in a custom domain." -msgstr "" +msgstr "この項目は、カスタムドメイン内に特別な税金を作成することを許された開発者によって、あなた自身のモジュールを開発する場合にのみ使われます" #. module: account #: code:addons/account/account.py:1088 #, python-format msgid "You should have chosen periods that belongs to the same company" -msgstr "" +msgstr "同じ会社に属する期間を選択すべきです。" #. module: account #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer msgid "Review your Payment Terms" -msgstr "" +msgstr "支払条件をレビュー" #. module: account #: field:account.fiscalyear.close,report_name:0 msgid "Name of new entries" -msgstr "" +msgstr "新エントリーの名前" #. module: account #: view:account.use.model:0 msgid "Create Entries" -msgstr "" +msgstr "エントリーの作成" #. module: account #: view:res.partner:0 msgid "Information About the Bank" -msgstr "" +msgstr "銀行に関する情報" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reporting msgid "Reporting" -msgstr "" +msgstr "レポート" #. module: account #: code:addons/account/account_move_line.py:759 @@ -7222,29 +7263,29 @@ msgstr "" #: code:addons/account/wizard/account_validate_account_move.py:61 #, python-format msgid "Warning" -msgstr "" +msgstr "警告" #. module: account #: model:ir.actions.act_window,name:account.action_analytic_open msgid "Contracts/Analytic Accounts" -msgstr "" +msgstr "契約 / 分析アカウント" #. module: account #: field:account.bank.statement,ending_details_ids:0 msgid "Closing Cashbox" -msgstr "" +msgstr "現金箱を閉じる" #. module: account #: view:account.journal:0 #: field:res.partner.bank,journal_id:0 msgid "Account Journal" -msgstr "" +msgstr "アカウント仕訳帳" #. module: account #: model:process.node,name:account.process_node_paidinvoice0 #: model:process.node,name:account.process_node_supplierpaidinvoice0 msgid "Paid invoice" -msgstr "" +msgstr "支払済請求書" #. module: account #: help:account.partner.reconcile.process,next_partner_id:0 @@ -7252,23 +7293,23 @@ msgid "" "This field shows you the next partner that will be automatically chosen by " "the system to go through the reconciliation process, based on the latest day " "it have been reconciled." -msgstr "" +msgstr "この項目は調整済の最終日を基準に調整処理を通過することでシステムによって自動的に選択された次のパートナを示します。" #. module: account #: field:account.move.line.reconcile.writeoff,comment:0 msgid "Comment" -msgstr "" +msgstr "コメント" #. module: account #: field:account.tax,domain:0 #: field:account.tax.template,domain:0 msgid "Domain" -msgstr "" +msgstr "ドメイン" #. module: account #: model:ir.model,name:account.model_account_use_model msgid "Use model" -msgstr "" +msgstr "モデルの使用" #. module: account #: code:addons/account/account.py:429 @@ -7292,28 +7333,28 @@ msgstr "" #: field:account.invoice.tax,invoice_id:0 #: model:ir.model,name:account.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "請求行" #. module: account #: view:account.invoice.report:0 msgid "Customer And Supplier Refunds" -msgstr "顧客と仕入先返金" +msgstr "顧客返金と仕入先返金" #. module: account #: field:account.financial.report,sign:0 msgid "Sign on Reports" -msgstr "" +msgstr "レポートに署名" #. module: account #: code:addons/account/wizard/account_fiscalyear_close.py:73 #, python-format msgid "The periods to generate opening entries were not found" -msgstr "" +msgstr "開始エントリーを生成するための期間が見つかりませんでした。" #. module: account #: model:account.account.type,name:account.data_account_type_view msgid "Root/View" -msgstr "" +msgstr "ルート / ビュー" #. module: account #: code:addons/account/account.py:3121 @@ -7325,36 +7366,36 @@ msgstr "" #: report:account.invoice:0 #: view:account.invoice:0 msgid "PRO-FORMA" -msgstr "" +msgstr "プロフォーマ" #. module: account #: selection:account.entries.report,move_line_state:0 #: view:account.move.line:0 #: selection:account.move.line,state:0 msgid "Unbalanced" -msgstr "" +msgstr "アンバランス" #. module: account #: selection:account.move.line,centralisation:0 msgid "Normal" -msgstr "" +msgstr "通常" #. module: account #: model:ir.actions.act_window,name:account.action_email_templates #: model:ir.ui.menu,name:account.menu_email_templates msgid "Email Templates" -msgstr "" +msgstr "Eメールテンプレート" #. module: account #: view:account.move.line:0 msgid "Optional Information" -msgstr "" +msgstr "オプション情報" #. module: account #: code:addons/account/wizard/account_fiscalyear_close.py:84 #, python-format msgid "The journal must have default credit and debit account" -msgstr "" +msgstr "仕訳帳はデフォルトの貸方、借方アカウントを持つ必要があります。" #. module: account #: report:account.general.journal:0 @@ -7364,42 +7405,42 @@ msgstr "" #. module: account #: selection:account.account,currency_mode:0 msgid "At Date" -msgstr "" +msgstr "日付" #. module: account #: help:account.move.line,date_maturity:0 msgid "" "This field is used for payable and receivable journal entries. You can put " "the limit date for the payment of this line." -msgstr "" +msgstr "この項目は買掛金と売掛金仕訳帳エントリーのために使用されます。この行の支払のための期限の日付を設定することができます。" #. module: account #: model:ir.ui.menu,name:account.menu_multi_currency msgid "Multi-Currencies" -msgstr "" +msgstr "多通貨" #. module: account #: field:account.model.line,date_maturity:0 msgid "Maturity Date" -msgstr "" +msgstr "満期日" #. module: account #: code:addons/account/account_move_line.py:1302 #, python-format msgid "Bad account !" -msgstr "" +msgstr "良質でないアカウント" #. module: account #: code:addons/account/account.py:3108 #, python-format msgid "Sales Journal" -msgstr "" +msgstr "受注仕訳帳" #. module: account #: code:addons/account/wizard/account_move_journal.py:104 #, python-format msgid "Open Journal Items !" -msgstr "" +msgstr "仕訳帳項目を開く" #. module: account #: model:ir.model,name:account.model_account_invoice_tax @@ -7906,7 +7947,7 @@ msgstr "" #. module: account #: report:account.analytic.account.inverted.balance:0 msgid "Inverted Analytic Balance -" -msgstr "" +msgstr "反転分析残高 -" #. module: account #: view:account.move.bank.reconcile:0 @@ -7973,7 +8014,7 @@ msgid "" "The chart of taxes is used to generate your periodical tax statement. You " "will see the taxes with codes related to your legal statement according to " "your country." -msgstr "税金のチャートは定期的な税金計算書を生成するために使用されます。国に応じた法律上の計算書に関連したコードとともに税金が表示されます。" +msgstr "税金のチャートは定期税金計算書を生成するために使用されます。国に応じた法律上の計算書に関連したコードとともに税金が表示されます。" #. module: account #: code:addons/account/account_invoice.py:428 @@ -8302,7 +8343,7 @@ msgstr "仕訳帳の返金" #: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" -msgstr "" +msgstr "フィルタ" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree1 @@ -8853,7 +8894,7 @@ msgstr "" msgid "" "Analytic costs (timesheets, some purchased products, ...) come from analytic " "accounts. These generate draft invoices." -msgstr "" +msgstr "分析コスト(勤務表、幾つかの発注済製品など)は分析アカウントから来ています。これらはドラフトの請求書を生成します。" #. module: account #: help:account.journal,view_id:0 @@ -9371,7 +9412,7 @@ msgstr "" #: model:process.transition,name:account.process_transition_analyticinvoice0 #: model:process.transition,name:account.process_transition_supplieranalyticcost0 msgid "From analytic accounts" -msgstr "" +msgstr "分析アカウントから" #. module: account #: field:account.period,name:0 @@ -9625,7 +9666,7 @@ msgid "" "And after getting confirmation from the bank it will be in 'Confirmed' state." msgstr "" "新しい取引明細書が作成された時には、状態はドラフトとなります。\n" -"銀行から確認を受け取った後に、その状態は確認済みとなります。" +"銀行から確認を受け取った後に、その状態は確認済となります。" #. module: account #: model:ir.model,name:account.model_account_period @@ -10501,7 +10542,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_analytic_chart #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2 msgid "Chart of Analytic Accounts" -msgstr "" +msgstr "分析アカウントチャート" #. module: account #: field:account.chart.template,property_account_expense:0 diff --git a/addons/account/ir_sequence_view.xml b/addons/account/ir_sequence_view.xml index fe34590e78b..c09fb7abb37 100644 --- a/addons/account/ir_sequence_view.xml +++ b/addons/account/ir_sequence_view.xml @@ -8,7 +8,7 @@ <field name="inherit_id" ref="base.sequence_view"/> <field name="arch" type="xml"> <page position="after"> - <page string="Fiscal Years" groups="base.group_extended"> + <page string="Fiscal Years"> <field name="fiscal_ids" nolabel="1" colspan="4"> <tree string="Fiscal Year Sequences" editable="bottom"> <field name="fiscalyear_id"/> diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index c97024977ed..52e0820508c 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -11,7 +11,7 @@ <group colspan="4" col="6"> <field name="name" select="1"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <field name="active" groups="base.group_extended"/> + <field name="active"/> </group> <separator string="Mapping" colspan="4"/> <newline/> @@ -90,7 +90,7 @@ <group col="2" colspan="2"> <separator string="Customer Credit" colspan="2"/> <field name="credit"/> - <field name="credit_limit" groups="base.group_extended"/> + <field name="credit_limit"/> </group> <group col="2" colspan="2"> <separator string="Supplier Debit" colspan="2"/> @@ -114,7 +114,7 @@ </group> <group name="bank" colspan="2" col="2"> <separator colspan="2" string="Information About the Bank"/> - <field name="bank" on_change="onchange_bank_id(bank)" groups="base.group_extended"/> + <field name="bank" on_change="onchange_bank_id(bank)"/> <field name="bank_name"/> <field name="bank_bic"/> </group> @@ -140,8 +140,7 @@ context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" src_model="res.partner" view_type="form" - view_mode="tree,form,graph,calendar" - groups="base.group_extended"/> + view_mode="tree,form,graph,calendar"/> <record id="view_res_partner_reconcile" model="ir.ui.view"> <field name="name">res.partner.form.reconcile</field> @@ -149,7 +148,7 @@ <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> <field name="credit_limit" position="after"> - <field name="last_reconciliation_date" groups="base.group_extended"/> + <field name="last_reconciliation_date"/> </field> </field> </record> diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index 67352fd1120..8d9001f3686 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -9,11 +9,11 @@ <field name="arch" type="xml"> <notebook position="inside"> <page string="Accounting"> - <group name="properties" groups="base.group_extended"> + <group name="properties"> <separator string="Sales Properties" colspan="2"/> <separator string="Purchase Properties" colspan="2"/> - <field name="property_account_income" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" groups="base.group_extended"/> - <field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="base.group_extended"/> + <field name="property_account_income" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/> + <field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/> </group> <newline/> <group colspan="2"> diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 328cedb9bc1..648af6dda4c 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -10,7 +10,7 @@ <field name="arch" type="xml"> <tree toolbar="1" colors="red:state=='pending';grey:state in ('cancelled','close');blue:type=='view'" string="Analytic Accounts"> <field name="complete_name"/> - <field name="code" groups="base.group_extended"/> + <field name="code"/> <field name="quantity"/> <field name="date"/> <field name="date_start" invisible="1"/> @@ -60,12 +60,12 @@ <field name="arch" type="xml"> <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1"> <field name="name"/> - <field name="code" groups="base.group_extended"/> + <field name="code"/> <field name="debit"/> <field name="credit"/> <field name="balance"/> <field name="state" invisible="1"/> - <field name="currency_id" groups="base.group_extended"/> + <field name="currency_id"/> <field name="date" invisible="1"/> <field name="user_id" invisible="1"/> <field name="partner_id" invisible="1"/> @@ -83,8 +83,8 @@ <form string="Analytic account"> <group colspan="4" col="6"> <field name="name" colspan="4"/> - <field name="code" groups="base.group_extended"/> - <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/> + <field name="code"/> + <field name="parent_id" on_change="on_change_parent(parent_id)"/> <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','<>','view')]}"/> <field name="type" select="2"/> </group> @@ -172,7 +172,7 @@ <field name="unit_amount" colspan="2"/> <field name="product_uom_id" colspan="2" nolabel="1"/> </group> - <group colspan="2" col="2" groups="base.group_extended"> + <group colspan="2" col="2"> <separator string="General Accounting" colspan="2"/> <field name="general_account_id"/> <field name="move_id" readonly="1"/> @@ -220,7 +220,7 @@ </group> <newline/> <group string="Group By..." expand="0"> - <filter string="Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-green"/> + <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/> <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/> <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/> <separator orientation="vertical"/> @@ -265,7 +265,7 @@ <field name="arch" type="xml"> <form string="Project line"> <field name="name"/> - <field name="account_id" groups="base.group_extended"/> + <field name="account_id"/> <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="journal_id"/> <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 1ceb3b3bbbe..92906604f63 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -88,7 +88,7 @@ <field name="period_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="fiscalyear_id"/> <separator orientation="vertical"/> <field name="product_id"/> diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index 86343512295..e0b1b2fbd66 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -33,7 +33,7 @@ <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"/> + <field name ="seq_journal"/> <newline/> <field name ="complete_tax_set" invisible="1"/> <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}" diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml index d7713da09d0..bfcb17ca886 100644 --- a/addons/account/wizard/account_automatic_reconcile_view.xml +++ b/addons/account/wizard/account_automatic_reconcile_view.xml @@ -49,8 +49,7 @@ name="Automatic Reconciliation" action="action_account_automatic_reconcile" id="menu_automatic_reconcile" - parent="periodical_processing_reconciliation" - groups="base.group_extended"/> + parent="periodical_processing_reconciliation"/> <record id="account_automatic_reconcile_view1" model="ir.ui.view"> <field name="name">Automatic reconcile unreconcile</field> diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 3180d0458d4..9f3e55dbe28 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -194,7 +194,7 @@ class account_analytic_plan_instance(osv.osv): <field name="account%d_ids" string="%s" nolabel="1" colspan="4"> <tree string="%s" editable="bottom"> <field name="rate"/> - <field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]" groups="base.group_extended"/> + <field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]" groups="analytic.group_analytic_accounting"/> </tree> </field> <newline/>"""%(i,tools.to_xml(line.name),tools.to_xml(line.name),line.root_analytic_id and line.root_analytic_id.id or 0) diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 1b1df80a5e8..f527498ae05 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -94,7 +94,7 @@ <separator string="Other Information" colspan="4"/> <field name="partner_id"/> <field name="purchase_date"/> - <field name="parent_id" groups="base.group_extended"/> + <field name="parent_id"/> <newline/> <group colspan="2" col="2"> <separator string="Depreciation Dates" colspan="2"/> @@ -290,7 +290,6 @@ <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance" sequence="9"/> <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree" - groups="base.group_extended" sequence="100" action="action_account_asset_asset_tree"/> diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index 1e794eceead..c2f931862f5 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -66,7 +66,7 @@ <field name="depreciation_date"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="partner_id"/> <field name="purchase_date"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml index 400cc92452b..ebf58d774d9 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml +++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml @@ -70,7 +70,7 @@ <tree editable="bottom" string="Statement Lines"> <field name="sequence" readonly="1" invisible="1"/> <field name="journal_id" readonly="1"/> - <field name="date" readonly="1" groups="base.group_extended"/> + <field name="date" readonly="1"/> <field name="val_date" readonly="1"/> <field name="name"/> <field name="statement_id" readonly="1"/> diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po new file mode 100644 index 00000000000..55f39080e09 --- /dev/null +++ b/addons/account_bank_statement_extensions/i18n/sv.po @@ -0,0 +1,374 @@ +# Swedish 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-25 10:49+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Swedish <sv@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-26 04:41+0000\n" +"X-Generator: Launchpad (build 15149)\n" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Search Bank Transactions" +msgstr "Sök banktransaktioner" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +#: selection:account.bank.statement.line,state:0 +msgid "Confirmed" +msgstr "Bekräftad" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement:0 +#: view:account.bank.statement.line:0 +msgid "Glob. Id" +msgstr "Glob. Id" + +#. module: account_bank_statement_extensions +#: selection:account.bank.statement.line.global,type:0 +msgid "CODA" +msgstr "CODA" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,parent_id:0 +msgid "Parent Code" +msgstr "Förälderns kod" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Debit" +msgstr "Debet" + +#. 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 "RIB och/eller IBAN är felaktig" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Group By..." +msgstr "Gruppera på..." + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,state:0 +msgid "State" +msgstr "Tillstånd" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +#: selection:account.bank.statement.line,state:0 +msgid "Draft" +msgstr "Utkast" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Statement" +msgstr "Kontoutdrag" + +#. 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 "Bekräfta valda kontoutdragsrader" + +#. 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 "Bankbalansrapport" + +#. module: account_bank_statement_extensions +#: view:cancel.statement.line:0 +msgid "Cancel Lines" +msgstr "Avbryt raderna" + +#. 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 "Batchbetalningsinformation" + +#. module: account_bank_statement_extensions +#: view:confirm.statement.line:0 +msgid "Confirm Lines" +msgstr "Bekräfta raderna" + +#. 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 "Typ" + +#. 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 "Journal" + +#. 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 "Varning" + +#. module: account_bank_statement_extensions +#: report:bank.statement.balance.report:0 +msgid "Closing Balance" +msgstr "Utgående balans" + +#. module: account_bank_statement_extensions +#: report:bank.statement.balance.report:0 +msgid "Date" +msgstr "Datum" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +#: field:account.bank.statement.line,globalisation_amount:0 +msgid "Glob. Amount" +msgstr "Glob belopp" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Debit Transactions." +msgstr "Debettransaktioner" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Extended Filters..." +msgstr "Utökade filter..." + +#. module: account_bank_statement_extensions +#: view:confirm.statement.line:0 +msgid "Confirmed lines cannot be changed anymore." +msgstr "Bekräftade rader kan inte längre ändras." + +#. 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 "Valutadatum" + +#. 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 "Bekräfta valda rader från kontoutdraget." + +#. 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 "Namn" + +#. module: account_bank_statement_extensions +#: selection:account.bank.statement.line.global,type:0 +msgid "ISO 20022" +msgstr "ISO 20022" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Notes" +msgstr "Anteckningar" + +#. 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 "" diff --git a/addons/account_cancel/i18n/fi.po b/addons/account_cancel/i18n/fi.po new file mode 100644 index 00000000000..1f296c39a81 --- /dev/null +++ b/addons/account_cancel/i18n/fi.po @@ -0,0 +1,23 @@ +# Finnish 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-24 13:52+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Finnish <fi@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-25 04:46+0000\n" +"X-Generator: Launchpad (build 15139)\n" + +#. module: account_cancel +#: view:account.invoice:0 +msgid "Cancel" +msgstr "Peruuta" diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml index 466c87b8182..41a69c63bbf 100644 --- a/addons/account_coda/account_coda_view.xml +++ b/addons/account_coda/account_coda_view.xml @@ -215,7 +215,7 @@ <menuitem action="action_account_coda_comm_type_form" id="menu_action_account_coda_comm_type_form" parent="menu_manage_coda" sequence="5" groups="base.group_no_one"/> <!-- CODA Processing --> - <menuitem name="CODA Processing" parent="account.menu_finance_bank_and_cash" id="menu_account_coda" groups="base.group_extended" sequence="40"/> + <menuitem name="CODA Processing" parent="account.menu_finance_bank_and_cash" id="menu_account_coda" sequence="40"/> <menuitem name="Import CODA Files" parent="menu_account_coda" id="menu_account_coda_import" action="action_account_coda_import" sequence="41"/> <!-- CODA Files --> @@ -415,7 +415,7 @@ <tree editable="bottom" string="CODA Statement Lines"> <field name="sequence" readonly="1" invisible="1"/> <field name="coda_bank_account_id" readonly="1"/> - <field name="date" readonly="1" groups="base.group_extended"/> + <field name="date" readonly="1"/> <field name="val_date" readonly="1"/> <field name="name"/> <field name="statement_id" readonly="1"/> diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index fe4613d6720..7f9d905a44c 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -9,7 +9,7 @@ <tree string="Follow-Up Steps"> <field name="name"/> <field name="delay"/> - <field name="start" groups="base.group_extended"/> + <field name="start"/> </tree> </field> </record> @@ -23,7 +23,7 @@ <group col="6" colspan="4"> <field name="name"/> <field name="delay"/> - <field name="start" groups="base.group_extended"/> + <field name="start"/> </group> <newline/> <separator string="Message" colspan="4"/> diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 8808c451878..1c4005b7be0 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -66,6 +66,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo "test/case2_usd_eur_debtor_in_usd.yml", "test/case3_eur_eur.yml", "test/case4_cad_chf.yml", + "test/case_eur_usd.yml", ], 'certificate': '0037580727101', "auto_install": False, diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index f553a244f38..0191f5866ba 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -234,17 +234,18 @@ class account_voucher(osv.osv): def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None): if not ids: return {} res = {} - voucher_rate = company_currency_rate = 1.0 + rate = 1.0 for voucher in self.browse(cr, uid, ids, context=context): if voucher.currency_id: - ctx = context.copy() - ctx.update({'date': voucher.date}) - voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id: - company_currency_rate = voucher.payment_rate + rate = 1 / voucher.payment_rate else: + ctx = context.copy() + ctx.update({'date': voucher.date}) + voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate company_currency_rate = voucher.company_id.currency_id.rate - res[voucher.id] = voucher.amount / voucher_rate * company_currency_rate + rate = voucher_rate * company_currency_rate + res[voucher.id] = voucher.amount / rate return res _name = 'account.voucher' @@ -1000,9 +1001,7 @@ class account_voucher(osv.osv): res = amount if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id: # the rate specified on the voucher is for the company currency - rate_between_voucher_and_base = voucher.currency_id.rate or 1.0 - rate_between_base_and_company = voucher.payment_rate or 1.0 - res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount / rate_between_voucher_and_base * rate_between_base_and_company)) + res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount * voucher.payment_rate)) else: # the rate specified on the voucher is not relevant, we use all the rates in the system res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context) diff --git a/addons/account_voucher/account_voucher_report.xml b/addons/account_voucher/account_voucher_report.xml index 97de2b89f3a..239492d1a27 100644 --- a/addons/account_voucher/account_voucher_report.xml +++ b/addons/account_voucher/account_voucher_report.xml @@ -6,7 +6,6 @@ model="account.voucher" name="voucher.cash_receipt.drcr" rml="account_voucher/report/account_voucher.rml" - groups="base.group_extended" auto="False" header = "False" menu="True"/> --> diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 53fdaef8c1f..e519d23b09e 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -12,7 +12,7 @@ <field name="reference"/> <field name="partner_id"/> <field name="journal_id"/> - <field name="period_id" groups="base.group_extended" invisible="context.get('visible', True)"/> + <field name="period_id" invisible="context.get('visible', True)"/> <field name="type" invisible="context.get('visible', True)"/> <field name="amount" sum="Total Amount"/> <field name="audit"/> @@ -74,12 +74,12 @@ </group> <group col="4" colspan="1" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}"> <separator string="Total" colspan="4"/> - <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/> + <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/> <label colspan="1" string=""/><field name="amount" string="Total"/> </group> </group> </page> - <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}"> + <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <group col="6" colspan="4"> <field name="period_id"/> <field name="audit"/> @@ -123,7 +123,7 @@ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" groups="base.group_extended" help="To Review"/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/> <separator orientation="vertical"/> <field name="date"/> <field name="number"/> @@ -132,7 +132,7 @@ <newline/> <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" /> - <field name="period_id" groups="base.group_extended"/> + <field name="period_id"/> </group> <newline/> <group expand="0" string="Group By..."> diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index 3acf522cb66..0433d9572d4 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -79,7 +79,7 @@ <field name="partner_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="journal_id" widget="selection"/> <field name="pay_now"/> <field name="account_id"/> @@ -124,4 +124,4 @@ <menuitem action="action_sale_receipt_report_all" id="menu_action_sale_receipt_report_all" parent="account.menu_finance_statistic_report_statement" sequence="3"/> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml index e420abda961..150843cd250 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml @@ -29,21 +29,21 @@ - I create currency USD in OpenERP for February of 1.250000 Rate - - !record {model: res.currency.rate, id: febr_usd}: + !record {model: res.currency.rate, id: feb_usd}: currency_id: base.USD name: !eval "'%s-02-01' %(datetime.now().year)" rate: 1.250000 - I create currency USD in OpenERP for March of 1.111111 Rate - - !record {model: res.currency.rate, id: marc_usd}: + !record {model: res.currency.rate, id: mar_usd}: currency_id: base.USD name: !eval "'%s-03-01' %(datetime.now().year)" rate: 1.111111 - I create currency USD in OpenERP for April of 1.052632 Rate - - !record {model: res.currency.rate, id: apri_usd}: + !record {model: res.currency.rate, id: apr_usd}: currency_id: base.USD name: !eval "'%s-04-01' %(datetime.now().year)" rate: 1.052632 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml index c4c94541e10..b7c116bdc12 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml +++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml @@ -29,21 +29,21 @@ - I create currency USD in OpenERP for February of 1.250000 Rate - - !record {model: res.currency.rate, id: febr_usd}: + !record {model: res.currency.rate, id: feb_usd}: currency_id: base.USD name: !eval "'%s-02-01' %(datetime.now().year)" rate: 1.250000 - I create currency USD in OpenERP for March of 1.111111 Rate - - !record {model: res.currency.rate, id: marc_usd}: + !record {model: res.currency.rate, id: mar_usd}: currency_id: base.USD name: !eval "'%s-03-01' %(datetime.now().year)" rate: 1.111111 - I create currency USD in OpenERP for April of 1.052632 Rate - - !record {model: res.currency.rate, id: apri_usd}: + !record {model: res.currency.rate, id: apr_usd}: currency_id: base.USD name: !eval "'%s-04-01' %(datetime.now().year)" rate: 1.052632 diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml new file mode 100644 index 00000000000..72f0d22aead --- /dev/null +++ b/addons/account_voucher/test/case_eur_usd.yml @@ -0,0 +1,170 @@ +##YAML test on the account_voucher as depicted in this bug report: https://bugs.launchpad.net/openobject-addons/+bug/954155 +- + In order to check the payment with multi-currency in OpenERP, + I create an invoice in EUR and make payment in USD based on the currency rating. +- + I update the Currency USD in OpenERP for January with rate 1.200000 +- + !python {model: res.currency.rate}: | + from datetime import datetime + curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0] + date = '%s-01-01' %(datetime.now().year) + ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)]) + self.write(cr, uid, ids, {'rate': 1.200000}) +- + I update the Currency USD in OpenERP for February with rate 1.400000 +- + !record {model: res.currency.rate, id: feb_usd}: + currency_id: base.USD + name: !eval "'%s-02-01' %(datetime.now().year)" + rate: 1.400000 +- + I create a bank account with USD as currency +- + !record {model: account.account, id: account_eur_usd_id}: + currency_id: base.USD + name: "Bank usd" + code: "BUSD" + type: 'liquidity' + user_type: account.data_account_type_asset +- + I create a bank journal with USD as currency +- + !record {model: account.journal, id: bank_journal_USD1}: + name: Bank Journal Test(USD) + code: BEUSD + type: bank + analytic_journal_id: account.sit + sequence_id: account.sequence_bank_journal + default_debit_account_id: account_eur_usd_id + default_credit_account_id: account_eur_usd_id + currency: base.USD + company_id: base.main_company + view_id: account.account_journal_bank_view +- + I create an invoice +- + !record {model: account.invoice, id: account_invoice_eur_usd}: + account_id: account.a_recv + company_id: base.main_company + currency_id: base.EUR + date_invoice: !eval "'%s-01-01' %(datetime.now().year)" + period_id: account.period_1 + invoice_line: + - account_id: account.a_sale + name: '[PC1] Basic PC' + price_unit: 1000.0 + quantity: 1.0 + product_id: product.product_product_pc1 + uos_id: product.product_uom_unit + journal_id: account.sales_journal + partner_id: base.res_partner_seagate +- + I validate the invoice. +- + !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_eur_usd} +- + I check that invoice move is correct +- + !python {model: account.invoice}: | + invoice = self.browse(cr, uid, ref("account_invoice_eur_usd")) + assert invoice.state == 'open', "invoice state is not open" + assert invoice.period_id, "Period is not created for open invoice" + assert invoice.move_id, "Move not created for open invoice" + assert invoice.move_id.state == 'posted', "Move state is not posted" + for move_line in invoice.move_id.line_id: + assert move_line.state == 'valid', "Move line state is not valid" +- + I set the type receipt for this voucher +- + !context + 'type': 'receipt' +- + I create the voucher of payment with values 1350 USD, journal USD, +- + !record {model: account.voucher, id: account_voucher_eur_usd_case, view: view_vendor_receipt_form}: + account_id: account.cash + amount: 1350.0 + company_id: base.main_company + journal_id: bank_journal_USD1 + name: 'payment: Case EUR/USD' + partner_id: base.res_partner_seagate + period_id: account.period_5 + date: !eval time.strftime("%Y-02-01") + payment_option: 'with_writeoff' + writeoff_acc_id: account.a_expense + comment: 'Write Off' +- + I fill amount 1400 for the invoice of 1400$ +- + !python {model: account.voucher}: | + data = [] + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + for item in voucher.line_cr_ids: + if item.amount_unreconciled == 1400: + data += [(item.id, 1400)] + for line_id, amount in data: + self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount}) + assert (voucher.state=='draft'), "Voucher is not in draft state" +- + I check that writeoff amount computed is 50.0 +- + !python {model: account.voucher}: | + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + assert (voucher.writeoff_amount == 50.0), "Writeoff amount is not 50.0" +- + I confirm the voucher +- + !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_eur_usd_case} +- + I check that the voucher state is "Posted" +- + !assert {model: account.voucher, id: account_voucher_eur_usd_case}: + - state == 'posted' +- + I check that the move of voucher is valid +- + !python {model: account.voucher}: | + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + assert voucher.move_ids, "Move line is not created for this voucher" + assert (voucher.number == voucher.move_ids[0].move_id.name), "referance number is not created" + assert voucher.period_id, "period is not created" + for move_line in voucher.move_ids: + assert move_line.state == 'valid', "Voucher move is not valid" +- + I check that my debtor account is correct +- + I check that my currency rate difference is correct. 1000 in credit with no amount_currency +- + I check that the total reconcilation created entries as expected +- + I check that my writeoff is correct. 35.71 debit and 50 amount_currency +- + I check that my bank account is correct. 964.29 debit and 1350 amount_currency +- + !python {model: account.voucher}: | + voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case')) + for move_line in voucher.move_ids: + if move_line.amount_currency == 1350: + assert move_line.debit == 964.29,"debtor account is not correct" + if move_line.amount_currency == 50: + assert move_line.debit == 35.71,"write off bank account is not correct" + if move_line.amount_currency == 0.0: + assert move_line.credit == 1000,"total reconcile is not correct of invoice" +- + I check that the move of payment in invoice is valid +- + !python {model: account.invoice}: | + invoice = self.browse(cr, uid, ref("account_invoice_eur_usd")) + for payment_line in invoice.payment_ids: + assert payment_line.state == 'valid', "payment move line state is not valid" +- + I check the residual amount of invoice should be 0 in residual currency and 0 in amount_residual and paid +- + !python {model: account.invoice}: | + invoice_id = self.browse(cr, uid, ref("account_invoice_eur_usd")) + move_line_obj = self.pool.get('account.move.line') + move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)]) + move_line = move_line_obj.browse(cr, uid, move_lines[0]) + assert (move_line.amount_residual_currency == 0.0 and move_line.amount_residual == 0.0 and invoice_id.state == 'paid') , "Residual amount is not correct for Invoice" +
\ No newline at end of file diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 0ef84e104aa..b422c0dbe73 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -12,7 +12,7 @@ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> <separator orientation="vertical"/> <field name="date"/> <field name="number"/> @@ -21,7 +21,7 @@ <newline/> <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> - <field name="period_id" groups="base.group_extended"/> + <field name="period_id"/> </group> <newline/> <group expand="0" string="Group By..."> @@ -45,7 +45,7 @@ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> <separator orientation="vertical"/> <field name="date"/> <field name="number"/> @@ -54,7 +54,7 @@ <newline/> <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> - <field name="period_id" groups="base.group_extended"/> + <field name="period_id"/> </group> <newline/> <group expand="0" string="Group By..."> @@ -98,7 +98,7 @@ on_change="onchange_move_line_id(move_line_id)" domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]" /> - <field name="account_id" groups="base.group_extended" domain="[('type','=','payable')]"/> + <field name="account_id" domain="[('type','=','payable')]"/> <field name="date_original" readonly="1"/> <field name="date_due" readonly="1"/> <field name="amount_original" readonly="1"/> @@ -112,7 +112,7 @@ on_change="onchange_move_line_id(move_line_id)" domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]" /> - <field name="account_id" groups="base.group_extended" domain="[('type','=','payable')]"/> + <field name="account_id" domain="[('type','=','payable')]"/> <field name="date_original" readonly="1"/> <field name="date_due" readonly="1"/> <field name="amount_original" readonly="1"/> @@ -127,9 +127,9 @@ <group col="4" colspan="1"> <separator string="Other Information" colspan="4"/> <field name="currency_id" colspan="4"/> - <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/> - <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> - <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/> + <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/> + <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> + <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/> <field name="number" colspan="4"/> </group> </page> @@ -206,9 +206,9 @@ <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}"> <separator string="Currency Options" colspan="4"/> <field name="is_multi_currency" invisible="1"/> - <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/> - <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> - <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/> + <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/> + <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> + <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/> </group> <group col="2" colspan="1"> <separator string="Payment Options" colspan="2"/> @@ -224,7 +224,7 @@ </group> </group> </page> - <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}"> + <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <group col="6" colspan="4"> <field name="period_id"/> <field name="audit"/> @@ -356,11 +356,11 @@ </group> <group col="2" colspan="1"> <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}"> - <separator string="Currency Options" colspan="4" groups='base.group_extended'/> + <separator string="Currency Options" colspan="4"/> <field name="is_multi_currency" invisible="1"/> - <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/> - <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> - <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/> + <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/> + <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> + <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/> </group> <group col="2" colspan="1"> <separator string="Payment Options" colspan="2"/> @@ -376,7 +376,7 @@ </group> </group> </page> - <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}"> + <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <group col="6" colspan="4"> <field name="period_id"/> <field name="audit"/> diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 0cb3104f92e..162605be36c 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -11,7 +11,7 @@ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> <separator orientation="vertical"/> <field name="date"/> <field name="number"/> @@ -20,7 +20,7 @@ <newline/> <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/> - <field name="period_id" groups="base.group_extended"/> + <field name="period_id"/> </group> <newline/> <group expand="0" string="Group By..."> @@ -43,7 +43,7 @@ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> <separator orientation="vertical"/> <field name="date"/> <field name="number"/> @@ -52,7 +52,7 @@ <newline/> <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/> - <field name="period_id" groups="base.group_extended"/> + <field name="period_id"/> </group> <newline/> <group expand="0" string="Group By..."> @@ -121,12 +121,12 @@ </group> <group col="4" colspan="1"> <separator string="Total" colspan="4"/> - <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/> + <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/> <label string="" colspan="1"/><field name="amount" string="Total"/> </group> </group> </page> - <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}"> + <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <group col="6" colspan="4"> <field name="period_id"/> <field name="audit"/> @@ -189,7 +189,6 @@ <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL" action="action_sale_receipt" parent="account.menu_finance_receivables" - groups="base.group_extended" sequence="10"/> <!-- Purchase Vouchers --> @@ -242,12 +241,12 @@ </group> <group col="4" colspan="1"> <separator string="Total" colspan="4"/> - <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/> + <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/> <label string="" colspan="1"/><field name="amount" string="Total"/> </group> </group> </page> - <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}"> + <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <group col="6" colspan="4"> <field name="period_id"/> <field name="audit"/> @@ -306,8 +305,7 @@ </record> <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL" - action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10" - groups="base.group_extended"/> + action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/> </data> </openerp> diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 9be0b6919c7..f131fe4f4a9 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -8,7 +8,7 @@ sequence="9" web_icon="images/association.png" web_icon_hover="images/association-hover.png"/> - <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/> + <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/> <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/> </data> </openerp> diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 0d2a4dd49f8..a807b7c2ce1 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -389,7 +389,7 @@ </form> </field> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <group colspan="2" col="2"> <field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1" height="575" width="285" widget="one2many_list"> diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index a9f81973df3..2e7e2c31ea8 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -22,7 +22,7 @@ <field name="log_workflow"/> <separator string="Users (if User is not added then it will applicable for all users)" colspan="4" /> <field name="user_id" select="1" colspan="4" nolabel="1" /> - <field name="action_id" colspan="4" readonly="1" groups="base.group_extended"/> + <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/> <field name="state" select="1" readonly="1" /> <group colspan="2" col="2"> <button string="_Subscribe" name="subscribe" icon="gtk-ok" @@ -67,7 +67,7 @@ <field name="object_id"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> @@ -166,7 +166,7 @@ <field name="user_id" widget="selection"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/> diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 65b37fb4c1d..4ba7e6f9018 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <!-- <menuitem id="base.menu_base_action_rule" name="Automated Actions" - groups="base.group_extended" - parent="base.menu_base_config" sequence="20" />--> <menuitem id="base.menu_base_action_rule_admin" name="Automated Actions" - groups="base.group_extended" parent="base.menu_custom" /> <!-- diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index e786eff6048..b6d2136fc16 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -163,7 +163,6 @@ <menuitem id="menu_attendee_invitations" parent="base.menu_calendar_configuration" - groups="base.group_extended" sequence="10" action="action_view_attendee_form" /> <!-- ALARM FORM VIEW--> @@ -498,7 +497,6 @@ <menuitem id="menu_events" name="Events" parent="base.menu_calendar_configuration" - groups="base.group_extended" sequence="15" action="action_view_event" /> </data> 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 11cec50bb50..4b63cb8d50e 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 @@ -35,8 +35,7 @@ <menuitem parent="base.menu_custom" name="Module Creation" - id="menu_wizard_base_mod_rec" - groups="base.group_extended"/> + id="menu_wizard_base_mod_rec"/> <menuitem parent="menu_wizard_base_mod_rec" diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml index 07f71539bb7..f977b7160ac 100644 --- a/addons/base_synchro/base_synchro_view.xml +++ b/addons/base_synchro/base_synchro_view.xml @@ -68,7 +68,8 @@ <field name="res_model">base.synchro.obj.line</field> <field name="view_type">form</field> </record> - <menuitem id="next_id_63" name="History" groups="base.group_extended" parent="base_synchro.next_id_62"/><menuitem action="action_base_synchro_obj_line_tree" id="menu_action_base_synchro_obj_line_tree" parent="base_synchro.next_id_63"/> + <menuitem id="next_id_63" name="History" parent="base_synchro.next_id_62"/> + <menuitem action="action_base_synchro_obj_line_tree" id="menu_action_base_synchro_obj_line_tree" parent="base_synchro.next_id_63"/> <!--view_base_synchro_obj starts--> diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml index 18480b47814..94b99af8443 100644 --- a/addons/base_vat/base_vat_view.xml +++ b/addons/base_vat/base_vat_view.xml @@ -11,7 +11,7 @@ <group colspan="2" col="6"> <field name="vat" on_change="vat_change(vat)"/> <button name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/> - <field name="vat_subjected" colspan="1" groups="base.group_extended" /> + <field name="vat_subjected" colspan="1" /> </group> </field> </field> @@ -23,7 +23,7 @@ <field name="inherit_id" ref="base.view_company_form"/> <field name="arch" type="xml"> <field name="currency_id" position="after"> - <field name="vat_check_vies" groups="base.group_extended" /> + <field name="vat_check_vies" /> </field> </field> </record> diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index 72e88a6c7b4..b47e093d436 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -83,9 +83,9 @@ <field name="type"/> <field name="user_id"/> <field name="collection_id" required="1"/> - <field name="has_webcal" groups="base.group_extended" /> - <field name="calendar_color" groups="base.group_extended" /> - <field name="calendar_order" groups="base.group_extended" /> + <field name="has_webcal" groups="base.group_no_one" /> + <field name="calendar_color" groups="base.group_no_one" /> + <field name="calendar_order" groups="base.group_no_one" /> <notebook colspan="4"> <page string="Calendar Lines"> <field name="line_ids" mode="form,tree" colspan="4" nolabel="1"> @@ -137,9 +137,9 @@ <field name="type"/> <field name="user_id"/> <field name="collection_id" required="1"/> - <field name="has_webcal" groups="base.group_extended" /> - <field name="calendar_color" groups="base.group_extended" /> - <field name="calendar_order" groups="base.group_extended" /> + <field name="has_webcal" groups="base.group_no_one" /> + <field name="calendar_color" groups="base.group_no_one" /> + <field name="calendar_order" groups="base.group_no_one" /> </tree> </field> </record> diff --git a/addons/caldav/i18n/ja.po b/addons/caldav/i18n/ja.po new file mode 100644 index 00000000000..18049baf534 --- /dev/null +++ b/addons/caldav/i18n/ja.po @@ -0,0 +1,820 @@ +# 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-25 05:32+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-26 04:41+0000\n" +"X-Generator: Launchpad (build 15149)\n" + +#. module: caldav +#: view:basic.calendar:0 +msgid "Value Mapping" +msgstr "価値の配分" + +#. module: caldav +#: help:caldav.browse,url:0 +msgid "Url of the caldav server, use for synchronization" +msgstr "caldavサーバのURL。同期化に使われます。" + +#. module: caldav +#: code:addons/caldav/wizard/caldav_browse.py:99 +#, python-format +msgid "" +"\n" +"Prerequire\n" +"----------\n" +"There is no buit-in way to synchronize calendar with caldav.\n" +"So you need to install a third part software : Calendar (CalDav)\n" +"for now it's the only one\n" +"\n" +"configuration\n" +"-------------\n" +"\n" +"1. Open Calendar Sync\n" +" I'll get an interface with 2 tabs\n" +" Stay on the first one\n" +"\n" +"2. CaDAV Calendar URL : put the URL given above (ie : " +"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n" +"\n" +"3. Put your openerp username and password\n" +"\n" +"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n" +"\n" +"5. Then you can synchronize manually or custom the settings to synchronize " +"every x minutes.\n" +"\n" +" " +msgstr "" + +#. module: caldav +#: field:basic.calendar.alias,name:0 +msgid "Filename" +msgstr "ファイル名" + +#. module: caldav +#: model:ir.model,name:caldav.model_calendar_event_export +msgid "Event Export" +msgstr "" + +#. module: caldav +#: view:calendar.event.subscribe:0 +msgid "Provide path for Remote Calendar" +msgstr "遠隔カレンダーへの経路を指定して下さい。" + +#. module: caldav +#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values +msgid "Import .ics File" +msgstr ".ics ファイルをインポートして下さい。" + +#. module: caldav +#: view:caldav.browse:0 +#: view:calendar.event.export:0 +msgid "_Close" +msgstr "閉じる(_C)" + +#. module: caldav +#: selection:basic.calendar.attributes,type:0 +#: selection:basic.calendar.lines,name:0 +msgid "Attendee" +msgstr "出席者" + +#. module: caldav +#: sql_constraint:basic.calendar.fields:0 +msgid "Can not map a field more than once" +msgstr "項目を重複して割当てることはできません。" + +#. module: caldav +#: model:ir.actions.act_window,help:caldav.action_caldav_form +msgid "" +"\"Calendars\" allow you to Customize calendar event and todo attribute with " +"any of OpenERP model.Caledars provide iCal Import/Export " +"functionality.Webdav server that provides remote access to calendar.Help You " +"to synchronize Meeting with Calendars client.You can access Calendars using " +"CalDAV clients, like sunbird, Calendar Evaluation, Mobile." +msgstr "" + +#. module: caldav +#: code:addons/caldav/calendar.py:789 +#: code:addons/caldav/calendar.py:879 +#: code:addons/caldav/wizard/calendar_event_import.py:63 +#, python-format +msgid "Warning !" +msgstr "警告" + +#. module: caldav +#: field:basic.calendar.lines,object_id:0 +msgid "Object" +msgstr "オブジェクト" + +#. module: caldav +#: view:basic.calendar:0 +msgid "Todo" +msgstr "作業項目" + +#. module: caldav +#: model:ir.model,name:caldav.model_user_preference +msgid "User preference Form" +msgstr "" + +#. module: caldav +#: field:user.preference,service:0 +msgid "Services" +msgstr "サービス" + +#. module: caldav +#: selection:basic.calendar.fields,fn:0 +msgid "Expression as constant" +msgstr "定数の表現" + +#. module: caldav +#: selection:user.preference,device:0 +msgid "Evolution" +msgstr "評価" + +#. module: caldav +#: view:calendar.event.import:0 +#: view:calendar.event.subscribe:0 +msgid "Ok" +msgstr "OK" + +#. module: caldav +#: code:addons/caldav/wizard/caldav_browse.py:123 +#, python-format +msgid "" +"\n" +" 1. Go to Calendar View\n" +"\n" +" 2. File -> New -> Calendar\n" +"\n" +" 3. Fill the form\n" +" - type : CalDav\n" +" - name : Whaterver you want (ie : Meeting)\n" +" - url : " +"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : " +"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one " +"given on the top of this window\n" +" - uncheck \"User SSL\"\n" +" - Username : Your username (ie : Demo)\n" +" - Refresh : everytime you want that evolution synchronize the data " +"with the server\n" +"\n" +" 4. Click ok and give your openerp password\n" +"\n" +" 5. A new calendar named with the name you gave should appear on the left " +"side.\n" +" " +msgstr "" + +#. module: caldav +#: code:addons/caldav/calendar.py:879 +#, python-format +msgid "Please provide proper configuration of \"%s\" in Calendar Lines" +msgstr "" + +#. module: caldav +#: view:user.preference:0 +msgid "Caldav's host name configuration" +msgstr "" + +#. module: caldav +#: field:caldav.browse,url:0 +msgid "Caldav Server" +msgstr "" + +#. module: caldav +#: selection:basic.calendar.fields,fn:0 +msgid "Datetime In UTC" +msgstr "" + +#. module: caldav +#: selection:user.preference,device:0 +msgid "iPhone" +msgstr "" + +#. module: caldav +#: selection:basic.calendar,type:0 +#: selection:basic.calendar.attributes,type:0 +#: selection:basic.calendar.lines,name:0 +msgid "TODO" +msgstr "" + +#. module: caldav +#: view:calendar.event.export:0 +msgid "Export ICS" +msgstr "" + +#. module: caldav +#: selection:basic.calendar.fields,fn:0 +msgid "Use the field" +msgstr "" + +#. module: caldav +#: code:addons/caldav/calendar.py:789 +#, python-format +msgid "Can not create line \"%s\" more than once" +msgstr "" + +#. module: caldav +#: view:basic.calendar:0 +msgid "Webcal Calendar" +msgstr "" + +#. module: caldav +#: view:basic.calendar:0 +#: field:basic.calendar,line_ids:0 +#: model:ir.model,name:caldav.model_basic_calendar_lines +msgid "Calendar Lines" +msgstr "カレンダー行" + +#. module: caldav +#: model:ir.model,name:caldav.model_calendar_event_subscribe +msgid "Event subscribe" +msgstr "イベントの予定" + +#. module: caldav +#: view:calendar.event.import:0 +msgid "Import ICS" +msgstr "ICSをインポート" + +#. module: caldav +#: view:calendar.event.import:0 +#: view:calendar.event.subscribe:0 +#: view:user.preference:0 +msgid "_Cancel" +msgstr "キャンセル( _C )" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_event +msgid "basic.calendar.event" +msgstr "basic.calendar.event" + +#. module: caldav +#: view:basic.calendar:0 +#: selection:basic.calendar,type:0 +#: selection:basic.calendar.attributes,type:0 +#: selection:basic.calendar.lines,name:0 +msgid "Event" +msgstr "イベント" + +#. module: caldav +#: field:document.directory,calendar_collection:0 +#: field:user.preference,collection:0 +msgid "Calendar Collection" +msgstr "カレンダー収集" + +#. module: caldav +#: constraint:document.directory:0 +msgid "Error! You can not create recursive Directories." +msgstr "エラー:ディレクトリを重複して作ることはできません。" + +#. module: caldav +#: view:user.preference:0 +msgid "_Open" +msgstr "開く( _O )" + +#. module: caldav +#: view:user.preference:0 +msgid "Next" +msgstr "次へ" + +#. module: caldav +#: field:basic.calendar,type:0 +#: field:basic.calendar.attributes,type:0 +#: field:basic.calendar.fields,type_id:0 +#: field:basic.calendar.lines,name:0 +msgid "Type" +msgstr "タイプ" + +#. module: caldav +#: help:calendar.event.export,name:0 +msgid "Save in .ics format" +msgstr "" + +#. module: caldav +#: code:addons/caldav/calendar.py:1293 +#, python-format +msgid "Error !" +msgstr "エラー" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_attributes +msgid "Calendar attributes" +msgstr "カレンダーの特性" + +#. module: caldav +#: model:ir.model,name:caldav.model_caldav_browse +msgid "Caldav Browse" +msgstr "Caldavブラウズ" + +#. module: caldav +#: selection:user.preference,device:0 +msgid "Android based device" +msgstr "アンドロイド搭載デバイス" + +#. module: caldav +#: view:user.preference:0 +msgid "Configure your openerp hostname. For example : " +msgstr "OpenERPのホスト名を設定して下さい。例えば: " + +#. module: caldav +#: field:basic.calendar,create_date:0 +msgid "Created Date" +msgstr "作成日" + +#. module: caldav +#: view:basic.calendar:0 +msgid "Attributes Mapping" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_document_directory +msgid "Directory" +msgstr "ディレクトリ" + +#. module: caldav +#: field:calendar.event.subscribe,url_path:0 +msgid "Provide path for remote calendar" +msgstr "遠隔カレンダーへの経路を指定して下さい。" + +#. module: caldav +#: field:basic.calendar.lines,domain:0 +msgid "Domain" +msgstr "ドメイン" + +#. module: caldav +#: view:calendar.event.subscribe:0 +msgid "_Subscribe" +msgstr "継読する ( _S )" + +#. module: caldav +#: field:basic.calendar,user_id:0 +msgid "Owner" +msgstr "所有者" + +#. module: caldav +#: view:basic.calendar:0 +#: field:basic.calendar.alias,cal_line_id:0 +#: field:basic.calendar.lines,calendar_id:0 +#: model:ir.ui.menu,name:caldav.menu_calendar +#: field:user.preference,calendar:0 +msgid "Calendar" +msgstr "カレンダー" + +#. module: caldav +#: code:addons/caldav/calendar.py:41 +#, python-format +msgid "" +"Please install python-vobject from http://vobject.skyhouseconsulting.com/" +msgstr "" +"http://vobject.skyhouseconsulting.com/ からpython-vobjectをダウンロードして、インストールしてください" + +#. module: caldav +#: code:addons/caldav/wizard/calendar_event_import.py:63 +#, python-format +msgid "Invalid format of the ics, file can not be imported" +msgstr "ICS の形式が正しくありません。ファイルをインポートできません。" + +#. module: caldav +#: selection:user.preference,service:0 +msgid "CalDAV" +msgstr "CalDAV" + +#. module: caldav +#: field:basic.calendar.fields,field_id:0 +msgid "OpenObject Field" +msgstr "OpenObject 項目" + +#. module: caldav +#: field:basic.calendar.alias,res_id:0 +msgid "Res. ID" +msgstr "応答ID" + +#. module: caldav +#: view:calendar.event.subscribe:0 +msgid "Message..." +msgstr "メッセージ…" + +#. module: caldav +#: view:basic.calendar:0 +#: field:basic.calendar,has_webcal:0 +msgid "WebCal" +msgstr "WebCal" + +#. module: caldav +#: view:document.directory:0 +#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form +#: model:ir.ui.menu,name:caldav.menu_calendar_collection +msgid "Calendar Collections" +msgstr "カレンダー収集" + +#. module: caldav +#: code:addons/caldav/calendar.py:815 +#: sql_constraint:basic.calendar.alias:0 +#, python-format +msgid "The same filename cannot apply to two records!" +msgstr "" + +#. module: caldav +#: sql_constraint:document.directory:0 +msgid "Directory cannot be parent of itself!" +msgstr "ディレクトリはそれ自身の親になれません。" + +#. module: caldav +#: view:basic.calendar:0 +#: field:document.directory,calendar_ids:0 +#: model:ir.actions.act_window,name:caldav.action_caldav_form +#: model:ir.ui.menu,name:caldav.menu_caldav_directories +msgid "Calendars" +msgstr "カレンダー" + +#. module: caldav +#: field:basic.calendar,collection_id:0 +msgid "Collection" +msgstr "集合" + +#. module: caldav +#: field:basic.calendar,write_date:0 +msgid "Write Date" +msgstr "日付を入れて下さい。" + +#. module: caldav +#: code:addons/caldav/wizard/caldav_browse.py:32 +#, python-format +msgid "" +"\n" +" * Webdav server that provides remote access to calendar\n" +" * Synchronisation of calendar using WebDAV\n" +" * Customize calendar event and todo attribute with any of OpenERP model\n" +" * Provides iCal Import/Export functionality\n" +"\n" +" To access Calendars using CalDAV clients, point them to:\n" +" " +"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n" +"\n" +" To access OpenERP Calendar using WebCal to remote site use the URL " +"like:\n" +" " +"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n" +"\n" +" Where,\n" +" HOSTNAME: Host on which OpenERP server(With webdav) is running\n" +" PORT : Port on which OpenERP server is running (By Default : 8069)\n" +" DATABASE_NAME: Name of database on which OpenERP Calendar is " +"created\n" +" " +msgstr "" + +#. module: caldav +#: sql_constraint:document.directory:0 +msgid "The directory name must be unique !" +msgstr "" + +#. module: caldav +#: view:user.preference:0 +msgid "User Preference" +msgstr "" + +#. module: caldav +#: code:addons/caldav/wizard/calendar_event_subscribe.py:59 +#, python-format +msgid "Please provide Proper URL !" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_timezone +msgid "basic.calendar.timezone" +msgstr "" + +#. module: caldav +#: field:basic.calendar.fields,expr:0 +msgid "Expression" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_attendee +msgid "basic.calendar.attendee" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_alias +msgid "basic.calendar.alias" +msgstr "" + +#. module: caldav +#: view:calendar.event.import:0 +#: field:calendar.event.import,file_path:0 +msgid "Select ICS file" +msgstr "" + +#. module: caldav +#: field:user.preference,device:0 +msgid "Software/Devices" +msgstr "" + +#. module: caldav +#: field:basic.calendar.lines,mapping_ids:0 +msgid "Fields Mapping" +msgstr "" + +#. module: caldav +#: code:addons/caldav/wizard/caldav_browse.py:141 +#, python-format +msgid "" +"\n" +"Prerequire\n" +"----------\n" +"If you are using thunderbird, first you need to install the lightning " +"module\n" +"http://www.mozilla.org/projects/calendar/lightning/\n" +"\n" +"configuration\n" +"-------------\n" +"\n" +"1. Go to Calendar View\n" +"\n" +"2. File -> New Calendar\n" +"\n" +"3. Chosse \"On the Network\"\n" +"\n" +"4. for format choose CalDav\n" +" and as location the url given above (ie : " +"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n" +"\n" +"5. Choose a name and a color for the Calendar, and we advice you to uncheck " +"\"alarm\"\n" +"\n" +"6. Then put your openerp login and password (to give the password only check " +"the box \"Use password Manager to remember this password\"\n" +"\n" +"7. Then Finish, your meetings should appear now in your calendar view\n" +msgstr "" + +#. module: caldav +#: view:caldav.browse:0 +msgid "Browse caldav" +msgstr "" + +#. module: caldav +#: field:user.preference,host_name:0 +msgid "Host Name" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar +msgid "basic.calendar" +msgstr "" + +#. module: caldav +#: view:basic.calendar:0 +msgid "Other Info" +msgstr "" + +#. module: caldav +#: selection:user.preference,device:0 +msgid "Other" +msgstr "" + +#. module: caldav +#: view:basic.calendar:0 +msgid "My Calendar(s)" +msgstr "" + +#. module: caldav +#: help:basic.calendar,has_webcal:0 +msgid "" +"Also export a <name>.ics entry next to the calendar folder, with WebCal " +"content." +msgstr "" + +#. module: caldav +#: field:basic.calendar.fields,fn:0 +msgid "Function" +msgstr "" + +#. module: caldav +#: view:user.preference:0 +msgid "database.my.openerp.com or companyserver.com" +msgstr "" + +#. module: caldav +#: view:basic.calendar:0 +#: field:basic.calendar,description:0 +#: view:caldav.browse:0 +#: field:caldav.browse,description:0 +msgid "Description" +msgstr "" + +#. module: caldav +#: help:basic.calendar.alias,cal_line_id:0 +msgid "The calendar/line this mapping applies to" +msgstr "" + +#. module: caldav +#: field:basic.calendar.fields,mapping:0 +msgid "Mapping" +msgstr "" + +#. module: caldav +#: code:addons/caldav/wizard/calendar_event_import.py:86 +#, python-format +msgid "Import Sucessful" +msgstr "" + +#. module: caldav +#: view:calendar.event.import:0 +msgid "_Import" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_calendar_event_import +msgid "Event Import" +msgstr "" + +#. module: caldav +#: selection:basic.calendar.fields,fn:0 +msgid "Interval in hours" +msgstr "" + +#. module: caldav +#: field:calendar.event.export,name:0 +msgid "File name" +msgstr "" + +#. module: caldav +#: view:calendar.event.subscribe:0 +msgid "Subscribe to Remote Calendar" +msgstr "" + +#. module: caldav +#: help:basic.calendar,calendar_color:0 +msgid "For supporting clients, the color of the calendar entries" +msgstr "" + +#. module: caldav +#: field:basic.calendar,name:0 +#: field:basic.calendar.attributes,name:0 +#: field:basic.calendar.fields,name:0 +msgid "Name" +msgstr "" + +#. module: caldav +#: selection:basic.calendar.attributes,type:0 +#: selection:basic.calendar.lines,name:0 +msgid "Alarm" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_alarm +msgid "basic.calendar.alarm" +msgstr "" + +#. module: caldav +#: code:addons/caldav/calendar.py:1293 +#, python-format +msgid "Attendee must have an Email Id" +msgstr "" + +#. module: caldav +#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values +msgid "Export .ics File" +msgstr "" + +#. module: caldav +#: code:addons/caldav/calendar.py:41 +#, python-format +msgid "vobject Import Error!" +msgstr "" + +#. module: caldav +#: field:calendar.event.export,file_path:0 +msgid "Save ICS file" +msgstr "" + +#. module: caldav +#: code:addons/caldav/wizard/caldav_browse.py:50 +#, python-format +msgid "" +"\n" +" For SSL specific configuration see the documentation below\n" +"\n" +"Now, to setup the calendars, you need to:\n" +"\n" +"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" " +"page.\n" +"2. Go to \"Add account...\"\n" +"3. Click on \"Other\"\n" +"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n" +"\n" +"5. Enter the host's name\n" +" (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , " +"openerp.com is the host)\n" +"\n" +"6. Fill Username and password with your openerp login and password\n" +"\n" +"7. As a description, you can either leave the server's name or\n" +" something like \"OpenERP calendars\".\n" +"\n" +"9. If you are not using a SSL server, you'll get an error, do not worry and " +"push \"Continue\"\n" +"\n" +"10. Then click to \"Advanced Settings\" to specify the right\n" +" ports and paths.\n" +"\n" +"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n" +"\n" +"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n" +" the url given by the wizard (ie : " +"http://my.server.ip:8069/webdav/dbname/calendars/ )\n" +"\n" +"11. Click on Done. The phone will hopefully connect to the OpenERP server\n" +" and verify it can use the account.\n" +"\n" +"12. Go to the main menu of the iPhone and enter the Calendar application.\n" +" Your OpenERP calendars will be visible inside the selection of the\n" +" \"Calendars\" button.\n" +" Note that when creating a new calendar entry, you will have to specify\n" +" which calendar it should be saved at.\n" +"\n" +"IF you need SSL (and your certificate is not a verified one, as usual),\n" +"then you first will need to let the iPhone trust that. Follow these\n" +"steps:\n" +"\n" +" s1. Open Safari and enter the https location of the OpenERP server:\n" +" https://my.server.ip:8071/\n" +" (assuming you have the server at \"my.server.ip\" and the HTTPS port\n" +" is the default 8071)\n" +" s2. Safari will try to connect and issue a warning about the " +"certificate\n" +" used. Inspect the certificate and click \"Accept\" so that iPhone\n" +" now trusts it.\n" +" " +msgstr "" + +#. module: caldav +#: selection:user.preference,device:0 +msgid "Sunbird/Thunderbird" +msgstr "" + +#. module: caldav +#: field:basic.calendar,calendar_order:0 +msgid "Order" +msgstr "" + +#. module: caldav +#: code:addons/caldav/wizard/calendar_event_subscribe.py:59 +#, python-format +msgid "Error!" +msgstr "" + +#. module: caldav +#: field:basic.calendar,calendar_color:0 +msgid "Color" +msgstr "" + +#. module: caldav +#: view:basic.calendar:0 +msgid "MY" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_fields +msgid "Calendar fields" +msgstr "" + +#. module: caldav +#: view:calendar.event.import:0 +msgid "Import Message" +msgstr "" + +#. module: caldav +#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe +#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values +msgid "Subscribe" +msgstr "" + +#. module: caldav +#: sql_constraint:document.directory:0 +msgid "Directory must have a parent or a storage" +msgstr "" + +#. module: caldav +#: model:ir.model,name:caldav.model_basic_calendar_todo +msgid "basic.calendar.todo" +msgstr "" + +#. module: caldav +#: help:basic.calendar,calendar_order:0 +msgid "For supporting clients, the order of this folder among the calendars" +msgstr "" diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index b7ed60623a4..3cd45fd5cd1 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -43,7 +43,7 @@ <act_window id="act_crm_opportunity_crm_phonecall_new" name="Phone calls" - groups="base.group_extended" + groups="base.group_sale_salesman" res_model="crm.phonecall" src_model="crm.lead" view_mode="tree,calendar,form" diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 7de9858713a..a867777cb5b 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -57,7 +57,7 @@ <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_escalate" string="Escalate" states="open,pending" type="object" 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"}'/> @@ -132,7 +132,7 @@ <separator colspan="4" string="Notes"/> <field name="description" nolabel="1" colspan="4"/> </page> - <page string="Extra Info" groups="base.group_extended"> + <page string="Extra Info"> <group colspan="2" col="2"> <separator string="Categorization" colspan="2" col="2"/> <field name="company_id" @@ -353,14 +353,14 @@ domain="[('user_id','=', False)]" help="Unassigned Leads" /> </field> - <field name="subjects" groups="base.group_extended"/> + <field name="subjects"/> <field name="section_id" widget="selection" context="{'invisible_section': False}"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)"/> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/> @@ -406,7 +406,7 @@ <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_escalate" string="Escalate" states="open,pending" type="object" 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"}'/> @@ -501,7 +501,7 @@ </group> <group colspan="2" col="2"> <separator string="Categorization" colspan="2"/> - <field name="type_id" widget="selection" groups="base.group_extended"/> + <field name="type_id" widget="selection"/> <field name="channel_id" widget="selection"/> </group> <group colspan="2" col="2"> @@ -510,7 +510,7 @@ <field name="optout" on_change="on_change_optout(optout)"/> </group> </page> - <page string="Extra Info" groups="base.group_extended"> + <page string="Extra Info"> <group col="2" colspan="2"> <separator string="Misc" colspan="2"/> <field name="active"/> @@ -598,11 +598,11 @@ <field name="section_id" context="{'invisible_section': False}" widget="selection"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}" help="My Sales Team(s)" /> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/> @@ -617,7 +617,7 @@ <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> - <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" groups="base.group_extended"/> + <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <separator orientation="vertical" /> diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index d740a00cf02..bdad98592b0 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -30,7 +30,7 @@ <field name="name" select="1" string="Summary" required="1" /> <field name="categ_id" widget="selection" - string="Meeting Type" groups="base.group_extended" + string="Meeting Type" domain="[('object_id.model', '=', 'crm.meeting')]" /> <field name="allday" on_change="onchange_dates(date,False,False,allday)" /> <newline/> @@ -53,9 +53,8 @@ <group col="2" colspan="2"> <separator colspan="2" string="Assignment"/> <field name="user_id" /> - <field name="organizer" groups="base.group_extended"/> - <field name="section_id" widget="selection" - groups="base.group_extended"/> + <field name="organizer"/> + <field name="section_id" widget="selection"/> </group><group col="2" colspan="2"> <separator colspan="2" string="Contacts"/> <field name="partner_id" string="Partner" @@ -63,8 +62,8 @@ <field name="email_from"/> </group><group col="2" colspan="2"> <separator colspan="2" string="Visibility"/> - <field name="class" string="Privacy" groups="base.group_extended"/> - <field name="show_as" string="Show time as" groups="base.group_extended"/> + <field name="class" string="Privacy"/> + <field name="show_as" string="Show time as"/> <field name="rrule" invisible="1" readonly="1"/> <field name="recurrent_id" invisible="1"/> <field name="recurrent_uid" invisible="1"/> @@ -73,7 +72,7 @@ <separator string="Description" colspan="4" /> <field name="description" nolabel="1" colspan="4" /> <separator colspan="4"/> - <group col="8" colspan="4" groups="base.group_extended"> + <group col="8" colspan="4" groups="base.group_no_one"> <field name="state" /> <button name="case_close" string="Done" states="open" type="object" @@ -234,7 +233,7 @@ <field name="duration" /> <field name="partner_id" string="Partner" /> <field name="location" /> - <field name="categ_id" groups="base.group_extended" /> + <field name="categ_id"/> </tree> </field> </record> @@ -278,13 +277,13 @@ <group> <field name="name" string="Meeting / Partner" filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/> - <field name="user_id" groups="base.group_extended"> - <filter icon="terp-personal" groups="base.group_extended" + <field name="user_id"> + <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Meetings" /> </field> - <field name="section_id" widget="selection" groups="base.group_extended"> - <filter icon="terp-personal+" groups="base.group_extended" + <field name="section_id" widget="selection"> + <filter icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> </field> diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 4b7174028ed..693ed981325 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -9,7 +9,7 @@ src_model="res.partner" view_mode="calendar,tree,form" context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" - groups="base.group_extended" + groups="base.group_sale_salesman" /> <!-- TO CONFIRM: This is fine --> @@ -57,7 +57,7 @@ </record> <menuitem name="Phone Calls" id="menu_crm_case_phone" - groups="base.group_extended,base.group_sale_salesman" + groups="base.group_sale_salesman" parent="base.menu_base_partner" sequence="4" /> <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0"> diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index eb836428b6e..af49956eda8 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -142,7 +142,7 @@ string="Partner" /> <field name="partner_phone" invisible="1"/> - <field name="user_id" groups="base.group_extended"/> + <field name="user_id"/> <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]" invisible="1"/> @@ -210,7 +210,7 @@ </field> <field name="section_id" widget="selection" string="Sales Team"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> </field> @@ -260,7 +260,7 @@ </field> <field name="section_id" widget="selection" string="Sales Team"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> </field> diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index b03f25281af..aa27b7fdaa8 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -15,7 +15,7 @@ parent="base.menu_base_config" sequence="0" groups="base.group_sale_manager"/> <menuitem id="menu_crm_config_phonecall" name="Phone Calls" - parent="base.menu_base_config" sequence="45" groups="base.group_extended"/> + parent="base.menu_base_config" sequence="45" groups="base.group_sale_salesman"/> <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" /> @@ -84,7 +84,7 @@ <field name="allow_unlink" select="2"/> <field name="change_responsible"/> </group> - <group col="1" colspan="4" groups="base.group_extended"> + <group col="1" colspan="4"> <separator string="Team Members" colspan="4"/> <field name="member_ids" nolabel="1" colspan="4" height="250"/> </group> @@ -373,7 +373,7 @@ <menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" - groups="base.group_extended" sequence="15" + groups="base.group_no_one" sequence="15" parent="base.menu_base_config" /> <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1"> diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index b2cb3b1bfea..e012d4745e4 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -114,7 +114,7 @@ <separator orientation="vertical" /> <field name="section_id" context="{'invisible_section': False}"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> @@ -124,7 +124,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="partner_id"/> <separator orientation="vertical"/> <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" /> @@ -190,7 +190,7 @@ <field name="creation_month" invisible="1"/> <field name="creation_day" invisible="1"/> <field name="deadline_month" invisible="1"/> - <field name="section_id" invisible="1" groups="base.group_extended"/> + <field name="section_id" invisible="1"/> <field name="user_id" invisible="1"/> <field name="partner_id" invisible="1"/> <field name="country_id" invisible="1"/> @@ -262,7 +262,7 @@ </record> <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree" - groups="base.group_extended" + groups="base.group_sale_manager" parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/> <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree" diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index f745d93e3ef..ea210ddc85a 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -78,7 +78,7 @@ <separator orientation="vertical" /> <field name="section_id" string="Sales Team" context="{'invisible_section': False}"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> @@ -88,7 +88,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="partner_id"/> <separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/> @@ -155,7 +155,7 @@ </record> <menuitem name="Phone Calls Analysis" - groups="base.group_extended" + groups="base.group_sale_salesman" action="action_report_crm_phonecall" id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="15"/> diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index 8e01d9d6bea..6926464cd93 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -11,8 +11,7 @@ <field eval="18" name="priority"/> <field name="arch" type="xml"> <field name="user_id" position="after"> - <field name="section_id" completion="1" widget="selection" - groups="base.group_extended"/> + <field name="section_id" completion="1" widget="selection"/> </field> </field> </record> @@ -25,8 +24,7 @@ <field eval="18" name="priority"/> <field name="arch" type="xml"> <field name="phone" position="after"> - <field name="section_id" completion="1" widget="selection" - groups="base.group_extended"/> + <field name="section_id" completion="1" widget="selection"/> </field> </field> </record> @@ -39,8 +37,7 @@ <field eval="18" name="priority"/> <field name="arch" type="xml"> <field name="category_id" position="after"> - <field name="section_id" completion="1" widget="selection" - groups="base.group_extended"/> + <field name="section_id" completion="1" widget="selection"/> </field> </field> </record> diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml index f75f3d5b90e..48cfec802d7 100644 --- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml +++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml @@ -40,7 +40,7 @@ res_model="crm.partner2opportunity" src_model="res.partner" view_id="view_crm_partner2opportunity" view_mode="form" target="new" view_type="form" - groups="base.group_extended"/> + groups="base.group_sale_salesman"/> </data> </openerp> diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index c54f161dab3..2f87da24b4c 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -4,12 +4,12 @@ <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10" - groups="base.group_extended,base.group_sale_salesman" + groups="base.group_sale_salesman" web_icon="images/project.png" web_icon_hover="images/project-hover.png"/> <menuitem id="base.menu_aftersale" name="After-Sale Services" - groups="base.group_extended,base.group_sale_salesman" + groups="base.group_sale_salesman" parent="base.menu_main_pm" sequence="2" /> <!-- Claims Menu --> diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index ada4db06237..03639fc10e4 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -3,7 +3,7 @@ <data> <menuitem id="menu_config_claim" name="Claim" - groups="base.group_extended" + groups="base.group_no_one" parent="base.menu_base_config" sequence="55" /> <!-- Claims categories --> @@ -145,7 +145,7 @@ <field name="resolution" colspan="2" nolabel="1"/> </group> </page> - <page string="Communication & History" groups="base.group_extended"> + <page string="Communication & History"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char"/> </group> diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po index e9d05aa12c3..cd5ef5d23a8 100644 --- a/addons/crm_claim/i18n/ja.po +++ b/addons/crm_claim/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-04-23 20:42+0000\n" +"PO-Revision-Date: 2012-04-25 05:03+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-24 04:53+0000\n" -"X-Generator: Launchpad (build 15135)\n" +"X-Launchpad-Export-Date: 2012-04-26 04:41+0000\n" +"X-Generator: Launchpad (build 15149)\n" #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -68,7 +68,7 @@ msgstr "Eメール担当者" #. module: crm_claim #: view:crm.claim.report:0 msgid "#Claim" -msgstr "クレイムの数" +msgstr "苦情の数" #. module: crm_claim #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act @@ -76,7 +76,7 @@ msgid "" "You can create claim stages to categorize the status of every claim entered " "in the system. The stages define all the steps required for the resolution " "of a claim." -msgstr "" +msgstr "入力された苦情の状態を分類するために苦情の手順を指定することができます。その状態は、苦情を解消するために必要な手順を定義します。" #. module: crm_claim #: code:addons/crm_claim/crm_claim.py:132 @@ -105,7 +105,7 @@ msgstr "社内注記を追加" msgid "" "Sales team to which Case belongs to.Define Responsible user and Email " "account for mail gateway." -msgstr "" +msgstr "案件を割当てたセールスチーム。担当するユーザとEメールアドレスを指定して下さい。" #. module: crm_claim #: view:crm.claim:0 @@ -271,7 +271,7 @@ msgstr "クレームの件名" msgid "" "Have a general overview of all claims processed in the system by sorting " "them with specific criteria." -msgstr "" +msgstr "全てのクレームを指定した基準で分類して一覧を表示する。" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -709,7 +709,7 @@ msgstr "先月に作成されたクレーム" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim5 msgid "Actions Defined" -msgstr "" +msgstr "定義された処理" #. module: crm_claim #: view:crm.claim:0 @@ -780,7 +780,7 @@ msgstr "高" msgid "" "Create claim categories to better manage and classify your claims. Some " "example of claims can be: preventive action, corrective action." -msgstr "" +msgstr "クレームを運類して管理するための苦情の種類を定義します。例えば、苦情の予防措置,修正措置など。" #. module: crm_claim #: field:crm.claim.report,create_date:0 diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index adf4b17c949..a100747690e 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -82,7 +82,7 @@ <field name="section_id" string="Sales Team" context="{'invisible_section': False}"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> @@ -100,7 +100,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> @@ -191,11 +191,10 @@ </record> <menuitem id="base.menu_project_report" name="Project" - groups="base.group_extended" + groups="base.group_no_one" parent="base.menu_reporting" sequence="30"/> <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree" - groups="base.group_extended" action="action_report_crm_claim" parent="base.menu_project_report" sequence="15"/> diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml index ba44c456028..ae758a58392 100644 --- a/addons/crm_fundraising/crm_fundraising_menu.xml +++ b/addons/crm_fundraising/crm_fundraising_menu.xml @@ -5,7 +5,7 @@ <!-- MENU --> <menuitem id="base.menu_fundrising" name="Fund Raising" - groups="base.group_extended,base.group_sale_salesman" + groups="base.group_sale_salesman" parent="base.menu_base_partner" sequence="8" /> <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1"> diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index 012f06ea14c..48eb1aa3072 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -3,7 +3,7 @@ <data> <!-- Fund Raising Configuration Menu --> <menuitem id="menu_config_fundrising" name="Fund Raising" - groups="base.group_extended" + groups="base.group_no_one" parent="base.menu_base_config" sequence="65" /> <!-- Fund Raising Categories Form View --> @@ -60,7 +60,6 @@ states="draft,open" type="object" icon="gtk-media-pause" /> <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" - groups="base.group_extended" icon="gtk-go-up" /> <button name="case_close" string="Done" states="open,draft,pending" type="object" @@ -118,7 +117,6 @@ icon="gtk-media-pause" /> <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" - groups="base.group_extended" icon="gtk-go-up" /> <button name="case_close" string="Done" states="open,draft,pending" type="object" @@ -128,7 +126,7 @@ type="object" icon="gtk-convert" /> </group> </page> - <page string="Communication & History" groups="base.group_extended"> + <page string="Communication & History"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char"/> </group> @@ -151,7 +149,7 @@ name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/> </page> - <page string="Extra Info" groups="base.group_extended"> + <page string="Extra Info"> <group col="2" colspan="2"> <separator colspan="4" string="Misc"/> <field name="active"/> @@ -235,7 +233,7 @@ help="Unassigned" /> </field> <field name="section_id" widget="selection" string="Sales Team"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> </field> diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 46f989629d2..4a0323ff4da 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -101,7 +101,7 @@ <separator orientation="vertical" /> <field name="section_id" string="Sales Team" context="{'invisible_section': False}"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> @@ -117,7 +117,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> @@ -190,7 +190,7 @@ <menuitem name="Fundraising Analysis" action="action_report_crm_fundraising" - groups="base.group_extended" + groups="base.group_sale_salesman" id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="30"/> </data> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 96d862f1603..b2c7337b7d3 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -43,7 +43,7 @@ </record> <menuitem name="Helpdesk and Support" id="menu_help_support_main" - groups="base.group_extended,base.group_sale_salesman" + groups="base.group_sale_salesman" parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/> </data> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 5f2fee07ff1..48681357660 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -3,7 +3,7 @@ <data> <!-- Helpdesk Support Categories Configuration Menu--> <menuitem id="menu_config_helpdesk" name="Helpdesk" - groups="base.group_extended" + groups="base.group_no_one" parent="base.menu_base_config" sequence="60" /> <!-- Helpdesk Support Categories Form View --> @@ -89,7 +89,7 @@ icon="gtk-convert" /> </group> </page> - <page string="Communication & History" groups="base.group_extended"> + <page string="Communication & History"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char"/> </group> @@ -112,7 +112,7 @@ name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/> </page> - <page string="Extra Info" groups="base.group_extended"> + <page string="Extra Info"> <group colspan="2" col="2" groups="base.group_no_one"> <separator colspan="4" string="Dates"/> <field name="create_date"/> @@ -167,7 +167,6 @@ states="draft,open" type="object" icon="gtk-media-pause" /> <button name="case_escalate" string="Escalate" - groups="base.group_extended" states="open,draft,pending" type="object" icon="gtk-go-up" /> <button name="case_close" string="Done" @@ -232,7 +231,7 @@ <field name="partner_id" /> <field name="user_id" widget="selection"/> <field name="section_id" widget="selection" string="Sales Team"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> </field> diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index 7b5cadf1041..64d54fc8cd9 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -75,7 +75,7 @@ <separator orientation="vertical" /> <field name="section_id" string="Sales Team" context="{'invisible_section': False}"> - <filter icon="terp-personal+" groups="base.group_extended" + <filter icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> @@ -91,7 +91,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..." groups="base.group_no_one"> <field name="priority" string="Priority"/> <field name="categ_id"/> <newline/> @@ -157,11 +157,10 @@ </record> <menuitem id="base.menu_project_report" name="Project" - groups="base.group_extended" + groups="base.group_no_one" parent="base.menu_reporting" sequence="30"/> <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk" - groups="base.group_extended" id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="20"/> </data> diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml index 224a52a104c..9c8d1fb8817 100644 --- a/addons/crm_partner_assign/crm_lead_view.xml +++ b/addons/crm_partner_assign/crm_lead_view.xml @@ -9,7 +9,7 @@ <field name="arch" type="xml"> <data> <xpath expr="//notebook/page[@string='Lead']" position="after"> - <page string="Assignation" groups="base.group_extended"> + <page string="Assignation"> <group name="partner_assign_group" col="5" colspan="4"> <separator string="Partner Assignation" colspan="5"/> <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','<>',False)]"/> diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml index 9f6546aee4a..256719c8742 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -30,7 +30,7 @@ <field name="partner_assigned_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="partner_id"/> <separator orientation="vertical"/> <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/> @@ -110,7 +110,7 @@ <field name="year" invisible="1"/> <field name="month" invisible="1"/> <field name="date_assign" invisible="1"/> - <field name="section_id" invisible="1" groups="base.group_extended"/> + <field name="section_id" invisible="1"/> <field name="user_id" invisible="1"/> <field name="grade_id" invisible="1" widget="selection"/> <field name="partner_assigned_id" invisible="1"/> @@ -161,7 +161,6 @@ </record> <menuitem id="menu_report_crm_opportunities_assign_tree" - groups="base.group_extended" parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="20"/> </data> diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml index e7581f5bab5..1cae2a82822 100644 --- a/addons/crm_partner_assign/report/crm_partner_report_view.xml +++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml @@ -57,7 +57,7 @@ <field name="date_review" invisible="1"/> <field name="date_partnership" invisible="1"/> <field name="period_id" invisible="1"/> - <field name="section_id" invisible="1" groups="base.group_extended"/> + <field name="section_id" invisible="1"/> <field name="user_id" invisible="1"/> <field name="opp"/> <field name="turnover"/> @@ -76,7 +76,6 @@ </record> <menuitem id="menu_report_crm_partner_assign_tree" - groups="base.group_extended" parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/> </data> diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 83e591b6f01..f39e8a59f39 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -44,7 +44,7 @@ <form string="Delivery grids"> <field name="name" select="1"/> <field name="active" select="1"/> - <field name="sequence" groups="base.group_extended" select="1"/> + <field name="sequence" select="1"/> <notebook colspan="4"> <page string="Grid definition"> <field colspan="4" name="line_ids" nolabel="1" select="1"/> @@ -97,7 +97,7 @@ <field name="name" select="1"/> <field name="active" select="1"/> <field name="carrier_id" select="1"/> - <field name="sequence" groups="base.group_extended" select="1"/> + <field name="sequence" select="1"/> <notebook colspan="4"> <page string="Grid definition"> <field colspan="4" name="line_ids" nolabel="1" select="1"/> @@ -139,7 +139,7 @@ </group> <newline/> <field name="list_price"/> - <field name="standard_price" groups="base.group_extended"/> + <field name="standard_price"/> <field name="price_type"/> <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/> </form> @@ -156,7 +156,7 @@ <field name="operator"/> <field name="max_value" nolabel="1"/> <field name="list_price"/> - <field name="standard_price" groups="base.group_extended"/> + <field name="standard_price"/> </tree> </field> </record> @@ -182,8 +182,8 @@ <field name="arch" type="xml"> <field name="partner_id" position="after"> <field name="carrier_id"/> - <field name="carrier_tracking_ref" groups="base.group_extended"/> - <field name="number_of_packages" groups="base.group_extended"/> + <field name="carrier_tracking_ref"/> + <field name="number_of_packages"/> <field name="weight"/> <field name="weight_net"/> </field> @@ -274,7 +274,7 @@ <field name="inherit_id" ref="stock.view_move_form"/> <field name="arch" type="xml"> <group colspan="2" col="2" position="after"> - <group colspan="2" col="2" groups="base.group_extended"> + <group colspan="2" col="2"> <separator string="Weights" colspan="2"/> <field name="weight"/> <field name="weight_net"/> @@ -290,7 +290,7 @@ <field name="inherit_id" ref="stock.view_move_form_reception_picking"/> <field name="arch" type="xml"> <group colspan="2" col="2" position="after"> - <group colspan="2" col="2" groups="base.group_extended"> + <group colspan="2" col="2"> <separator string="Weights" colspan="2"/> <field name="weight"/> <field name="weight_net"/> diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index e426444f26d..b5f2ad3fca8 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -43,7 +43,7 @@ <search string="Search Document storage"> <field name="name" /> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> </group> </search> @@ -62,7 +62,7 @@ name="Storage Media" action="action_document_storage_form" id="menu_document_storage_media" - groups="base.group_extended" + groups="base.group_no_one" parent="menu_document_management_configuration"/> <record model="ir.ui.view" id="view_document_directory_form"> @@ -94,11 +94,11 @@ <field name="ressource_id" select="2" readonly="1"/> </group> <group colspan="4" col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}"> - <field name="resource_find_all" groups="base.group_extended" /> + <field name="resource_find_all"/> </group> </page> - <page string="Generated Files" groups="base.group_extended"> + <page string="Generated Files" groups="base.group_no_one"> <label colspan="4" string="For each entry here, virtual files will appear in this folder." /> <field name="content_ids" nolabel="1" colspan="4" > <form string="Contents"> @@ -119,7 +119,7 @@ </tree> </field> </page> - <page string="Dynamic context" groups="base.group_extended"> + <page string="Dynamic context" groups="base.group_no_one"> <label colspan="4" string="Define words in the context, for all child directories and files" /> <field name="dctx_ids" nolabel="1" colspan="4"> <tree string="Fields" editable="bottom"> @@ -173,7 +173,7 @@ <field name="company_id" groups="base.group_multi_company"/> <field name="storage_id" /> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> @@ -275,7 +275,7 @@ <field name="write_date" readonly="1"/> </group> </page> - <page string="Indexed Content - experimental" groups="base.group_extended"> + <page string="Indexed Content - experimental" groups="base.group_no_one"> <field name="index_content" colspan="4" nolabel="1"/> </page> <page string="Notes"> @@ -312,9 +312,6 @@ <field name="type">search</field> <field name="inherit_id" ref="base.view_attachment_search"/> <field name="arch" type="xml"> - <xpath expr="/search/group[@string='Group By...']" position="attributes"> - <attribute name="groups">base.group_extended</attribute> - </xpath> <filter string="Owner" position="replace"> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> @@ -337,8 +334,8 @@ <field name="company_id"/> <field name="create_date" groups="base.group_no_one"/> <field name="write_date" groups="base.group_no_one"/> - <field name="partner_id" groups="base.group_extended" /> - <field name="type" groups="base.group_extended"/> + <field name="partner_id"/> + <field name="type"/> </tree> </field> @@ -416,8 +413,7 @@ context="{'default_partner_id': active_id}" id="act_res_partner_document" name="Related Documents" res_model="ir.attachment" - src_model="res.partner" - groups="base.group_extended"/> + src_model="res.partner"/> <act_window domain="[('parent_id', '=', active_id)]" diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml index 675c791109c..66707024c52 100644 --- a/addons/document_ftp/wizard/ftp_configuration_view.xml +++ b/addons/document_ftp/wizard/ftp_configuration_view.xml @@ -48,7 +48,6 @@ <record model="ir.actions.todo" id="config_auto_directory"> <field name="action_id" ref="action_config_auto_directory"/> <field name="category_id" ref="document.category_knowledge_mgmt_config"/> - <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/> <field name="type">automatic</field> </record> </data> diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml index c9b924ddc1a..a17595323a5 100644 --- a/addons/document_webdav/webdav_view.xml +++ b/addons/document_webdav/webdav_view.xml @@ -41,7 +41,7 @@ <field name="name" /> <field name="namespace" /> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_no_one"> <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/> <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/> </group> @@ -60,14 +60,14 @@ <menuitem name="DAV Properties" id="menu_properties" - groups="base.group_extended" + groups="base.group_no_one" parent="document.menu_document_management_configuration"/> <menuitem name="Folders" action="action_dir_props_form" id="menu_folder_props" - groups="base.group_extended" + groups="base.group_no_one" parent="menu_properties"/> <!-- Add the properties to the directory form --> @@ -140,7 +140,7 @@ <field name="name" /> <field name="namespace" /> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_no_one"> <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/> <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/> </group> @@ -160,7 +160,7 @@ name="Documents" action="action_file_props_form" id="menu_document_props" - groups="base.group_extended" + groups="base.group_no_one" parent="menu_properties"/> </data> </openerp> diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index ef6451a9736..a90856d53c3 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -76,7 +76,7 @@ help="Remove the sidebar button currently displayed on related documents" /> </group> - <group colspan="2" col="2" groups="base.group_extended"> + <group colspan="2" col="2"> <separator string="Advanced Options" colspan="2"/> <field name="mail_server_id"/> <field name="track_campaign_item"/> diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml index 0d2f919a96e..21269443511 100644 --- a/addons/email_template/res_partner_view.xml +++ b/addons/email_template/res_partner_view.xml @@ -8,9 +8,9 @@ <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> <xpath expr="/form/notebook/page/field[@name='active']" position="after"> - <field name="opt_out" groups="base.group_extended"/> + <field name="opt_out"/> </xpath> </field> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 4e22569c3e1..b30a778047b 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -104,7 +104,7 @@ <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/> </group> </page> - <page string="Speakers" groups="base.group_extended"> + <page string="Speakers"> <field name="main_speaker_id" domain="[('speaker','=',True)]"/> <field name="speaker_confirmed"/> <separator string="Other Speakers" colspan="4"/> @@ -122,8 +122,8 @@ <group col="2" colspan="2"> <separator string="Emails" colspan="2"/> <field name="reply_to"/> - <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]" groups="base.group_extended"/> - <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]" groups="base.group_extended"/> + <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/> + <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/> </group> </page> </notebook> @@ -337,8 +337,8 @@ <field name="email"/> <field name="event_id" /> <field name="nb_register"/> - <field name="user_id" groups="base.group_extended"/> - <field name="origin" groups="base.group_extended"/> + <field name="user_id"/> + <field name="origin"/> <field name="state"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/> <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/> @@ -386,7 +386,7 @@ <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/> </group> </page> - <page string="Emails" groups="base.group_extended"> + <page string="Emails"> <!-- <field name="message_ids" colspan="4" nolabel="1" mode="tree"> <tree string="History"> @@ -451,18 +451,18 @@ <field name="event_id" widget="selection"/> <field name="name" string="Participant" filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/> - <field name="user_id" groups="base.group_extended"> + <field name="user_id"> <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/> </field> - <field name="origin" groups="base.group_extended"/> + <field name="origin"/> </group> <newline/> <group expand="0" string="Group By..."> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" groups="base.group_extended"/> + <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index b6c8d832c6d..71d656740fe 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -87,7 +87,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="event_type" widget="selection"/> <field name="event_date"/> </group> diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index 4387e3a725a..c25a10bb52f 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -11,7 +11,7 @@ <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/> </field> <field name='supply_method' position='after'> - <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}" groups="base.group_extended"/> + <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/> </field> </field> </record> diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 3344183a92a..3d9acf2bbd5 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -46,7 +46,7 @@ <group col="2" colspan="2"> <separator string="Actions to Perform on Incoming Mails" colspan="2"/> <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/> - <field name="action_id" groups="base.group_extended"/> + <field name="action_id"/> </group> <group attrs="{'invisible' : [('type', '!=', 'local')]}" colspan="4" col="4"> <separator string="Configuration" colspan="4"/> @@ -54,10 +54,10 @@ <field name="script" colspan="4" widget="url"/> </group> </page> - <page string="Advanced" groups="base.group_extended"> + <page string="Advanced" groups="base.group_no_one"> <group colspan="2" col="2"> <separator string="Advanced options" colspan="2"/> - <field name="priority" groups="base.group_extended"/> + <field name="priority"/> <field name="attach"/> <field name="original"/> <field name="active" select="1"/> diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index a954d916385..c60eaed818d 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -27,8 +27,8 @@ <group colspan="6" col="6"> <field colspan="6" name="name" /> <field name="user_id" on_change="onchange_user(user_id)"/> - <field name="company_id" widget="selection" groups="base.group_multi_company,base.group_extended" on_change="onchange_company(company_id)"/> - <field name="active" groups="base.group_extended"/> + <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/> + <field name="active"/> <newline/> <field name="department_id" on_change="onchange_department_id(department_id)" /> <field name="parent_id" /> @@ -42,8 +42,8 @@ <group col="2" colspan="2" groups="base.group_hr_user"> <separator colspan="2" string="Social IDs"/> <field name="ssnid"/> - <field name="sinid" groups="base.group_extended"/> - <field name="identification_id" groups="base.group_extended"/> + <field name="sinid"/> + <field name="identification_id"/> <field name="passport_id"/> <field name="otherid"/> </group> @@ -109,12 +109,12 @@ <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/> </field> <field name="job_id" widget="selection"/> - <field name="category_ids" select="1" groups="base.group_extended"/> + <field name="category_ids" select="1"/> <field name="parent_id"/> <newline /> <group expand="0" string="Group By..."> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/> - <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/> + <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/> <separator orientation="vertical" /> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index c70c1d27923..b82c8f6f850 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -68,7 +68,7 @@ <field name="plan_id" widget="selection"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="rating"/> <newline/> <field name="deadline"/> diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 66d2aa89617..babceb2116f 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -49,7 +49,7 @@ <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses" editable="top"> <field name="employee_id"/> <field name="date"/> - <field name="department_id" groups="base.group_extended"/> + <field name="department_id"/> <field name="ref"/> <field name="name"/> <field name="amount"/> @@ -69,10 +69,10 @@ <group colspan="4" col="6"> <field name="employee_id" on_change="onchange_employee_id(employee_id)"/> <field name="name"/> - <field name="ref" groups="base.group_extended"/> + <field name="ref"/> <field name="date"/> <field name="currency_id"/> - <field name="department_id" groups="base.group_extended"/> + <field name="department_id"/> <field name="company_id" groups="base.group_multi_company"/> </group> <notebook colspan="4"> @@ -108,7 +108,7 @@ <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/> </group> </page> - <page string="Other Info" groups="base.group_extended"> + <page string="Other Info"> <group col="2" colspan="2"> <separator colspan="2" string="Accounting data"/> <field name="journal_id"/> diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 0685880b863..32f4ab32b65 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -77,7 +77,7 @@ <field name="department_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="product_id"/> <separator orientation="vertical"/> <field name="user_id"/> diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 066ac29c6e3..2a4dcc92723 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -378,7 +378,7 @@ <group colspan="4" col="6"> <field name="name"/> <field name="color_name"/> - <field name="categ_id" widget="selection" groups="base.group_extended"/> + <field name="categ_id" widget="selection"/> </group> <notebook colspan="4"> <page string="Details"> 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 22cdca38936..ba8b180ff9a 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -39,7 +39,6 @@ parent="menu_hr_leaves_reports" action="action_hr_holidays_summary_dept" id="menu_account_central_journal" - groups="base.group_extended" icon="STOCK_PRINT"/> </data> diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index e0212a68646..b5ec2e679e3 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -120,7 +120,7 @@ <field name="name"/> <field name="code"/> <field name="category_id"/> - <field name="sequence" groups="base.group_extended" invisible="1"/> + <field name="sequence" invisible="1"/> <field name="register_id"/> </tree> </field> @@ -167,7 +167,7 @@ <tree string="Salary Structure" editable="bottom" colors="blue:total == 0"> <field name="category_id"/> <field name="employee_id" invisible="1"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence"/> <field name="name"/> <field name="code"/> <field name="quantity"/> @@ -197,7 +197,7 @@ <field name="amount_select"/> <field name="amount_fix" attrs="{'readonly':[('amount_select','<>','fix')]}"/> <field name="amount_percentage" attrs="{'readonly':[('amount_select','<>','percentage')]}"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence"/> </group> <notebook colspan="4"> <page string="Description"> @@ -265,8 +265,8 @@ <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/> <field name="number"/> <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/> - <field name="contract_id" groups="base.group_extended" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/> - <field name="struct_id" groups="base.group_extended" attrs="{'required':[('contract_id','<>',False)]}"/> + <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/> + <field name="struct_id" attrs="{'required':[('contract_id','<>',False)]}"/> <field name="date_to"/> <field name="name" colspan="4"/> <field name="credit_note"/> @@ -279,7 +279,7 @@ <field name="code"/> <field name="number_of_days" sum="Total Working Days"/> <field name="number_of_hours"/> - <field name="contract_id" groups="base.group_extended"/> + <field name="contract_id"/> <field name="sequence" invisible="True"/> </tree> <form string="Worked Day"> @@ -287,10 +287,10 @@ <field name="name" select="1"/> <field name="code" select="1"/> <field name="payslip_id"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence"/> <field name="number_of_days"/> <field name="number_of_hours"/> - <field name="contract_id" groups="base.group_extended"/> + <field name="contract_id"/> </group> </form> </field> @@ -299,7 +299,7 @@ <field name="name"/> <field name="code"/> <field name="amount"/> - <field name="contract_id" groups="base.group_extended"/> + <field name="contract_id"/> <field name="sequence" invisible="True"/> </tree> <form string="Payslip Line"> @@ -307,9 +307,9 @@ <field name="name" select="1"/> <field name="code" select="1"/> <field name="payslip_id"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence"/> <field name="amount"/> - <field name="contract_id" groups="base.group_extended"/> + <field name="contract_id"/> </group> </form> </field> @@ -331,12 +331,12 @@ <field name="name" select="1"/> <field name="code" select="1"/> <field name="category_id"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence"/> <field name="quantity"/> <field name="rate"/> <field name="amount"/> <field name="total"/> - <field name="salary_rule_id" groups="base.group_extended"/> + <field name="salary_rule_id"/> </group> </form> </field> @@ -565,7 +565,7 @@ <field name="name"/> <field name="code"/> <field name="category_id"/> - <field name="sequence" groups="base.group_extended" invisible="1"/> + <field name="sequence" invisible="1"/> <field name="register_id"/> </tree> </field> diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 9e4948eebc6..1adc30daa28 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -106,7 +106,7 @@ <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"/> + <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)]}"/> <field name="response" invisible="1"/> </group> <newline/> @@ -357,7 +357,7 @@ <tree string="Stages"> <field name="sequence" invisible="1"/> <field name="name"/> - <field name="department_id" groups="base.group_extended"/> + <field name="department_id"/> </tree> </field> </record> @@ -373,7 +373,7 @@ <group colspan="4" col="6"> <separator string="Stage Definition" colspan="6"/> <field name="name" select="1"/> - <field name="department_id" groups="base.group_extended"/> + <field name="department_id"/> <field name="sequence"/> </group> <separator string="Requirements" colspan="4"/> diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 994102cab43..112258ac4af 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -89,7 +89,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <!--field name="job_id"/--> <field name="priority"/> <field name="stage_id" widget="selection"/> diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 352bacd0b06..e4838edbd3e 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -42,7 +42,7 @@ </group> <group colspan="2" col="2"> <separator string="Accounting" colspan="2"/> - <field domain="[('type','=','normal'),('state', '<>', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/> + <field domain="[('type','=','normal'),('state', '<>', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/> <field name="amount"/> <field name="general_account_id"/> <field name="journal_id"/> 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 063481f5211..197b3d2435d 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml @@ -35,7 +35,7 @@ <menuitem action="action_hr_timesheet_employee" id="menu_hr_timesheet_employee" parent="menu_hr_timesheet_reports" - groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/> + sequence="2" icon="STOCK_PRINT"/> <!-- Print My Timesheet --> 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 ee6b619ceeb..99ac6edc675 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 @@ -38,7 +38,7 @@ <menuitem action="action_hr_timesheet_analytic_profit" id="menu_hr_timesheet_analytic_profit" - parent="hr_timesheet.menu_hr_timesheet_reports" groups="base.group_extended" icon="STOCK_PRINT"/> + parent="hr_timesheet.menu_hr_timesheet_reports" icon="STOCK_PRINT"/> </data> </openerp> 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 514996816cc..5fc6c35d785 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 @@ -33,8 +33,8 @@ <field name="time"/> <field name="name"/> <field name="price"/> - <separator string="Force to use a special product" colspan="4" groups="base.group_extended"/> - <field name="product" groups="base.group_extended"/> + <separator string="Force to use a special product" colspan="4"/> + <field name="product"/> </group> <separator colspan="4"/> <group col="2" colspan="4"> 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 4a2d1a5e536..9f25a49213e 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 @@ -15,9 +15,9 @@ <field name="date"/> <field name="time"/> <field name="name"/> - <field name="price" groups="base.group_extended"/> + <field name="price"/> </group> - <group col="2" colspan="4" groups="base.group_extended"> + <group col="2" colspan="4"> <separator string="Force to use a specific product" colspan="4"/> <field name="product"/> </group> diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 87128b8799f..d822f10d944 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -69,7 +69,7 @@ <newline/> <field name="name"/> <field name="company_id" select="1" groups="base.group_multi_company"/> - <field name="department_id" groups="base.group_extended"/> + <field name="department_id"/> </group> <notebook colspan="4"> <page string="Daily"> diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 11915fb64c9..447c3be6966 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -59,7 +59,7 @@ <field name="user_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="general_account_id"/> <field name="product_id"/> <field name="journal_id"/> diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 468197884ba..96277f10c78 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -77,7 +77,7 @@ <field name="user_id" /> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="general_account_id"/> <field name="to_invoice" widget="selection"/> <separator orientation="vertical"/> diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 4ad479e763f..b5a23b80481 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -211,7 +211,7 @@ </tree> </field> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <field name="vote_ids" nolabel="1" colspan="4" readonly="True"> <tree string="Votes"> <field name="user_id"/> @@ -219,7 +219,7 @@ </tree> </field> </page> - <page string="Statistics" groups="base.group_extended"> + <page string="Statistics"> <group col="6" colspan="4"> <field name="count_comments" /> <field name="count_votes" /> diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml index 58e1e55efd0..8b51576edac 100644 --- a/addons/import_google/sync_google_calendar_view.xml +++ b/addons/import_google/sync_google_calendar_view.xml @@ -9,7 +9,7 @@ <field name="arch" type="xml"> <field name="categ_id" position="replace"> <field name="categ_id" widget="selection" - string="Meeting Type" groups="base.group_extended" + string="Meeting Type" domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" /> </field> </field> @@ -23,10 +23,10 @@ <field name="arch" type="xml"> <field name="categ_id" position="replace"> <field name="categ_id" widget="selection" - string="Meeting Type" groups="base.group_extended" + string="Meeting Type" domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" /> </field> </field> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml index f90451c69f5..e87cd3172a0 100644 --- a/addons/import_sugarcrm/import_sugarcrm_view.xml +++ b/addons/import_sugarcrm/import_sugarcrm_view.xml @@ -75,7 +75,7 @@ <group colspan="4" col="6"> <label string="" colspan="2"/> <button icon="gtk-cancel" special="cancel" string="_Cancel"/> - <button name="import_from_scheduler_all" groups="base.group_extended" string="_Schedule Recurrent Imports" + <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" icon="gtk-execute" /> <button name="import_all" string="_Import" type="object" icon="terp-camera_test"/> 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 6e3f620f41f..f0b0624439f 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 @@ -19,7 +19,7 @@ <field name="ask_payment"/> <field name="client_nihil" string="Is Last Declaration"/><label/> </group> - <group colspan="4" groups="base.group_extended"> + <group colspan="4"> <separator string="Comments" colspan="4"/> <field colspan="4" name="comments" nolabel="1"/> </group> 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 cc7609558ff..b2d64ebf641 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml +++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml @@ -21,12 +21,12 @@ <newline/> <separator string="Periods" colspan="4"/> <field name="period_ids" nolabel="1" colspan="4" height="200"/> - <group colspan="4" groups="base.group_extended"> + <group colspan="4"> <separator string="Comments" colspan="4"/> <field colspan="4" name="comments" nolabel="1"/> </group> </page> - <page string="European Countries" groups="base.group_extended"> + <page string="European Countries"> <field name="country_ids" colspan="4" nolabel="1"/> </page> </notebook> diff --git a/addons/l10n_be_invoice_bba/partner_view.xml b/addons/l10n_be_invoice_bba/partner_view.xml index 7489322a665..8be0f31d612 100644 --- a/addons/l10n_be_invoice_bba/partner_view.xml +++ b/addons/l10n_be_invoice_bba/partner_view.xml @@ -10,8 +10,8 @@ <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> <field name="property_payment_term" position="after"> - <field name="out_inv_comm_type" groups="base.group_extended"/> - <field name="out_inv_comm_algorithm" groups="base.group_extended" attrs="{'invisible':[('out_inv_comm_type','!=','bba')]}"/> + <field name="out_inv_comm_type"/> + <field name="out_inv_comm_algorithm" attrs="{'invisible':[('out_inv_comm_type','!=','bba')]}"/> </field> </field> </record> diff --git a/addons/l10n_br/account_view.xml b/addons/l10n_br/account_view.xml index 0b038fddd82..7cc4373622c 100644 --- a/addons/l10n_br/account_view.xml +++ b/addons/l10n_br/account_view.xml @@ -34,7 +34,7 @@ <field name="inherit_id" ref="account.view_account_tax_template_form"/> <field name="arch" type="xml"> <field position="after" name="price_include"> - <field groups="base.group_extended" name="tax_discount"/> + <field name="tax_discount"/> </field> </field> </record> @@ -45,7 +45,7 @@ <field name="inherit_id" ref="account.view_tax_form"/> <field name="arch" type="xml"> <field position="after" name="price_include"> - <field groups="base.group_extended" name="tax_discount"/> + <field name="tax_discount"/> </field> </field> </record> @@ -56,8 +56,8 @@ <field name="inherit_id" ref="account.view_account_tax_template_form"/> <field name="arch" type="xml"> <field position="after" name="amount"> - <field groups="base.group_extended" name="base_reduction"/> - <field groups="base.group_extended" name="amount_mva"/> + <field name="base_reduction"/> + <field name="amount_mva"/> </field> </field> </record> @@ -68,8 +68,8 @@ <field name="inherit_id" ref="account.view_tax_form"/> <field name="arch" type="xml"> <field position="after" name="amount"> - <field groups="base.group_extended" name="base_reduction"/> - <field groups="base.group_extended" name="amount_mva"/> + <field name="base_reduction"/> + <field name="amount_mva"/> </field> </field> </record> diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index ecd106e05e5..50993f93744 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -91,16 +91,16 @@ <field name="email_from"/> <field name="email_to"/> <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/> - <field name="email_bcc" groups="base.group_extended" attrs="{'invisible':[('email_bcc', '=', False)]}"/> + <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/> <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/> </group> <group col="4" colspan="2"> <separator string="Message Details" colspan="4"/> <field name="model"/> <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/> - <field name="res_id" groups="base.group_extended"/> - <field name="message_id" groups="base.group_extended" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/> - <field name="references" colspan="4" widget="char" size="512" groups="base.group_extended" attrs="{'invisible':[('references', '=', False)]}"/> + <field name="res_id"/> + <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/> + <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/> </group> <notebook colspan="4"> <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}"> @@ -124,7 +124,7 @@ <separator string="Attachments" colspan="4"/> <field name="attachment_ids" nolabel="1" colspan="4"/> </page> - <page string="Advanced" groups="base.group_extended"> + <page string="Advanced" groups="base.group_no_one"> <group col="2" colspan="4"> <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/> <field name="auto_delete"/> @@ -182,14 +182,14 @@ <field name="subject"/> <field name="date"/> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> - <field name="user_id" string="User"/> - <field name="partner_id" string="Partner Name"/> - <field name="model"/> - <field name="res_id"/> + <group expand="0" string="Extended Filters..."> + <field name="user_id" string="User"/> + <field name="partner_id" string="Partner Name"/> + <field name="model"/> + <field name="res_id"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> diff --git a/addons/marketing/i18n/ja.po b/addons/marketing/i18n/ja.po new file mode 100644 index 00000000000..d07123329b6 --- /dev/null +++ b/addons/marketing/i18n/ja.po @@ -0,0 +1,28 @@ +# 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-24 21:01+0000\n" +"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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-25 04:46+0000\n" +"X-Generator: Launchpad (build 15139)\n" + +#. module: marketing +#: model:res.groups,name:marketing.group_marketing_manager +msgid "Manager" +msgstr "マネージャー" + +#. module: marketing +#: model:res.groups,name:marketing.group_marketing_user +msgid "User" +msgstr "ユーザー" diff --git a/addons/marketing_campaign/i18n/fi.po b/addons/marketing_campaign/i18n/fi.po new file mode 100644 index 00000000000..522e59eba57 --- /dev/null +++ b/addons/marketing_campaign/i18n/fi.po @@ -0,0 +1,1073 @@ +# Finnish 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-24 14:22+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Finnish <fi@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-25 04:46+0000\n" +"X-Generator: Launchpad (build 15139)\n" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +msgid "Manual Mode" +msgstr "Manuaalinen tila" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,activity_from_id:0 +msgid "Previous Activity" +msgstr "Edellinen toiminto" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:818 +#, python-format +msgid "The current step for this item has no email or report to preview." +msgstr "" + +#. module: marketing_campaign +#: constraint:marketing.campaign.transition:0 +msgid "The To/From Activity of transition must be of the same Campaign " +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,trigger:0 +msgid "Time" +msgstr "Aika" + +#. module: marketing_campaign +#: selection:marketing.campaign.activity,type:0 +msgid "Custom Action" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +#: view:marketing.campaign.workitem:0 +msgid "Group By..." +msgstr "Ryhmittely..." + +#. module: marketing_campaign +#: help:marketing.campaign.activity,revenue:0 +msgid "" +"Set an expected revenue if you consider that every campaign item that has " +"reached this point has generated a certain revenue. You can get revenue " +"statistics in the Reporting section" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,trigger:0 +msgid "Trigger" +msgstr "" + +#. module: marketing_campaign +#: field:campaign.analysis,count:0 +msgid "# of Actions" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +msgid "Campaign Editor" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: view:marketing.campaign.workitem:0 +msgid "Today" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: selection:marketing.campaign,state:0 +#: view:marketing.campaign.segment:0 +#: selection:marketing.campaign.segment,state:0 +msgid "Running" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "March" +msgstr "maaliskuu" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,object_id:0 +msgid "Object" +msgstr "Kohde" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Sync mode: only records created after last sync" +msgstr "" + +#. module: marketing_campaign +#: model:email.template,body_text:marketing_campaign.email_template_2 +msgid "" +"Hello, We are happy to announce that you now become our Silver Partner." +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +msgid "Set to Draft" +msgstr "Aseta luonnokseksi" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,to_ids:0 +msgid "Next Activities" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Synchronization" +msgstr "Synkronointi" + +#. module: marketing_campaign +#: sql_constraint:marketing.campaign.transition:0 +msgid "The interval must be positive or zero" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:818 +#, python-format +msgid "No preview" +msgstr "Ei esikatselua" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +#: field:marketing.campaign.segment,date_run:0 +msgid "Launch Date" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,day:0 +msgid "Day" +msgstr "Päivä" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Outgoing Transitions" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Reset" +msgstr "Palauta" + +#. module: marketing_campaign +#: help:marketing.campaign,object_id:0 +msgid "Choose the resource on which you want this campaign to be run" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,sync_last_date:0 +msgid "Last Synchronization" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:214 +#, python-format +msgid "You can not duplicate a campaign, it's not supported yet." +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Year(s)" +msgstr "Vuosi(a)" + +#. module: marketing_campaign +#: help:marketing.campaign.segment,sync_last_date:0 +msgid "" +"Date on which this segment was synchronized last time (automatically or " +"manually)" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,state:0 +#: selection:marketing.campaign,state:0 +#: selection:marketing.campaign.segment,state:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "Cancelled" +msgstr "Peruutettu" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,trigger:0 +msgid "Automatic" +msgstr "Automaattinen" + +#. module: marketing_campaign +#: help:marketing.campaign,mode:0 +msgid "" +"Test - It creates and process all the activities directly (without waiting " +"for the delay on transitions) but does not send emails or produce reports.\n" +"Test in Realtime - It creates and processes all the activities directly but " +"does not send emails or produce reports.\n" +"With Manual Confirmation - the campaigns runs normally, but the user has to " +"validate all workitem manually.\n" +"Normal - the campaign runs normally and automatically sends all emails and " +"reports (be very careful with this mode, you're live!)" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.segment,date_run:0 +msgid "Initial start date of this segment." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,campaign_id:0 +#: view:marketing.campaign:0 +#: field:marketing.campaign.activity,campaign_id:0 +#: view:marketing.campaign.segment:0 +#: field:marketing.campaign.segment,campaign_id:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,campaign_id:0 +msgid "Campaign" +msgstr "Kampanja" + +#. module: marketing_campaign +#: model:email.template,subject:marketing_campaign.email_template_3 +msgid "Congratulation! You become our Gold Partner." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,segment_id:0 +#: view:marketing.campaign.segment:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,segment_id:0 +msgid "Segment" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Cost / Revenue" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,type:0 +msgid "" +"The type of action to execute when an item enters this activity, such as:\n" +" - Email: send an email using a predefined email template\n" +" - Report: print an existing Report defined on the resource item and save " +"it into a specific directory\n" +" - Custom Action: execute a predefined action, e.g. to modify the fields " +"of the resource record\n" +" " +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.segment,date_next_sync:0 +msgid "Next time the synchronization job is scheduled to run automatically" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Month(s)" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,partner_id:0 +#: model:ir.model,name:marketing_campaign.model_res_partner +#: field:marketing.campaign.workitem,partner_id:0 +msgid "Partner" +msgstr "Kumppani" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Transitions" +msgstr "" + +#. module: marketing_campaign +#: model:ir.filters,name:marketing_campaign.filter0 +msgid "Partners" +msgstr "Kumppanit" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,keep_if_condition_not_met:0 +msgid "Don't delete workitems" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,state:0 +#: view:marketing.campaign:0 +#: field:marketing.campaign,state:0 +#: view:marketing.campaign.segment:0 +#: field:marketing.campaign.segment,state:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,state:0 +msgid "State" +msgstr "Tila" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid "Marketing Reports" +msgstr "Markkinointiraportit" + +#. module: marketing_campaign +#: selection:marketing.campaign,state:0 +#: selection:marketing.campaign.segment,state:0 +msgid "New" +msgstr "Uusi" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,type:0 +msgid "Type" +msgstr "Tyyppi" + +#. module: marketing_campaign +#: field:marketing.campaign,name:0 +#: field:marketing.campaign.activity,name:0 +#: field:marketing.campaign.segment,name:0 +#: field:marketing.campaign.transition,name:0 +msgid "Name" +msgstr "Nimi" + +#. module: marketing_campaign +#: field:marketing.campaign.workitem,res_name:0 +msgid "Resource Name" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,sync_mode:0 +msgid "Synchronization mode" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +msgid "Run" +msgstr "Suorita" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,from_ids:0 +msgid "Previous Activities" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.segment,date_done:0 +msgid "Date this segment was last closed or cancelled." +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Marketing Campaign Activities" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,error_msg:0 +msgid "Error Message" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form +#: view:marketing.campaign:0 +msgid "Campaigns" +msgstr "Kampanjat" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,interval_type:0 +msgid "Interval Unit" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:792 +#, python-format +msgid "Email Preview" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,report_id:0 +#: selection:marketing.campaign.activity,type:0 +msgid "Report" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "July" +msgstr "" + +#. module: marketing_campaign +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration +msgid "Configuration" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,variable_cost:0 +msgid "" +"Set a variable cost if you consider that every campaign item that has " +"reached this point has entailed a certain cost. You can get cost statistics " +"in the Reporting section" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Hour(s)" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid " Month-1 " +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment +msgid "Campaign Segment" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +#: view:marketing.campaign.workitem:0 +msgid "Cancel" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,keep_if_condition_not_met:0 +msgid "" +"By activating this option, workitems that aren't executed because the " +"condition is not met are marked as cancelled instead of being deleted." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +msgid "Exceptions" +msgstr "" + +#. module: marketing_campaign +#: field:res.partner,workitem_ids:0 +msgid "Workitems" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,fixed_cost:0 +msgid "Fixed Cost" +msgstr "" + +#. module: marketing_campaign +#: model:email.template,subject:marketing_campaign.email_template_2 +msgid "Congratulation! You become now our Silver Partner." +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Newly Modified" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,interval_nbr:0 +msgid "Interval Value" +msgstr "" + +#. module: marketing_campaign +#: field:campaign.analysis,revenue:0 +#: field:marketing.campaign.activity,revenue:0 +msgid "Revenue" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "September" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "December" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign,partner_field_id:0 +msgid "" +"The generated workitems will be linked to the partner related to the record. " +"If the record is the partner itself leave this field empty. This is useful " +"for reporting purposes, via the Campaign Analysis or Campaign Follow-up " +"views." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,month:0 +msgid "Month" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.transition,activity_to_id:0 +msgid "Next Activity" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup +msgid "Campaign Follow-up" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,email_template_id:0 +msgid "The e-mail to send when this activity is activated" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +msgid "Test Mode" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.segment,sync_mode:0 +msgid "Only records modified after last sync (no duplicates)" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat +msgid "Campaign Statistics" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,server_action_id:0 +msgid "The action to perform when this activity is activated" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,partner_field_id:0 +msgid "Partner Field" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all +#: model:ir.model,name:marketing_campaign.model_campaign_analysis +#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all +msgid "Campaign Analysis" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.segment,sync_mode:0 +msgid "" +"Determines an additional criterion to add to the filter when selecting new " +"records to inject in the campaign. \"No duplicates\" prevents selecting " +"records which have already entered the campaign previously.If the campaign " +"has a \"unique field\" set, \"no duplicates\" will also prevent selecting " +"records which have the same value for the unique field as other records that " +"already entered the campaign." +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "Test in Realtime" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "Test Directly" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,report_directory_id:0 +msgid "Directory" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: view:marketing.campaign.segment:0 +msgid "Draft" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Preview" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Related Resource" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "August" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "Normal" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,start:0 +msgid "This activity is launched when the campaign starts." +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,signal:0 +msgid "" +"An activity with a signal can be called programmatically. Be careful, the " +"workitem is always created when a signal is sent" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "June" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_email_template +msgid "Email Templates" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Sync mode: all records" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.segment,sync_mode:0 +msgid "All records (no duplicates)" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Newly Created" +msgstr "" + +#. module: marketing_campaign +#: field:campaign.analysis,date:0 +#: view:marketing.campaign.workitem:0 +msgid "Date" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "November" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +#: field:marketing.campaign.activity,condition:0 +msgid "Condition" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,report_id:0 +msgid "The report to generate when this activity is activated" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:148 +#, python-format +msgid "" +"The campaign cannot be started: it doesn't have any starting activity. " +"Modify campaign's activities to mark one as the starting point." +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,unique_field_id:0 +msgid "Unique Field" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,state:0 +#: view:marketing.campaign.workitem:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "Exception" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "October" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,email_template_id:0 +msgid "Email Template" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "January" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,date:0 +msgid "Execution Date" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem +msgid "Campaign Workitem" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity +msgid "Campaign Activity" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,report_directory_id:0 +msgid "This folder is used to store the generated reports" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:136 +#: code:addons/marketing_campaign/marketing_campaign.py:148 +#: code:addons/marketing_campaign/marketing_campaign.py:158 +#, python-format +msgid "Error" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +#: field:marketing.campaign.activity,server_action_id:0 +msgid "Action" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:528 +#, python-format +msgid "Automatic transition" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,start:0 +msgid "Start" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +#: view:res.partner:0 +msgid "History" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Process" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:530 +#: selection:marketing.campaign.transition,trigger:0 +#, python-format +msgid "Cosmetic" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.transition,trigger:0 +msgid "How is the destination workitem triggered" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form +msgid "" +"A marketing campaign is an event or activity that will help you manage and " +"reach your partners with specific messages. A campaign can have many " +"activities that will be triggered from a specific situation. One action " +"could be sending an email template that has previously been created in the " +"system." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: selection:campaign.analysis,state:0 +#: view:marketing.campaign:0 +#: selection:marketing.campaign,state:0 +#: selection:marketing.campaign.segment,state:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "Done" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:214 +#, python-format +msgid "Operation not supported" +msgstr "" + +#. module: marketing_campaign +#: model:email.template,body_text:marketing_campaign.email_template_3 +msgid "Hello, We are happy to announce that you become our Gold Partner." +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Close" +msgstr "" + +#. module: marketing_campaign +#: constraint:marketing.campaign.segment:0 +msgid "Model of filter must be same as resource model of Campaign " +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.activity,condition:0 +msgid "" +"Python expression to decide whether the activity can be executed, otherwise " +"it will be deleted or cancelled.The expression may use the following " +"[browsable] variables:\n" +" - activity: the campaign activity\n" +" - workitem: the campaign workitem\n" +" - resource: the resource object this campaign item represents\n" +" - transitions: list of campaign transitions outgoing from this activity\n" +"...- re: Python regular expression module" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Synchronize Manually" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,res_id:0 +msgid "Resource ID" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:136 +#, python-format +msgid "The campaign cannot be started: there are no activities in it." +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition +msgid "Campaign Transition" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: selection:campaign.analysis,state:0 +#: view:marketing.campaign.workitem:0 +#: selection:marketing.campaign.workitem,state:0 +msgid "To Do" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.workitem:0 +msgid "Campaign Step" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form +#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form +#: view:marketing.campaign.segment:0 +msgid "Segments" +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened +msgid "All Segments" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.activity:0 +msgid "Incoming Transitions" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.activity,type:0 +msgid "E-mail" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.transition,interval_type:0 +msgid "Day(s)" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign,activity_ids:0 +#: view:marketing.campaign.activity:0 +msgid "Activities" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "May" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign,unique_field_id:0 +msgid "" +"If set, this field will help segments that work in \"no duplicates\" mode to " +"avoid selecting similar records twice. Similar records are records that have " +"the same value for this unique field. For example by choosing the " +"\"email_from\" field for CRM Leads you would prevent sending the same " +"campaign to the same email address again. If not set, the \"no duplicates\" " +"segments will only avoid selecting the same record again if it entered the " +"campaign previously. Only easily comparable fields like textfields, " +"integers, selections or single relationships may be used." +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:529 +#, python-format +msgid "After %(interval_nbr)d %(interval_type)s" +msgstr "" + +#. module: marketing_campaign +#: model:email.template,subject:marketing_campaign.email_template_1 +msgid "Welcome in OpenERP Partner Channel!" +msgstr "" + +#. module: marketing_campaign +#: model:ir.model,name:marketing_campaign.model_marketing_campaign +msgid "Marketing Campaign" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,date_done:0 +msgid "End Date" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "February" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,res_id:0 +#: view:marketing.campaign:0 +#: field:marketing.campaign,object_id:0 +#: field:marketing.campaign.segment,object_id:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,object_id:0 +msgid "Resource" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign,fixed_cost:0 +msgid "" +"Fixed cost for running this campaign. You may also specify variable cost and " +"revenue on each campaign activity. Cost and Revenue statistics are included " +"in Campaign Reporting." +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "Sync mode: only records updated after last sync" +msgstr "" + +#. module: marketing_campaign +#: field:campaign.analysis,country_id:0 +msgid "Country" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,signal:0 +msgid "Signal" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.workitem,date:0 +msgid "If date is not set, this workitem has to be run manually" +msgstr "" + +#. module: marketing_campaign +#: selection:campaign.analysis,month:0 +msgid "April" +msgstr "" + +#. module: marketing_campaign +#: code:addons/marketing_campaign/marketing_campaign.py:158 +#, python-format +msgid "The campaign cannot be marked as done before all segments are closed." +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign:0 +#: field:marketing.campaign,mode:0 +msgid "Mode" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,activity_id:0 +#: view:marketing.campaign.activity:0 +#: view:marketing.campaign.workitem:0 +#: field:marketing.campaign.workitem,activity_id:0 +msgid "Activity" +msgstr "" + +#. module: marketing_campaign +#: help:marketing.campaign.segment,ir_filter_id:0 +msgid "" +"Filter to select the matching resource records that belong to this segment. " +"New filters can be created and saved using the advanced search on the list " +"view of the Resource. If no filter is set, all records are selected without " +"filtering. The synchronization mode may also add a criterion to the filter." +msgstr "" + +#. module: marketing_campaign +#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem +#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem +msgid "Campaign Followup" +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.segment,date_next_sync:0 +msgid "Next Synchronization" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +#: field:marketing.campaign.segment,ir_filter_id:0 +msgid "Filter" +msgstr "" + +#. module: marketing_campaign +#: view:marketing.campaign.segment:0 +msgid "All" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign.segment,sync_mode:0 +msgid "Only records created after last sync" +msgstr "" + +#. module: marketing_campaign +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." +msgstr "" + +#. module: marketing_campaign +#: field:marketing.campaign.activity,variable_cost:0 +msgid "Variable Cost" +msgstr "" + +#. module: marketing_campaign +#: selection:marketing.campaign,mode:0 +msgid "With Manual Confirmation" +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,total_cost:0 +#: view:marketing.campaign:0 +msgid "Cost" +msgstr "" + +#. module: marketing_campaign +#: model:email.template,body_text:marketing_campaign.email_template_1 +msgid "Hello, We are very happy to send Welcome message." +msgstr "" + +#. module: marketing_campaign +#: view:campaign.analysis:0 +#: field:campaign.analysis,year:0 +msgid "Year" +msgstr "" diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index c7540935005..d04cde0e428 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -246,7 +246,7 @@ <group colspan="2" col="2"> <separator string="Activity" colspan="2"/> <field name="name" select="1"/> - <field name="signal" groups="base.group_extended"/> + <field name="signal" groups="base.group_no_one"/> <field name="start"/> <field name="object_id" invisible="1"/> <field name="campaign_id" invisible="1"/> diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index bdb04525d43..b65386ca9c9 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -20,7 +20,7 @@ <field name="name"/> <field name="categ_id" widget="selection" operator="child_of"/> <newline/> - <group expand='0' string='Group by...' groups="base.group_extended"> + <group expand='0' string='Group by...'> <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" /> <separator orientation="vertical"/> <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" /> @@ -128,7 +128,7 @@ <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/> <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/> <menuitem name="Configuration" id="base.menu_marketing_config_association" - parent="base.menu_association" sequence="30" groups="base.group_extended"/> + parent="base.menu_association" sequence="30"/> <menuitem name="Membership Products" diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 76062249d7d..121567b3e56 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -193,7 +193,7 @@ <field name="resource_type"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/> <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> @@ -250,7 +250,7 @@ <group colspan="4" col="6"> <field name="name"/> <field name="code"/> - <field name="active" groups="base.group_extended"/> + <field name="active"/> <field name="location_id"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> @@ -291,7 +291,7 @@ <field name="location_id"/> <field name="company_id" groups="base.group_multi_company"/> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/> </group> </search> @@ -321,7 +321,7 @@ <group colspan="4" col="6"> <field name="product_id" on_change="onchange_product_id(product_id, name, context)" select="1"/> <field name="name" select="1"/> - <field name="code" select="1" string="Reference" groups="base.group_extended"/> + <field name="code" select="1" string="Reference"/> <newline/> <field name="product_qty"/> <field name="product_uom"/> @@ -330,7 +330,7 @@ <field name="product_uos_qty" groups="product.group_uos" /> <field name="product_uos" groups="product.group_uos"/> <newline/> - <field name="type" groups="base.group_extended"/> + <field name="type"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> </group> <notebook colspan="4" > @@ -348,7 +348,7 @@ <group colspan="4" col="6"> <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/> <field name="name" select="1"/> - <field name="code" select="1" string="Reference" groups="base.group_extended"/> + <field name="code" select="1" string="Reference"/> <newline/> <field name="product_qty"/> <field name="product_uom"/> @@ -357,10 +357,10 @@ <field name="product_uos_qty" groups="product.group_uos" /> <field name="product_uos" groups="product.group_uos"/> <newline/> - <field name="type" groups="base.group_extended"/> + <field name="type"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> </group> - <group groups="base.group_extended"> + <group> <notebook colspan="4"> <page string="Components"> <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"> @@ -374,7 +374,7 @@ </tree> </field> </page> - <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}"> + <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}"> <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/> </page> <page string="Properties" groups="product.group_mrp_properties"> @@ -386,15 +386,15 @@ <field name="date_start"/> <field name="date_stop"/> <field name="product_rounding"/> - <field name="product_efficiency" groups="base.group_extended"/> - <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/> + <field name="product_efficiency"/> + <field colspan="4" name="property_ids" nolabel="2"/> </page> </notebook> </group> </form> </field> </page> - <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}"> + <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}"> <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/> </page> <page string="Properties" groups="product.group_mrp_properties"> @@ -406,10 +406,10 @@ <field name="date_start"/> <field name="date_stop"/> <field name="product_rounding"/> - <field name="product_efficiency" groups="base.group_extended"/> + <field name="product_efficiency"/> <separator string="Properties" colspan="4"/> <newline/> - <field colspan="4" name="property_ids" nolabel="1" groups="base.group_extended"/> + <field colspan="4" name="property_ids" nolabel="1"/> </page> </notebook> <newline/> @@ -431,7 +431,7 @@ <field name="company_id" groups="base.group_multi_company"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" /> <separator orientation="vertical"/> @@ -458,10 +458,10 @@ <field name="product_qty"/> <field name="product_uom"/> <field name="type"/> - <field name="method" groups="base.group_extended"/> + <field name="method"/> <field name="routing_id" groups="mrp.group_mrp_routings"/> - <field name="date_start" groups="base.group_extended"/> - <field name="date_stop" groups="base.group_extended"/> + <field name="date_start"/> + <field name="date_stop"/> </tree> </field> </record> @@ -480,10 +480,10 @@ <field name="product_qty"/> <field name="product_uom"/> <field name="type"/> - <field name="method" groups="base.group_extended"/> + <field name="method"/> <field name="routing_id" groups="mrp.group_mrp_routings"/> - <field name="date_start" groups="base.group_extended"/> - <field name="date_stop" groups="base.group_extended"/> + <field name="date_start"/> + <field name="date_stop"/> </tree> </field> </record> @@ -516,7 +516,6 @@ <menuitem action="mrp_bom_form_action2" id="menu_mrp_bom_form_action2" - groups="base.group_extended" parent="menu_mrp_bom" sequence="20"/> @@ -581,8 +580,8 @@ <field name="product_qty" sum="Total Qty"/> <field name="product_uom"/> <field name="routing_id" groups="mrp.group_mrp_routings"/> - <field name="hour_total" sum="Total Hours" groups="base.group_extended"/> - <field name="cycle_total" sum="Total Cycles" groups="base.group_extended"/> + <field name="hour_total" sum="Total Hours"/> + <field name="cycle_total" sum="Total Cycles"/> <field name="origin"/> <field name="state"/> </tree> @@ -749,7 +748,7 @@ </tree> </field> </page> - <page string="Work Orders" groups="base.group_extended"> + <page string="Work Orders"> <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific" @@ -780,12 +779,12 @@ </page> <page string="Extra Information"> <field name="company_id" groups="base.group_multi_company" widget="selection"/> - <field name="priority" groups="base.group_extended"/> + <field name="priority"/> <newline/> <field name="date_start"/> <field name="date_finished"/> - <field name="picking_id" groups="base.group_extended"/> - <field name="move_prod_id" groups="base.group_extended"/> + <field name="picking_id"/> + <field name="move_prod_id"/> </page> </notebook> <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/> @@ -820,10 +819,10 @@ <field name="origin"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <separator orientation="vertical"/> - <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/> + <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date"/> @@ -1025,8 +1024,7 @@ <!-- Planning --> <menuitem id="menu_mrp_planning" name="Planning" - parent="base.menu_mrp_root" sequence="2" - groups="base.group_extended"/> + parent="base.menu_mrp_root" sequence="2"/> <menuitem action="mrp.mrp_production_action_planning" id="menu_mrp_production_order_action" name="Orders Planning" parent="menu_mrp_planning" sequence="1"/> diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index b588ab53b8f..ec2ef72d40d 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -148,7 +148,7 @@ <field name="date_planned"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/> <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/> <separator orientation="vertical"/> @@ -261,18 +261,16 @@ <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing" id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form" - groups="base.group_extended" sequence="2"/> + sequence="2"/> <menuitem name="Work Orders By Resource" parent="mrp.menu_mrp_planning" id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" sequence="2" - icon="STOCK_INDENT" - groups="base.group_extended"/> + icon="STOCK_INDENT"/> <!-- <menuitem parent="mrp.menu_mrp_planning" id="menu_mrp_production_wc_resource_planning" action="mrp_production_wc_resource_planning" - icon="STOCK_INDENT" - groups="base.group_extended"/>--> + icon="STOCK_INDENT"/>--> <!-- Operation codes --> diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index dd29de20f9b..6af1dc702fa 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -70,7 +70,7 @@ <separator colspan="4" string="States"/> <field name="state"/> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <field colspan="4" name="move_id" /> <field colspan="4" name="invoice_line_id"/> </page> @@ -141,7 +141,7 @@ <separator colspan="4" string="Taxes"/> <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]" nolabel="1"/> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <field colspan="4" name="invoice_line_id" /> </page> </notebook> @@ -157,7 +157,7 @@ </tree> </field> </page> - <page string="Extra Info" groups="base.group_extended"> + <page string="Extra Info"> <field name="invoice_id"/> <field name="picking_id"/> <field name="location_id"/> diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index 063ee9b8544..766733034b7 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -65,7 +65,7 @@ <field name="login">editor_demo</field> <field name="company_id" ref="res_company_oerp_editor"/> <field name="company_ids" eval="[(4, ref('res_company_oerp_editor'))]"/> - <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/> + <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/> </record> <record id="res_users_sales_demo_us" model="res.users"> <field name="password">sales_demo_us</field> @@ -73,7 +73,7 @@ <field name="login">sales_demo_us</field> <field name="company_id" ref="res_company_oerp_us"/> <field name="company_ids" eval="[(4, ref('res_company_oerp_us'))]"/> - <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/> + <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/> </record> <record id="res_users_sales_demo_be" model="res.users"> <field name="password">sales_demo_be</field> @@ -81,7 +81,7 @@ <field name="login">sales_demo_be</field> <field name="company_id" ref="res_company_oerp_be"/> <field name="company_ids" eval="[(4, ref('res_company_oerp_be'))]"/> - <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/> + <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/> </record> <record id="res_users_sales_demo_in" model="res.users"> <field name="password">sales_demo_in</field> @@ -89,7 +89,7 @@ <field name="login">sales_demo_in</field> <field name="company_id" ref="res_company_oerp_in"/> <field name="company_ids" eval="[(4, ref('res_company_oerp_in'))]"/> - <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/> + <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/> </record> <record id="res_users_odoo_demo" model="res.users"> <field name="password">odoo_demo</field> @@ -97,7 +97,7 @@ <field name="login">odoo_demo</field> <field name="company_id" ref="res_company_odoo"/> <field name="company_ids" eval="[(4, ref('res_company_odoo'))]"/> - <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/> + <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/> </record> diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml index b246a1914d7..db0be0d09f4 100644 --- a/addons/multi_company/res_company_view.xml +++ b/addons/multi_company/res_company_view.xml @@ -68,7 +68,6 @@ <menuitem id="menu_custom_multicompany" name="Multi-Companies" parent="base.menu_custom" - groups="base.group_extended" sequence="50"/> <menuitem id="menu_action_inventory_form" diff --git a/addons/pad/i18n/ja.po b/addons/pad/i18n/ja.po new file mode 100644 index 00000000000..5cc0bd7b0af --- /dev/null +++ b/addons/pad/i18n/ja.po @@ -0,0 +1,58 @@ +# 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-24 21:26+0000\n" +"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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-25 04:46+0000\n" +"X-Generator: Launchpad (build 15139)\n" + +#. module: pad +#: sql_constraint:res.company:0 +msgid "The company name must be unique !" +msgstr "会社名は固有でなければいけません。" + +#. module: pad +#: help:res.company,pad_url_template:0 +msgid "Template used to generate pad URL." +msgstr "テンプレートは、パッドのURLを生成するために使用されます。" + +#. module: pad +#: model:ir.model,name:pad.model_res_company +msgid "Companies" +msgstr "会社" + +#. module: pad +#: constraint:res.company:0 +msgid "Error! You can not create recursive companies." +msgstr "エラー。重複して会社を登録することはできません。" + +#. module: pad +#: model:ir.model,name:pad.model_ir_attachment +msgid "ir.attachment" +msgstr "ir.attachment" + +#. module: pad +#: view:res.company:0 +msgid "Pad" +msgstr "パッド" + +#. module: pad +#: field:res.company,pad_url_template:0 +msgid "Pad URL Template" +msgstr "パッドのURLテンプレート" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9 +msgid "Add Pad" +msgstr "パッドを追加" diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index b397bd826cc..2622c2ba863 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -74,14 +74,14 @@ </form> </field> </page> - <page string="Extra Info" groups="base.group_extended"> + <page string="Extra Info"> <group colspan="2" col="2"> <separator string="General Information" colspan="2"/> <field name="company_id" groups="base.group_multi_company"/> <field name="shop_id" widget="selection"/> <field name="user_id"/> <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/> - <field name="picking_id" readonly="1" groups="base.group_extended"/> + <field name="picking_id" readonly="1"/> </group> <group colspan="2" col="3"> <separator string="Accounting Information" colspan="3"/> @@ -146,7 +146,7 @@ <field name="name"/> <field name="user_id"/> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator string="" orientation="vertical"/> diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml index 212c0d8c412..b790d2bac0f 100644 --- a/addons/point_of_sale/wizard/pos_payment.xml +++ b/addons/point_of_sale/wizard/pos_payment.xml @@ -12,7 +12,7 @@ <group colspan="4"> <field name="journal"/> <field name="amount" /> - <field name="payment_name" groups="base.group_extended"/> + <field name="payment_name"/> </group> <newline/> <separator colspan="4"/> diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml index de92b9c6c60..dd495757ec1 100644 --- a/addons/process/process_view.xml +++ b/addons/process/process_view.xml @@ -5,8 +5,7 @@ <menuitem id="menu_process" name="Enterprise Process" - parent="base.menu_custom" - groups="base.group_extended"/> + parent="base.menu_custom"/> <!-- Views for Process --> <record model="ir.ui.view" id="view_process_form"> diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 6ce26ecb98c..b3e90ab4e6e 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -57,7 +57,7 @@ <separator colspan="2" string="Planification"/> <field name="date_planned"/> <field name="procure_method"/> - <field name="priority" groups="base.group_extended"/> + <field name="priority"/> </group> <notebook colspan="4"> <page string="Procurement Details"> @@ -67,8 +67,8 @@ <field name="product_qty"/> <field name="product_uom"/> - <field name="product_uos_qty" groups="product.group_uos,base.group_extended"/> - <field name="product_uos" groups="product.group_uos,base.group_extended"/> + <field name="product_uos_qty" groups="product.group_uos"/> + <field name="product_uos" groups="product.group_uos"/> <separator colspan="4" string="Status"/> <field colspan="4" name="message" readonly="1"/> @@ -82,9 +82,9 @@ </page> <page string="Extra Information"> <separator colspan="4" string="Details"/> - <field name="move_id" groups="base.group_extended"/> + <field name="move_id"/> <field name="date_close"/> - <field name="close_move" groups="base.group_extended"/> + <field name="close_move"/> </page> <page string="Notes"> <separator colspan="4" string="Note" /> @@ -115,7 +115,7 @@ <field name="state" /> </group> <newline/> - <group expand="0" string="Group By" groups="base.group_extended"> + <group expand="0" string="Group By"> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/> <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/> @@ -220,12 +220,12 @@ <field name="product_max_qty"/> <field name="qty_multiple"/> </group> - <group col="2" colspan="2" groups="base.group_extended"> + <group col="2" colspan="2"> <separator string="Misc" colspan="2" /> <field name="procurement_id" readonly="1"/> <field name="active" /> </group> - <group col="4" colspan="4" groups="base.group_extended"> + <group col="4" colspan="4"> <separator string="Procurement Orders to Process" colspan="4" /> <field name="procurement_draft_ids" colspan="4" nolabel="1"/> </group> @@ -288,10 +288,10 @@ <field name="orderpoint_ids" context="{'default_product_uom': uom_id}" nolabel="1"> <tree string="Minimum Stock Rule" editable="bottom"> <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/> - <field name="location_id" groups="base.group_extended"/> + <field name="location_id"/> <field name="product_min_qty"/> <field name="product_max_qty"/> - <field name="product_uom" groups="base.group_extended"/> + <field name="product_uom" groups="product.group_uom"/> </tree> </field> </group> diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po index 2a98a34c825..4de0aed76f8 100644 --- a/addons/product/i18n/sl.po +++ b/addons/product/i18n/sl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2011-01-25 11:06+0000\n" -"Last-Translator: Simon Vidmar <Unknown>\n" +"PO-Revision-Date: 2012-04-24 10:28+0000\n" +"Last-Translator: Dusan Laznik <laznik@mentis.si>\n" "Language-Team: \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:30+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n" +"X-Generator: Launchpad (build 15139)\n" #. module: product #: model:product.template,name:product.product_product_ram512_product_template @@ -57,6 +57,7 @@ msgid "" "Otherwise, this includes goods stored in any Stock Location typed as " "'internal'." msgstr "" +"Predvidena količina(izračunana kot:razpoložliva količina+prihodi-odhodi)" #. module: product #: model:product.category,name:product.cat1 @@ -82,7 +83,7 @@ msgstr "Dan" #. module: product #: view:product.product:0 msgid "UoM" -msgstr "ME" +msgstr "EM" #. module: product #: model:product.template,name:product.product_product_pc2_product_template @@ -149,7 +150,7 @@ msgstr "Sklic" msgid "" "The minimal quantity to trigger this rule, expressed in the supplier UoM if " "any or in the default UoM of the product otherrwise." -msgstr "" +msgstr "Mininalna količina za aktiviranje tega pravila ni vpisana" #. module: product #: model:product.template,name:product.product_product_24_product_template @@ -168,11 +169,13 @@ msgid "" "Conversion from Product UoM %s to Default UoM %s is not possible as they " "both belong to different Category!." msgstr "" +"Pretvorba iz EM %s izdelka v privzeto EM %s ni mogoča, saj obe pripadata " +"različnim kategorijam!." #. module: product #: model:product.uom,name:product.product_uom_dozen msgid "Dozen" -msgstr "" +msgstr "Ducat" #. module: product #: selection:product.template,cost_method:0 @@ -182,7 +185,7 @@ msgstr "Povprečna cena" #. module: product #: help:product.pricelist.item,name:0 msgid "Explicit rule name for this pricelist line." -msgstr "" +msgstr "Izrecno pravilo za to linijo cenika." #. module: product #: model:product.template,name:product.product_product_cpu1_product_template @@ -202,7 +205,7 @@ msgstr "Cenik" #. module: product #: view:product.template:0 msgid "UOM" -msgstr "ME" +msgstr "EM" #. module: product #: model:product.uom,name:product.product_uom_unit @@ -225,6 +228,7 @@ msgid "" "Determines if the product can be visible in the list of product within a " "selection from a sale order line." msgstr "" +"Določa, če je izdelek lahko viden na seznamu izdelkov v izboru za prodajo." #. module: product #: model:product.pricelist.version,name:product.ver0 @@ -254,6 +258,8 @@ msgid "" "Create a product form for everything you buy or sell. Specify a supplier if " "the product can be purchased." msgstr "" +"Kreirajte obrazec izdelkov prodaje in nabave. Določite dobavitelja, če " +"izdelek mogoče kupiti,specificiraj dobavitelja." #. module: product #: view:product.uom:0 @@ -278,6 +284,9 @@ msgid "" "supplying. 'Make to Order': When needed, purchase or produce for the " "procurement request." msgstr "" +"\"S skladišča\":Če je potrebno,vzamemo iz zaloge ali počakamo novo dobavo. " +"\"Naročilo\":Po potrebi se naroči ali proizvede nov proizvod po zahtevku " +"nabave." #. module: product #: model:process.node,note:product.process_node_supplier0 @@ -319,22 +328,22 @@ msgstr "Kategorija" #: help:product.pricelist.item,min_quantity:0 msgid "" "The rule only applies if the partner buys/sells more than this quantity." -msgstr "" +msgstr "Pravilo velja ,če partner kupuje/prodaja več od te količine." #. module: product #: model:product.template,name:product.product_product_woodmm0_product_template msgid "Wood 2mm" -msgstr "" +msgstr "Les 2mm" #. module: product #: field:product.price_list,qty1:0 msgid "Quantity-1" -msgstr "" +msgstr "Količina-1" #. module: product #: help:product.packaging,ul_qty:0 msgid "The number of packages by layer" -msgstr "" +msgstr "Število paketov" #. module: product #: field:product.packaging,qty:0 @@ -351,7 +360,7 @@ msgstr "Stanje" #. module: product #: help:product.template,categ_id:0 msgid "Select category for the current product" -msgstr "" +msgstr "Izbira kategorije za trenutni proizvod" #. module: product #: field:product.product,outgoing_qty:0 @@ -361,7 +370,7 @@ msgstr "Odhajajoča količina" #. module: product #: selection:product.uom,uom_type:0 msgid "Reference UoM for this category" -msgstr "" +msgstr "Refrenčna EM za to kategorijo" #. module: product #: model:product.price.type,name:product.list_price @@ -372,7 +381,7 @@ msgstr "Priporočna cena" #. module: product #: field:product.price_list,qty5:0 msgid "Quantity-5" -msgstr "" +msgstr "Količina-5" #. module: product #: model:product.category,name:product.product_category_10 @@ -387,7 +396,7 @@ msgstr "Vodja izdelka" #. module: product #: field:product.supplierinfo,product_name:0 msgid "Supplier Product Name" -msgstr "" +msgstr "Dobaviteljev naziv proizvoda" #. module: product #: model:product.template,name:product.product_product_pc3_product_template @@ -402,6 +411,9 @@ msgid "" "information about your products related to procurement logistics, sales " "price, product category, suppliers and so on." msgstr "" +"Proizvode lahko nabavimo/prodamo. To so lahko materijali, skladiščni " +"artikli, potrošni material ali storitve. Forma artikla vsebuje detaljne " +"informacije o nabavi, prodajnim cenah, kategorijah, dobaviteljih itd." #. module: product #: help:product.product,qty_available:0 @@ -415,12 +427,12 @@ msgid "" "Location of the Warehouse of this Shop, or any of its children.\n" "Otherwise, this includes goods stored in any Stock Location typed as " "'internal'." -msgstr "" +msgstr "Trenutna količina izdelka." #. module: product #: view:product.pricelist:0 msgid "Products Price Search" -msgstr "" +msgstr "Iskanje po cenah proizvodov" #. module: product #: view:product.product:0 @@ -464,12 +476,12 @@ msgstr "Višina" #. module: product #: help:product.pricelist.version,date_end:0 msgid "Ending date for this pricelist version to be valid." -msgstr "" +msgstr "Datum do katerega velja cenik" #. module: product #: model:product.category,name:product.cat0 msgid "All products" -msgstr "" +msgstr "Vsi proizvodi" #. module: product #: model:ir.model,name:product.model_pricelist_partnerinfo @@ -479,22 +491,22 @@ msgstr "pricelist.partnerinfo" #. module: product #: field:product.price_list,qty2:0 msgid "Quantity-2" -msgstr "" +msgstr "Količina-2" #. module: product #: field:product.price_list,qty3:0 msgid "Quantity-3" -msgstr "" +msgstr "Količina-3" #. module: product #: view:product.product:0 msgid "Codes" -msgstr "" +msgstr "Šifre" #. module: product #: field:product.price_list,qty4:0 msgid "Quantity-4" -msgstr "" +msgstr "Količina-4" #. module: product #: view:res.partner:0 @@ -504,7 +516,7 @@ msgstr "Prodaja in nabava" #. module: product #: model:product.uom.categ,name:product.uom_categ_wtime msgid "Working Time" -msgstr "" +msgstr "Delovni čas" #. module: product #: model:ir.actions.act_window,help:product.product_pricelist_action2 @@ -516,17 +528,22 @@ msgid "" "each version has several rules. Example: the customer price of a product " "category will be based on the supplier price multiplied by 1.80." msgstr "" +"Cenik vsebuje pravila po katerih se izračunavajo nabavne in prodajne ciene " +"za vse partnerje ki so dodeljeni ceniku. Ceniki imajo več verzij (2010, " +"2011, akcija Februar 2011, itd.)in vsaka verzija ima več pravil. Primer: " +"prodajna cena določene kategorije proizvoda mora biti enaka nabavni ceni " +"pomnoženi z 1.80." #. module: product #: model:product.template,name:product.product_product_metalcleats0_product_template msgid "Metal Cleats" -msgstr "" +msgstr "Kovinske objemke" #. module: product #: code:addons/product/product.py:175 #, python-format msgid "Cannot change the category of existing UoM '%s'." -msgstr "" +msgstr "Ni dovoljeno spremeniti kategorijo obstoječe Em'% s'." #. module: product #: model:ir.model,name:product.model_product_uom_categ @@ -546,7 +563,7 @@ msgstr "Izračun cene" #. module: product #: model:res.groups,name:product.group_uos msgid "Product UoS View" -msgstr "" +msgstr "Pregled proizvoda ES(enota prodaje)" #. module: product #: field:product.template,purchase_ok:0 @@ -564,6 +581,8 @@ msgid "" "1 or several supplier(s) can be linked to a product. All information stands " "in the product form." msgstr "" +"Eden ali več dobaviteljev lahko povežemo s proizvodom. Vse informacije se " +"nahajajo v formi proizvoda." #. module: product #: help:product.uom,category_id:0 @@ -571,36 +590,38 @@ msgid "" "Quantity conversions may happen automatically between Units of Measure in " "the same category, according to their respective ratios." msgstr "" +"Preračun količine se lahko naredi avtomatsko med EM ,ki se nahajajo v isti " +"kategoriji glede na njihove koeficiente." #. module: product #: help:product.packaging,width:0 msgid "The width of the package" -msgstr "" +msgstr "Širina paketa" #. module: product #: selection:product.category,type:0 msgid "View" -msgstr "" +msgstr "Pogled:" #. module: product #: model:ir.actions.act_window,name:product.product_template_action_tree msgid "Product Templates" -msgstr "" +msgstr "Podloge proizvoda" #. module: product #: field:product.category,parent_left:0 msgid "Left Parent" -msgstr "" +msgstr "Levi panel" #. module: product #: model:product.template,name:product.product_product_restaurantexpenses0_product_template msgid "Restaurant Expenses" -msgstr "" +msgstr "Stroški restavracije" #. module: product #: help:product.packaging,qty:0 msgid "The total number of products you can put by pallet or box." -msgstr "" +msgstr "Skupno število izdelkov, po paleti/škatlji." #. module: product #: constraint:product.packaging:0 @@ -616,7 +637,7 @@ msgstr "Min. količina" #. module: product #: model:ir.model,name:product.model_product_price_type msgid "Price Type" -msgstr "" +msgstr "Vrsta cene" #. module: product #: code:addons/product/product.py:363 @@ -659,21 +680,24 @@ msgid "" "not overlaps with original version. You should change the dates and " "reactivate the pricelist" msgstr "" +"Ko se verzija podvaja je nastavljense status postavi na n\"eaktivni\", tako " +"da so datumi ne prekrivajo z izvirno različico. Lahko spremenite datume in " +"reaktivirate cenik." #. module: product #: model:product.template,name:product.product_product_kitshelfofcm0_product_template msgid "KIT Shelf of 100cm" -msgstr "" +msgstr "KIT polica 100cm" #. module: product #: field:product.supplierinfo,name:0 msgid "Supplier" -msgstr "" +msgstr "Dobavitelj" #. module: product #: field:product.product,qty_available:0 msgid "Quantity On Hand" -msgstr "" +msgstr "Razpoložljiva količina" #. module: product #: model:product.template,name:product.product_product_26_product_template @@ -688,7 +712,7 @@ msgstr "Naziv cene" #. module: product #: model:product.template,name:product.product_product_arm_product_template msgid "Cabinet" -msgstr "" +msgstr "Kabinet" #. module: product #: help:product.product,incoming_qty:0 @@ -702,12 +726,12 @@ msgid "" "Location of the Warehouse of this Shop, or any of its children.\n" "Otherwise, this includes goods arriving to any Stock Location typed as " "'internal'." -msgstr "" +msgstr "Količina proizvodov, ki je bila planirana za dospetje." #. module: product #: model:product.template,name:product.product_product_woodentable0_product_template msgid "Wooden Table" -msgstr "" +msgstr "Lesena miza" #. module: product #: model:product.template,name:product.product_product_cpu3_product_template @@ -727,12 +751,12 @@ msgstr "Cenik" #: view:product.product:0 #: view:product.template:0 msgid "Suppliers" -msgstr "" +msgstr "Dobavitelji" #. module: product #: view:product.product:0 msgid "To Purchase" -msgstr "" +msgstr "Za nabavo" #. module: product #: help:product.supplierinfo,min_qty:0 @@ -741,6 +765,8 @@ msgid "" "Product UoM if not empty, in the default unit of measure of the product " "otherwise." msgstr "" +"Minimalna nabavna količina tega dobavitelja izražena u EM dobavitelja ili u " +"predefinirani EM proizvoda,če nabavna EM ni vpisana." #. module: product #: view:product.pricelist.item:0 @@ -753,6 +779,8 @@ msgid "" "This price will be considered as a price for the supplier UoM if any or the " "default Unit of Measure of the product otherwise" msgstr "" +"To bo nabavna cena u nabavni EM proizvoda ali v predefinirani EM artikla,če " +"nabavna EM ni vpisana" #. module: product #: model:product.category,name:product.product_category_accessories @@ -776,6 +804,9 @@ msgid "" "management. For example, in food industries, you will manage a stock of ham " "but invoice in Kg. Keep empty to use the default UOM." msgstr "" +"Uporabljajo podjetja, ki upravljajo dve merske enoti: izdajanje računov in " +"vodenje zalog. Na primer, v živilski industriji, boste upravljali zalogo " +"šunke, računa pa v kg. Pustite prazno, da uporabite privzeto EM." #. module: product #: view:product.pricelist.item:0 @@ -819,7 +850,7 @@ msgstr "Sklic kupca" #. module: product #: view:product.product:0 msgid "Miscellaneous" -msgstr "" +msgstr "Razno" #. module: product #: field:product.pricelist.type,key:0 @@ -837,6 +868,8 @@ msgid "" "Set a product if this rule only apply to one product. Keep empty for all " "products" msgstr "" +"Izberite produkt,če to pravilo velja samo za en produkt. Pustite prazno za " +"vse ostale." #. module: product #: view:product.product:0 @@ -847,12 +880,12 @@ msgstr "Nabava in lokacije" #. module: product #: model:product.template,name:product.product_product_kitchendesignproject0_product_template msgid "Kitchen Design Project" -msgstr "" +msgstr "Projekt dizajna kuhinje" #. module: product #: model:product.uom,name:product.uom_hour msgid "Hour" -msgstr "" +msgstr "Ura" #. module: product #: selection:product.template,state:0 @@ -863,33 +896,33 @@ msgstr "V razvoju" #: code:addons/product/product.py:363 #, python-format msgid "UoM categories Mismatch!" -msgstr "" +msgstr "EM se ne ujemajo!" #. module: product #: model:product.template,name:product.product_product_shelfofcm1_product_template msgid "Shelf of 200cm" -msgstr "" +msgstr "Polica 200cm" #. module: product #: view:product.uom:0 msgid "Ratio & Precision" -msgstr "" +msgstr "Razmerje & Preciznost" #. module: product #: model:product.uom,name:product.product_uom_gram msgid "g" -msgstr "" +msgstr "g" #. module: product #: model:product.category,name:product.product_category_11 msgid "IT components kits" -msgstr "" +msgstr "IT sestavni sklopi" #. module: product #: selection:product.category,type:0 #: selection:product.template,state:0 msgid "Normal" -msgstr "" +msgstr "Običajno" #. module: product #: model:process.node,name:product.process_node_supplier0 @@ -919,7 +952,7 @@ msgstr "Kategorije izdelkov" #. module: product #: view:product.uom:0 msgid " e.g: 1 * (reference unit) = ratio * (this unit)" -msgstr "" +msgstr " npr: 1 * (referenčna enota) = razmerje * (trenutna enota)" #. module: product #: model:ir.actions.act_window,help:product.product_uom_form_action @@ -928,6 +961,9 @@ msgid "" "You can define a conversion rate between several Units of Measure within the " "same category." msgstr "" +"Kreiranje in upravljanje merske enote, ki jih želite uporabljati v vašem " +"sistemu. Določite lahko menjalno razmerje med več merskimi enotami v isti " +"kategoriji." #. module: product #: field:product.packaging,weight:0 @@ -937,7 +973,7 @@ msgstr "Skupna masa paketa" #. module: product #: field:product.template,seller_info_id:0 msgid "unknown" -msgstr "" +msgstr "neznano" #. module: product #: help:product.packaging,code:0 @@ -950,6 +986,8 @@ msgid "" "Product's cost for accounting stock valuation. It is the base price for the " "supplier price." msgstr "" +"Sstroški izdelka za obračun vrednotenja zalog . To je osnovna cena za " +"dobaviteljevo ceno." #. module: product #: view:product.price.type:0 @@ -981,7 +1019,7 @@ msgstr "Opis za nabavo" #. module: product #: constraint:product.pricelist.version:0 msgid "You cannot have 2 pricelist versions that overlap!" -msgstr "" +msgstr "Ne morete imeti 2 različic cenika , ki se prekrivata" #. module: product #: help:product.supplierinfo,delay:0 @@ -998,6 +1036,8 @@ msgid "" "manage new versions of a price list. Some examples of versions: 2010, 2011, " "Summer Promotion, etc." msgstr "" +"Tukaj je lahko več verzij cenika. Tukaj lahko Kreirate in upravljate novo " +"verzijo cenika. Npr.:2011,2012,Poletna razprodaja..." #. module: product #: selection:product.template,type:0 @@ -1017,7 +1057,7 @@ msgstr "Zap." #. module: product #: view:product.price_list:0 msgid "Calculate Product Price per unit base on pricelist version." -msgstr "" +msgstr "Izračunaj ceno izdelka na osnovi cenika" #. module: product #: model:ir.model,name:product.model_product_ul @@ -1064,21 +1104,24 @@ msgid "" "be converted to each other. For example, in the unit of measure category " "\"Time\", you will have the following UoM: Hours, Days." msgstr "" +"Kreiraj enoto mere,ki jo želiš uporabiti. Če je v kategoriji več enot,jih " +"lahko medsebojno pretvarjaš. Npr. v kategoriji \"čas\" imamo lahko " +"\"minuta,ura,dan..)" #. module: product #: selection:product.uom,uom_type:0 msgid "Bigger than the reference UoM" -msgstr "" +msgstr "Večja od referenčne Em." #. module: product #: field:product.category,parent_right:0 msgid "Right Parent" -msgstr "" +msgstr "Desno pravilo" #. module: product #: view:product.product:0 msgid "To Sell" -msgstr "" +msgstr "Prodati" #. module: product #: help:product.product,outgoing_qty:0 @@ -1092,12 +1135,12 @@ msgid "" "Location of the Warehouse of this Shop, or any of its children.\n" "Otherwise, this includes goods leaving from any Stock Location typed as " "'internal'." -msgstr "" +msgstr "Količina proizvodov, načrtovana za opustitev." #. module: product #: model:product.category,name:product.product_category_services0 msgid "Marketable Services" -msgstr "" +msgstr "Storitve trženja" #. module: product #: field:product.pricelist.item,price_surcharge:0 @@ -1112,7 +1155,7 @@ msgstr "Matična plošča ASUStek A7N8X" #. module: product #: field:product.product,packaging:0 msgid "Logistical Units" -msgstr "" +msgstr "Logistične enote" #. module: product #: field:product.category,complete_name:0 @@ -1131,7 +1174,7 @@ msgstr "Naziv" #. module: product #: model:product.template,name:product.product_product_woodlintelm0_product_template msgid "Wood Lintel 4m" -msgstr "" +msgstr "Lesena preklada 4m" #. module: product #: model:ir.actions.act_window,help:product.product_normal_action @@ -1142,16 +1185,20 @@ msgid "" "contains detailed information about your products related to procurement " "logistics, sales price, product category, suppliers and so on." msgstr "" +"Potrebno je definirati izdelek.. Izdelki so lahko surovine,, potrošni " +"material in storitve.Oblika proizvoda vsebuje podrobne informacije o vaših " +"izdelkih, povezanih z logistiko naročil, prodajne cene, kategorijo izdelkov, " +"dobaviteljev in tako naprej." #. module: product #: model:product.uom,name:product.product_uom_kgm msgid "kg" -msgstr "" +msgstr "kg" #. module: product #: model:product.uom,name:product.product_uom_meter msgid "m" -msgstr "" +msgstr "m" #. module: product #: selection:product.template,state:0 @@ -1161,7 +1208,7 @@ msgstr "Zastarelo" #. module: product #: model:product.uom,name:product.product_uom_km msgid "km" -msgstr "" +msgstr "km" #. module: product #: help:product.template,cost_method:0 @@ -1170,6 +1217,9 @@ msgid "" "at the end of the year), Average Price: the cost price is recomputed at each " "reception of products." msgstr "" +"Standardna (planska) cena: cena je fiksnodoločena ,izračunava se periodično " +"(običajno na koncu leta), Povprečna cena: cena se izračunava pri vsaki " +"nabavi proizvoda." #. module: product #: help:product.category,sequence:0 @@ -1181,7 +1231,7 @@ msgstr "" #: field:product.uom,factor:0 #: field:product.uom,factor_inv:0 msgid "Ratio" -msgstr "" +msgstr "Razmerje" #. module: product #: help:product.template,purchase_ok:0 @@ -1205,22 +1255,22 @@ msgstr "Širina" #. module: product #: help:product.price.type,field:0 msgid "Associated field in the product form." -msgstr "" +msgstr "Povezano polje s forme proizvoda" #. module: product #: view:product.product:0 msgid "Unit of Measure" -msgstr "" +msgstr "Enota mere" #. module: product #: field:product.template,procure_method:0 msgid "Procurement Method" -msgstr "" +msgstr "Metoda Naročnja" #. module: product #: report:product.pricelist:0 msgid "Printing Date" -msgstr "" +msgstr "Datum izpisa" #. module: product #: field:product.template,uos_id:0 @@ -1243,6 +1293,7 @@ msgstr "" #: help:product.template,seller_id:0 msgid "Main Supplier who has highest priority in Supplier List." msgstr "" +"Glavni dobavitelj, ki ima največjo prednost iz seznama dobaviteljev." #. module: product #: model:product.category,name:product.product_category_services @@ -1253,7 +1304,7 @@ msgstr "Storitve" #. module: product #: model:ir.actions.act_window,name:product.product_form_config_action msgid "Create or Import Products" -msgstr "" +msgstr "Kreiraj ali uvozi proizvod." #. module: product #: field:product.pricelist.item,base_pricelist_id:0 @@ -1274,24 +1325,24 @@ msgstr "Proizvodi" #. module: product #: help:product.packaging,rows:0 msgid "The number of layers on a pallet or box" -msgstr "" +msgstr "Število slojev na paleti ali škatlji" #. module: product #: help:product.pricelist.item,base:0 msgid "The mode for computing the price for this rule." -msgstr "" +msgstr "Način izračuna cene za to pravilo." #. module: product #: view:product.packaging:0 #: view:product.product:0 msgid "Pallet Dimension" -msgstr "" +msgstr "Dimenzija palete" #. module: product #: code:addons/product/product.py:668 #, python-format msgid " (copy)" -msgstr "" +msgstr " (kopija)" #. module: product #: field:product.template,seller_ids:0 @@ -1305,6 +1356,8 @@ msgid "" "order and the delivery of the finished products. It's the time you promise " "to your customers." msgstr "" +"To je povprečna zamuda v dneh od potrditve naročila stranke in dobavo " +"končnih proizvodov." #. module: product #: view:product.product:0 @@ -1316,7 +1369,7 @@ msgstr "Druga EM" #: code:addons/product/product.py:143 #, python-format msgid "Error !" -msgstr "" +msgstr "Napaka !" #. module: product #: model:ir.actions.act_window,name:product.product_uom_form_action @@ -1324,17 +1377,17 @@ msgstr "" #: model:ir.ui.menu,name:product.next_id_16 #: view:product.uom:0 msgid "Units of Measure" -msgstr "" +msgstr "Merske enote" #. module: product #: field:product.supplierinfo,min_qty:0 msgid "Minimal Quantity" -msgstr "" +msgstr "Minimalna količina" #. module: product #: model:product.category,name:product.product_category_pc msgid "PC" -msgstr "" +msgstr "PC" #. module: product #: help:product.supplierinfo,product_code:0 @@ -1342,6 +1395,8 @@ msgid "" "This supplier's product code will be used when printing a request for " "quotation. Keep empty to use the internal one." msgstr "" +"Dobaviteljeva šifra artikla bo uporabljena na izpisu povpraševanja. Pustite " +" prazno,če želite izpisati internu šifro." #. module: product #: selection:product.template,procure_method:0 @@ -1356,7 +1411,7 @@ msgstr "Različica cenika" #. module: product #: field:product.product,virtual_available:0 msgid "Quantity Available" -msgstr "" +msgstr "količina,ki je na voljo" #. module: product #: help:product.pricelist.item,sequence:0 @@ -1384,7 +1439,7 @@ msgstr "Bruto masa v kg." #. module: product #: model:product.template,name:product.product_product_sidepanel0_product_template msgid "Side Panel" -msgstr "" +msgstr "Bočni panel" #. module: product #: view:product.product:0 @@ -1401,7 +1456,7 @@ msgstr "Teže" #. module: product #: field:product.uom,category_id:0 msgid "UoM Category" -msgstr "" +msgstr "Kategorija enote mere" #. module: product #: field:product.template,loc_rack:0 @@ -1411,7 +1466,7 @@ msgstr "Stojalo" #. module: product #: field:product.template,uom_po_id:0 msgid "Purchase Unit of Measure" -msgstr "" +msgstr "Nabavna enota mere" #. module: product #: field:product.template,supply_method:0 @@ -1425,11 +1480,14 @@ msgid "" "category to get the list of all products linked to this category or to a " "child of this category." msgstr "" +"Lista vseh proizvodov klasificirana po kategorijah. Lahko izberete " +"kategorijo,če želite listo vseh proizvodov v izbrani kategoriji ali " +"podkategoriji." #. module: product #: view:product.product:0 msgid "Group by..." -msgstr "" +msgstr "Grupiraj po..." #. module: product #: model:product.template,name:product.product_product_cpu_gen_product_template @@ -1455,7 +1513,7 @@ msgid "" "production order and, if it is a multi-level bill of material, it's only for " "the level of this product. Different lead times will be summed for all " "levels and purchase orders." -msgstr "" +msgstr "Povprečna zamuda v dnevih za proizvodnjo tega izdelka." #. module: product #: model:product.template,name:product.product_product_pc1_product_template @@ -1468,11 +1526,12 @@ msgid "" "If the active field is set to False, it will allow you to hide the pricelist " "without removing it." msgstr "" +"Nastavitev cenika na neaktivno,omogoča skrivanje cenika brez brisanja." #. module: product #: model:product.uom,name:product.product_uom_cm msgid "cm" -msgstr "" +msgstr "cm" #. module: product #: model:ir.model,name:product.model_product_uom @@ -1493,12 +1552,12 @@ msgstr "Natančnost zaokroževanja" #. module: product #: view:product.uom:0 msgid "Unit of Measure Properties" -msgstr "" +msgstr "Lastnosti merske enote" #. module: product #: model:product.template,name:product.product_product_shelf1_product_template msgid "Rack 200cm" -msgstr "" +msgstr "Polica 200cm" #. module: product #: selection:product.template,supply_method:0 @@ -1508,7 +1567,7 @@ msgstr "Nakup" #. module: product #: view:product.uom.categ:0 msgid "Units of Measure categories" -msgstr "" +msgstr "Kategorije enot mere" #. module: product #: help:product.packaging,weight_ul:0 @@ -1518,12 +1577,12 @@ msgstr "Masa prazne LE" #. module: product #: model:product.template,name:product.product_product_woodmm10_product_template msgid "Wood 10mm" -msgstr "" +msgstr "Les 10mm" #. module: product #: selection:product.uom,uom_type:0 msgid "Smaller than the reference UoM" -msgstr "" +msgstr "Manjše,kot referenčna EM" #. module: product #: field:product.price.type,active:0 @@ -1542,22 +1601,22 @@ msgstr "Spremenljiva marža" #. module: product #: sql_constraint:product.uom:0 msgid "The conversion ratio for a unit of measure cannot be 0!" -msgstr "" +msgstr "Koeficient pretvorbe ne sme biti 0!" #. module: product #: help:product.packaging,ean:0 msgid "The EAN code of the package unit." -msgstr "" +msgstr "EAN koda pakiranja" #. module: product #: help:product.supplierinfo,product_uom:0 msgid "This comes from the product form." -msgstr "" +msgstr "To pride iz forme proizvoda" #. module: product #: field:product.packaging,weight_ul:0 msgid "Empty Package Weight" -msgstr "" +msgstr "Težina praznega pakiranja" #. module: product #: field:product.price.type,field:0 @@ -1575,22 +1634,24 @@ msgid "" "How many times this UoM is smaller than the reference UoM in this category:\n" "1 * (reference unit) = ratio * (this unit)" msgstr "" +"Kolikokrat jeta EM manjši od referenčne EM v tej kategoriji:\n" +"1 * (referenčna enota) = razmerje * (ta enota)" #. module: product #: model:ir.actions.act_window,name:product.product_price_type_action #: model:ir.ui.menu,name:product.menu_product_price_type msgid "Price Types" -msgstr "" +msgstr "Tip cene" #. module: product #: help:product.template,uom_id:0 msgid "Default Unit of Measure used for all stock operation." -msgstr "" +msgstr "Privzeta EM za vse operacije zalog." #. module: product #: model:product.category,name:product.product_category_misc0 msgid "Misc" -msgstr "" +msgstr "Razno" #. module: product #: model:product.template,name:product.product_product_pc4_product_template @@ -1616,17 +1677,17 @@ msgstr "Objavljen cenik" #. module: product #: model:product.category,name:product.product_category_marketableproduct0 msgid "Marketable Products" -msgstr "" +msgstr "Tržni proizvodi" #. module: product #: field:product.supplierinfo,product_code:0 msgid "Supplier Product Code" -msgstr "" +msgstr "Šifra artikla dobavitelja" #. module: product #: view:product.product:0 msgid "Default UOM" -msgstr "" +msgstr "Definirana(običajna) EM" #. module: product #: selection:product.ul,type:0 @@ -1636,7 +1697,7 @@ msgstr "Paleta" #. module: product #: field:product.packaging,ul_qty:0 msgid "Package by layer" -msgstr "" +msgstr "Pakiranje po slojih" #. module: product #: field:product.template,warranty:0 @@ -1649,6 +1710,8 @@ msgid "" "Set a category of product if this rule only apply to products of a category " "and his children. Keep empty for all products" msgstr "" +"Nastavi kategorijo izdelka samo,če se to pravilo uporablja za izdelek v " +"kategoriji in njegovih podkategorijah." #. module: product #: model:ir.model,name:product.model_product_product @@ -1678,6 +1741,8 @@ msgid "" "Produce will generate production order or tasks, according to the product " "type. Buy will trigger purchase orders when requested." msgstr "" +"Generiran bo proizvodni nalog, glede na vrsto izdelka. Nakup bo sprožil " +"naročilo." #. module: product #: field:product.product,variants:0 @@ -1698,12 +1763,12 @@ msgstr "Faktor preračuna" #. module: product #: help:product.supplierinfo,sequence:0 msgid "Assigns the priority to the list of product supplier." -msgstr "" +msgstr "Dodeli prednost na seznam dobavitelja izdelkov." #. module: product #: field:product.template,uom_id:0 msgid "Default Unit Of Measure" -msgstr "" +msgstr "Privzeta EM" #. module: product #: model:product.template,name:product.product_product_tow1_product_template @@ -1718,7 +1783,7 @@ msgstr "Metoda zaokroževanja" #. module: product #: model:product.category,name:product.product_category_assembly msgid "Assembly Service" -msgstr "" +msgstr "Storitev montaže" #. module: product #: model:ir.actions.report.xml,name:product.report_product_label @@ -1738,7 +1803,7 @@ msgstr "Storitev" #. module: product #: help:product.packaging,height:0 msgid "The height of the package" -msgstr "" +msgstr "Višina pakiranja" #. module: product #: view:product.pricelist:0 @@ -1760,28 +1825,28 @@ msgstr "Družba" msgid "" "Base price for computing the customer price. Sometimes called the catalog " "price." -msgstr "" +msgstr "Osnova za izračun cene kupca.(Kataloška cena)" #. module: product #: code:addons/product/pricelist.py:376 #, python-format msgid "Partner section of the product form" -msgstr "" +msgstr "Podatki o partnerju v formi izdelka" #. module: product #: help:product.price.type,name:0 msgid "Name of this kind of price." -msgstr "" +msgstr "Ime te vrste cene" #. module: product #: field:product.supplierinfo,product_uom:0 msgid "Supplier UoM" -msgstr "" +msgstr "EM dobavitelja" #. module: product #: help:product.pricelist.version,date_start:0 msgid "Starting date for this pricelist version to be valid." -msgstr "" +msgstr "Datum od katerega velja ta verzija cenika." #. module: product #: help:product.template,uom_po_id:0 @@ -1789,6 +1854,7 @@ msgid "" "Default Unit of Measure used for purchase orders. It must be in the same " "category than the default unit of measure." msgstr "" +"Privzeta EM za naročilo. Biti mora v isti kategoriji kot privzeta EM." #. module: product #: model:product.template,description:product.product_product_cpu1_product_template @@ -1803,7 +1869,7 @@ msgstr "Dolžina" #. module: product #: model:product.uom.categ,name:product.uom_categ_length msgid "Length / Distance" -msgstr "" +msgstr "Dolžina/Razdalja" #. module: product #: model:product.template,name:product.product_product_0_product_template @@ -1819,22 +1885,22 @@ msgstr "Vrsta cenika" #. module: product #: model:product.category,name:product.product_category_otherproducts0 msgid "Other Products" -msgstr "" +msgstr "Drugi proizvodi" #. module: product #: field:product.product,color:0 msgid "Color Index" -msgstr "" +msgstr "Barvvni index" #. module: product #: view:product.product:0 msgid "Characteristics" -msgstr "" +msgstr "Karakteristike" #. module: product #: field:product.template,sale_ok:0 msgid "Can be Sold" -msgstr "" +msgstr "LAhko se proda" #. module: product #: field:product.template,produce_delay:0 @@ -1850,7 +1916,7 @@ msgstr "Cenik dobavitelja" #: code:addons/product/product.py:175 #, python-format msgid "Warning" -msgstr "" +msgstr "Opozorilo" #. module: product #: field:product.pricelist.item,base:0 @@ -1860,12 +1926,12 @@ msgstr "Zaosnovano na" #. module: product #: model:product.uom,name:product.product_uom_ton msgid "t" -msgstr "" +msgstr "t" #. module: product #: model:product.category,name:product.product_category_rawmaterial0 msgid "Raw Materials" -msgstr "" +msgstr "Surovine" #. module: product #: help:product.template,product_manager:0 @@ -1875,7 +1941,7 @@ msgstr "" #. module: product #: field:product.pricelist,name:0 msgid "Pricelist Name" -msgstr "" +msgstr "Naziv cenika" #. module: product #: model:ir.model,name:product.model_product_pricelist_version @@ -1892,7 +1958,7 @@ msgstr "* ( 1 + " #. module: product #: help:product.packaging,weight:0 msgid "The weight of a full package, pallet or box." -msgstr "" +msgstr "Skupna teža pakiranja palete ali škatlje" #. module: product #: model:product.template,name:product.product_product_hdd2_product_template @@ -1902,12 +1968,12 @@ msgstr "Trdi disk Seagate 7200.8 120GB" #. module: product #: model:product.template,name:product.product_product_employee0_product_template msgid "Employee" -msgstr "" +msgstr "Zaposleni" #. module: product #: model:product.template,name:product.product_product_shelfofcm0_product_template msgid "Shelf of 100cm" -msgstr "" +msgstr "Polica 100cm" #. module: product #: model:ir.model,name:product.model_product_category @@ -1918,12 +1984,12 @@ msgstr "Kategorija izdelkov" #. module: product #: report:product.pricelist:0 msgid "Price List Name" -msgstr "" +msgstr "Naziv cenika" #. module: product #: field:product.supplierinfo,delay:0 msgid "Delivery Lead Time" -msgstr "" +msgstr "Čas dostave" #. module: product #: help:product.uom,active:0 @@ -1931,12 +1997,13 @@ msgid "" "By unchecking the active field you can disable a unit of measure without " "deleting it." msgstr "" +"Z odznačavanjem polja \"aktiven\" lahko deaktivirate EM,ne da bi je brisali." #. module: product #: model:ir.actions.act_window,name:product.product_uom_categ_form_action #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action msgid "UoM Categories" -msgstr "" +msgstr "EM kategorij" #. module: product #: field:product.template,seller_delay:0 @@ -1953,12 +2020,12 @@ msgstr "Škatla" msgid "" "Create and manage your packaging dimensions and types you want to be " "maintained in your system." -msgstr "" +msgstr "Ustvarite in urejajte dimenzije in vrste embalaže." #. module: product #: model:product.template,name:product.product_product_rearpanelarm1_product_template msgid "Rear Panel SHE200" -msgstr "" +msgstr "Zadnaj stranica SHE200" #. module: product #: help:product.pricelist.type,key:0 @@ -1970,7 +2037,7 @@ msgstr "" #. module: product #: view:product.product:0 msgid "Context..." -msgstr "" +msgstr "Kontekst..." #. module: product #: model:product.template,name:product.product_product_hdd1_product_template @@ -1980,12 +2047,12 @@ msgstr "Trdi disk Seagate 7200.8 80GB" #. module: product #: help:product.supplierinfo,qty:0 msgid "This is a quantity which is converted into Default Uom." -msgstr "" +msgstr "To je količina ,ki je pretvorjena v privzeto EM." #. module: product #: field:product.packaging,ul:0 msgid "Type of Package" -msgstr "" +msgstr "Tip pakiranja" #. module: product #: selection:product.ul,type:0 @@ -2010,17 +2077,17 @@ msgstr "Procesor po želji" #. module: product #: model:process.transition,name:product.process_transition_supplierofproduct0 msgid "Supplier of the product" -msgstr "" +msgstr "Dobavitelj proizvoda" #. module: product #: field:product.product,product_image:0 msgid "Image" -msgstr "" +msgstr "Slika" #. module: product #: field:product.uom,uom_type:0 msgid "UoM Type" -msgstr "" +msgstr "Tip EM" #. module: product #: help:product.product,active:0 @@ -2028,13 +2095,15 @@ msgid "" "If the active field is set to False, it will allow you to hide the product " "without removing it." msgstr "" +"Če je polje nastavljeno neaktivno,je dovoljeno skriti izdelek,ne da bi ga " +"odstranili" #. module: product #: help:product.uom,rounding:0 msgid "" "The computed quantity will be a multiple of this value. Use 1.0 for a UoM " "that cannot be further split, such as a piece." -msgstr "" +msgstr "Izračunana količina bo večkratnik te vrednosti." #. module: product #: view:product.product:0 @@ -2050,7 +2119,7 @@ msgstr "Vrsta" #. module: product #: model:product.template,name:product.product_product_rearpanelarm0_product_template msgid "Rear Panel SHE100" -msgstr "" +msgstr "Zadnja stranica SHE100" #. module: product #: model:product.template,name:product.product_product_23_product_template @@ -2060,7 +2129,7 @@ msgstr "Kompleten PC s perifernimi enotami" #. module: product #: model:product.template,name:product.product_product_hotelexpenses0_product_template msgid "Hotel Expenses" -msgstr "" +msgstr "Stroški hotela" #. module: product #: help:product.uom,factor_inv:0 @@ -2068,11 +2137,13 @@ msgid "" "How many times this UoM is bigger than the reference UoM in this category:\n" "1 * (this unit) = ratio * (reference unit)" msgstr "" +"Kolikokrat je ta EM večja od privzete Em v tej kategoriji.\n" +"1*(ta enota)=razmerje*(privzeta enota)" #. module: product #: model:product.template,name:product.product_product_shelf0_product_template msgid "Rack 100cm" -msgstr "" +msgstr "Polica 100cm" #. module: product #: help:product.packaging,sequence:0 @@ -2091,11 +2162,13 @@ msgid "" "At least one pricelist has no active version !\n" "Please create or activate one." msgstr "" +"Najmanj en cenik nima aktivne verzije.\n" +"Aktiviraj ali kreiraj." #. module: product #: field:product.pricelist.item,price_max_margin:0 msgid "Max. Price Margin" -msgstr "" +msgstr "Max, prodajna marža" #. module: product #: help:product.supplierinfo,product_name:0 @@ -2103,6 +2176,8 @@ msgid "" "This supplier's product name will be used when printing a request for " "quotation. Keep empty to use the internal one." msgstr "" +"Dobaviteljev naziv proizvoda bo izpisan na ponudbi. Pusti prazno,če želiš " +"interni naziv." #. module: product #: selection:product.template,mes_type:0 @@ -2112,7 +2187,7 @@ msgstr "Spremenljivo" #. module: product #: field:product.template,rental:0 msgid "Can be Rent" -msgstr "" +msgstr "Lahko se najame" #. module: product #: model:product.price.type,name:product.standard_price @@ -2123,7 +2198,7 @@ msgstr "Lastna cena" #. module: product #: field:product.pricelist.item,price_min_margin:0 msgid "Min. Price Margin" -msgstr "" +msgstr "Min. marža prodajne cijene" #. module: product #: field:product.template,weight:0 @@ -2133,7 +2208,7 @@ msgstr "Bruto masa" #. module: product #: model:product.template,name:product.product_product_assemblysection0_product_template msgid "Assembly Section" -msgstr "" +msgstr "Montažni(sestavni)del" #. module: product #: model:product.category,name:product.product_category_3 @@ -2156,12 +2231,12 @@ msgstr "Zaporedje" #. module: product #: model:product.template,name:product.product_assembly_product_template msgid "Assembly Service Cost" -msgstr "" +msgstr "Strošek montaže" #. module: product #: view:product.price_list:0 msgid "Close" -msgstr "" +msgstr "Zapri" #. module: product #: model:ir.model,name:product.model_product_pricelist_item @@ -2176,7 +2251,7 @@ msgstr "RAM po želji" #. module: product #: view:res.partner:0 msgid "Sales Properties" -msgstr "" +msgstr "Lastnosti prodaje" #. module: product #: view:product.product:0 @@ -2187,12 +2262,12 @@ msgstr "Čakalne dobe" #. module: product #: view:product.product:0 msgid "Both stockable and consumable products" -msgstr "" +msgstr "Skladiščeni in potrošni proizvodi" #. module: product #: model:process.node,note:product.process_node_product0 msgid "Creation of the product" -msgstr "" +msgstr "Kreiranje proizvoda" #. module: product #: field:pricelist.partnerinfo,name:0 @@ -2238,13 +2313,13 @@ msgstr "Variante izdelka" #. module: product #: model:product.category,name:product.product_category_shelves0 msgid "Shelves" -msgstr "" +msgstr "Police" #. module: product #: code:addons/product/pricelist.py:375 #, python-format msgid "Other Pricelist" -msgstr "" +msgstr "drugi cenik" #. module: product #: model:ir.model,name:product.model_product_template @@ -2263,7 +2338,7 @@ msgstr "Metoda stroškov" #: view:product.packaging:0 #: view:product.product:0 msgid "Palletization" -msgstr "" +msgstr "Nalaganje na palete" #. module: product #: help:product.template,volume:0 @@ -2292,7 +2367,7 @@ msgstr "Različice cenikov" #. module: product #: model:product.template,name:product.product_product_span100_product_template msgid "Shelf Panel" -msgstr "" +msgstr "Panel-polica" #. module: product #: help:product.pricelist.item,price_round:0 @@ -2301,6 +2376,10 @@ msgid "" "Rounding is applied after the discount and before the surcharge.\n" "To have prices that end in 9.99, set rounding 10, surcharge -0.01" msgstr "" +"Postavvi ceno,ki je včkratnik te vrednosti.\n" +"Zaokroževanje se izvede po izračunu popusta in pred dodatkom na ceno.\n" +"Da dobite cene,ki se končajo na 9.99,postavite zaokroževanje na 10,dodatek " +"pa na 0.01" #. module: product #: field:product.template,list_price:0 @@ -2310,12 +2389,12 @@ msgstr "Prodajna cena" #. module: product #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "Napaka! Ne morete ustvariti rekurzivne kategorije." #. module: product #: field:product.category,type:0 msgid "Category Type" -msgstr "" +msgstr "Vrsta kategorije" #. module: product #: model:product.category,name:product.cat2 @@ -2328,11 +2407,13 @@ msgid "" "Coefficient to convert UOM to UOS\n" " uos = uom * coeff" msgstr "" +"Koeficent za pretvorbo EM(enota mere) v ES(enota prodaje)\n" +"ES=EM*koef" #. module: product #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Napaka! Ne morete ustvariti rekurzivne povezane člane." #. module: product #: field:product.pricelist.item,price_discount:0 diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index 0388b2a4aa3..bd763daefcb 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -3,7 +3,7 @@ <data> <menuitem id="base.menu_sale_config_sales" name="Sales" - parent="base.menu_base_config" sequence="0" groups="base.group_extended"/> + parent="base.menu_base_config" sequence="0"/> <menuitem id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config" groups="product.group_sale_pricelist" sequence="70"/> @@ -231,8 +231,7 @@ <menuitem action="product_pricelist_type_action" id="menu_product_pricelist_type_action2" - parent="product.menu_product_pricelist_main" sequence="2" - groups="base.group_extended"/>--> + parent="product.menu_product_pricelist_main" sequence="2"/>--> </data> </openerp> diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 2a12fc9ad08..1642d28e35f 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <menuitem groups="base.group_extended" id="prod_config_main" name="Products" parent="base.menu_base_config" sequence="70"/> + <menuitem id="prod_config_main" name="Products" parent="base.menu_base_config" sequence="70"/> <record id="product_search_form_view" model="ir.ui.view"> <field name="name">product.search.form</field> @@ -17,16 +17,16 @@ <separator orientation="vertical"/> <field name="name" filter_domain="['|', ('name','ilike',self),('default_code','ilike',self)]"/> - <field name="categ_id" widget="selection" operator="child_of" groups="base.group_extended"/> + <field name="categ_id" widget="selection" operator="child_of"/> <newline/> - <group expand="0" string="Context..." groups="base.group_extended"> + <group expand="0" string="Context..."> <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/> <separator orientation="vertical" groups="base.group_multi_company" /> <field name="company_id" widget="selection" groups="base.group_multi_company" /> </group> <newline/> - <group expand='0' string='Group by...' groups="base.group_extended"> - <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" groups="base.group_extended"/> + <group expand='0' string='Group by...'> + <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/> <separator orientation="vertical"/> <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" /> <separator orientation="vertical"/> @@ -56,8 +56,8 @@ <field name="virtual_available"/> <field name="lst_price"/> <field name="price" invisible="not context.get('pricelist',False)"/> - <field name="standard_price" groups="base.group_extended"/> - <field name="state" groups="base.group_extended"/> + <field name="standard_price"/> + <field name="state"/> <field name="company_id" groups="base.group_multi_company" invisible="1"/> </tree> </field> @@ -78,7 +78,7 @@ <group colspan="1" col="2"> <separator string="Codes" colspan="2"/> <field name="default_code"/> - <field name="ean13" groups="base.group_extended"/> + <field name="ean13"/> </group> <group colspan="1" col="2"> <separator string="Characteristics" colspan="2"/> @@ -94,28 +94,27 @@ <group colspan="2" col="2"> <separator string="Procurement" colspan="2"/> <field name="type"/> - <field name="procure_method" groups="base.group_extended"/> + <field name="procure_method"/> <field name="supply_method"/> </group> <group colspan="2" col="2"> <separator string="Base Prices" colspan="2"/> <field name="list_price"/> - <field groups="base.group_extended" name="cost_method"/> - <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" - groups="base.group_extended"/> + <field name="cost_method"/> + <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/> <newline/> <field name="price_margin" groups="product.group_product_variant"/> <field name="price_extra" groups="product.group_product_variant"/> </group> - <group colspan="2" col="2" groups="base.group_extended"> + <group colspan="2" col="2"> <separator string="Weights" colspan="2"/> <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/> <field name="weight" attrs="{'readonly':[('type','=','service')]}"/> <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/> </group> - <group colspan="2" col="2" name="status" groups="base.group_extended"> + <group colspan="2" col="2" name="status"> <separator string="Status" colspan="2"/> <field name="categ_id"/> <field name="state"/> @@ -150,7 +149,7 @@ <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/> </group> - <group colspan="2" col="2" name="misc" groups="base.group_extended"> + <group colspan="2" col="2" name="misc"> <separator string="Miscellaneous" colspan="2"/> <field name="active"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> @@ -350,7 +349,6 @@ <menuitem action="product_category_action" id="product.menu_products_category" - groups="base.group_extended" parent="base.menu_product" sequence="0"/> <record id="product_category_action_form" model="ir.actions.act_window"> @@ -546,8 +544,8 @@ <form string="Supplier Information"> <field name="name" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}'/> <field name="sequence"/> - <field name="product_name" groups="base.group_extended"/> - <field name="product_code" groups="base.group_extended"/> + <field name="product_name"/> + <field name="product_code"/> <field name="min_qty"/> <field name="product_uom"/> <field name="delay"/> @@ -621,7 +619,7 @@ <field name="name"/> <field name="categ_id"/> <field name="type"/> - <field name="state" groups="base.group_extended"/> + <field name="state"/> </tree> </field> </record> @@ -646,26 +644,25 @@ <group colspan="2" col="2"> <separator string="Procurement" colspan="2"/> <field name="type"/> - <field name="procure_method" groups="base.group_extended"/> + <field name="procure_method"/> <field name="supply_method"/> </group> <group colspan="2" col="2"> <separator string="Base Prices" colspan="2"/> <field name="list_price"/> - <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" - groups="base.group_extended"/> - <field groups="base.group_extended" name="cost_method"/> + <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/> + <field name="cost_method"/> </group> - <group colspan="2" col="2" groups="base.group_extended"> + <group colspan="2" col="2"> <separator string="Weights" colspan="2"/> <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/> <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/> <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/> </group> - <group colspan="2" col="2" name="status" groups="base.group_extended"> + <group colspan="2" col="2" name="status"> <separator string="Status" colspan="2"/> <field name="categ_id" select="1"/> <field name="state"/> @@ -675,7 +672,7 @@ <group colspan="2" col="2" name="uom"> <separator string="UOM" colspan="2"/> <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/> - <field name="uom_po_id" groups="base.group_extended"/> + <field name="uom_po_id"/> </group> <group colspan="2" col="2" name="uos" groups="product.group_uom"> @@ -686,7 +683,7 @@ </group> </page> - <page string="Procurement & Locations" groups="base.group_extended"> + <page string="Procurement & Locations"> <group colspan="2" col="2" name="delay"> <separator string="Delays" colspan="2"/> <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/> diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index 8fef3c1470e..8126018d3a5 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -20,7 +20,7 @@ <field name="state" invisible="context.get('set_visible',False)"/> <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/> <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/> - <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> + <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> </tree> </field> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index c0054a3006d..16bace0db18 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -21,7 +21,7 @@ <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_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/> <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"/> @@ -75,13 +75,13 @@ <field name="warn_customer"/> <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/> <newline/> - <group colspan="4" col="4" groups="base.group_extended"> + <group colspan="4" col="4"> <separator colspan="2" string="Mail Header"/> <separator colspan="2" string="Mail Footer"/> <field name="warn_header" nolabel="1" colspan="2"/> <field name="warn_footer" nolabel="1" colspan="2"/> </group> - <group col="3" colspan="4" groups="base.group_extended"> + <group col="3" colspan="4"> <separator string="Automatic variables for headers and footer. Use exactly the same notation." colspan="4"/> <label string="Task: %%(name)s"/> <label string="User: %%(user_id)s"/> @@ -91,7 +91,7 @@ <label string="Date Stop: %%(date)s"/> </group> </page> - <page string="Tasks Stages" groups="base.group_extended"> + <page string="Tasks Stages"> <field nolabel="1" name="type_ids" colspan="4"/> </page> <page string="Notes"> @@ -117,8 +117,7 @@ <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/> <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/> <filter icon="gtk-media-pause" string="Template" - name="Template" domain="[('state', '=','template')]" help="Templates of Projects" - groups="base.group_extended"/> + name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/> <separator orientation="vertical"/> <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> <separator orientation="vertical"/> @@ -129,7 +128,7 @@ <field name="partner_id" string="Partner"/> </group> <newline /> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Manager" name="Manager" icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/> <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> @@ -309,7 +308,7 @@ <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_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"/> @@ -351,7 +350,7 @@ </tree> </field> </page> - <page groups="base.group_extended" string="Delegations History"> + <page string="Delegations History"> <separator string="Parent Tasks" colspan="4"/> <field colspan="4" height="150" name="parent_ids" nolabel="1"/> <separator string="Delegated tasks" colspan="4"/> @@ -368,7 +367,7 @@ </field> </page> - <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> + <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> <group colspan="2" col="2"> <separator string="Planning" colspan="2"/> <field name="priority"/> @@ -506,20 +505,19 @@ <field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/> <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)"/> <field name="date_deadline" invisible="context.get('deadline_visible',True)"/> - <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/> + <field name="type_id" invisible="context.get('set_visible',False)"/> <button name="next_type" invisible="context.get('set_visible',False)" states="draft,open,pending" string="Change Stage" type="object" icon="gtk-go-forward" - groups="base.group_extended" help="Change Type"/> <field name="date_start" invisible="1" groups="base.group_no_one"/> <field name="date_end" invisible="1" groups="base.group_no_one"/> <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/> <field name="state" invisible="context.get('set_visible',False)"/> <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/> - <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal" help="For changing to delegate state"/> + <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal" help="For changing to delegate state"/> <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> </tree> </field> diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 87f563f8878..d1306d31b01 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -112,7 +112,7 @@ <field name="partner_id" /> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="priority"/> <field name="type_id" widget="selection"/> <separator orientation="vertical"/> diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 5f2267ec4b1..9dfcb8db156 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -82,7 +82,7 @@ <field string="Timebox" name="timebox_id" invisible=" not context.get('gtd', False)"/> <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" invisible=" not context.get('gtd',False)"/> <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" invisible=" not context.get('gtd',False)"/> - <field name="context_id" invisible="not context.get('context_show', False)" widget="selection" groups="base.group_extended"/> + <field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/> <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/> </field> </field> @@ -117,7 +117,7 @@ <separator orientation="vertical"/> <separator name="gtdsep"/> <field name="name"/> - <field name="context_id" widget="selection" groups="base.group_extended" + <field name="context_id" widget="selection" context="{'context_show': True}"> <filter string="Show Context" name="context_show" diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index c6a9da9cb41..a070bdbe521 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -93,7 +93,7 @@ <field name="id"/> <field name="create_date"/> <field name="name"/> - <field name="partner_id" groups="base.group_extended"/> + <field name="partner_id"/> <field name="project_id" /> <field name="priority" string="Priority"/> <field name="type_id" widget="selection" readonly="1"/> diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 72b110963b9..90423032324 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -96,7 +96,7 @@ <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/> </group> </page> - <page string="Extra Info" groups="base.group_extended"> + <page string="Extra Info"> <group col="4" colspan="4"> <separator string="Statistics" colspan="4" col="4"/> <field name="day_open"/> @@ -128,7 +128,7 @@ <field name="id"/> <field name="create_date" groups="base.group_no_one"/> <field name="name"/> - <field name="partner_id" groups="base.group_extended"/> + <field name="partner_id"/> <field name="project_id" /> <field name="priority" string="Priority"/> <field name="type_id" widget="selection" readonly="1" string="Stages" /> @@ -169,7 +169,7 @@ <field name="id"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..." > <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Partner" icon="terp-partner" domain="[]" @@ -295,7 +295,7 @@ <field name="id"/> <field name="needaction_pending" invisible="1"/> <field name="name" string="Feature description"/> - <field name="partner_id" groups="base.group_extended"/> + <field name="partner_id"/> <field name="priority" string="Priority"/> <field name="type_id" widget="selection" readonly="1"/> <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/> diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml index e25d5e34e3e..ac2f2990717 100644 --- a/addons/project_issue_sheet/project_issue_sheet_view.xml +++ b/addons/project_issue_sheet/project_issue_sheet_view.xml @@ -13,8 +13,7 @@ <xpath expr="/form/notebook" position="before"> <field name="analytic_account_id" domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]" - on_change='on_change_account_id(analytic_account_id)' - groups="base.group_extended" /> + on_change='on_change_account_id(analytic_account_id)'/> </xpath> <xpath expr="//notebook/page[@string='Extra Info']" position="before"> <page string="Worklogs"> diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index d555ddf5d00..9cb4bb0ba41 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -268,7 +268,7 @@ <field name="date_end"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/> <separator orientation="vertical"/> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> @@ -333,7 +333,7 @@ <field name="inherit_id" ref="project.view_task_search_form"/> <field name="arch" type="xml"> <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after"> - <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/> + <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}"/> </filter> </field> </record> @@ -345,7 +345,7 @@ <field name="inherit_id" ref="project.view_task_tree2"/> <field name="arch" type="xml"> <field name="project_id" position="after"> - <field name="phase_id" invisible="1" groups="base.group_extended"/> + <field name="phase_id" invisible="1"/> </field> </field> </record> @@ -385,7 +385,6 @@ parent="base.menu_project_long_term" sequence="2"/> <menuitem id="menu_pm_users_project1" - groups="base.group_extended" name="Resources" parent="project.menu_definitions" sequence="3"/> <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/> diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml index 127209c2e35..920f8bf588e 100644 --- a/addons/project_messages/project_messages_view.xml +++ b/addons/project_messages/project_messages_view.xml @@ -8,7 +8,7 @@ <field name="inherit_id" ref="project.edit_project"/> <field name="arch" type="xml"> <xpath expr="//page[@string='Tasks Stages']" position="after"> - <page string="Messages" groups="base.group_extended"> + <page string="Messages"> <field name="message_ids" nolabel="1" colspan="4"> <tree editable="bottom" string="Messages"> <field name="message"/> diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index d12b62dbf18..5e42c750634 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -108,11 +108,11 @@ <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/> <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/> <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/> - <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/> + <button name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/> <button name="%(mail.action_email_compose_message_wizard)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/> </group> </page> - <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> + <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> <group colspan="2" col="2"> <field name="priority"/> <field name="sequence"/> diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index fe1301eb4c3..0f33ded8523 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -65,7 +65,7 @@ help="Postpone backlog" colspan="2" icon="gtk-convert" attrs="{'invisible':[('state','in',['done', 'cancel'])]}"/> <field name="user_id" select="1"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence"/> <field name="create_date"/> <field name="progress" widget="progressbar"/> </group> @@ -90,7 +90,7 @@ <field name="total_hours" widget="float_time"/> <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/> <field name="date_deadline" invisible="context.get('set_visible',False)"/> - <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/> + <field name="type_id" invisible="context.get('set_visible',False)"/> <field name="date_start" invisible="1"/> <field name="date_end" invisible="1"/> <button name="next_type" invisible="context.get('set_visible',False)" @@ -98,13 +98,12 @@ string="Change Stage" type="object" icon="gtk-go-forward" - groups="base.group_extended" help="Change Type"/> <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/> <field name="state" invisible="context.get('set_visible',False)"/> <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/> <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="terp-camera_test" help="For changing to open state" invisible="context.get('set_visible',False)"/> - <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> + <button name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> </tree> </field> @@ -162,7 +161,7 @@ </field> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 9d42b5e8085..af335bd5384 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -18,8 +18,8 @@ <separator colspan="4" string="Invoicing Data"/> <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" widget="selection"/> <field name="to_invoice" widget="selection" string="Invoice Task Work"/> - <field name="amount_max" groups="base.group_extended"/> - <field name="amount_invoiced" groups="base.group_extended"/> + <field name="amount_max"/> + <field name="amount_invoiced"/> </group> </field> </field> @@ -135,7 +135,6 @@ the project form.</field> </record> <menuitem action="hr_timesheet.action_hr_timesheet_sign_in" id="menu_hr_timesheet_sign_in" - groups="base.group_extended" parent="hr_attendance.menu_hr_attendance" sequence="5" /> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 45e0882edc8..a074f4d7a08 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -26,8 +26,7 @@ <!--<menuitem action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type" - parent="menu_purchase_config_pricelist" sequence="2" - groups="base.group_extended"/>--> + parent="menu_purchase_config_pricelist" sequence="2"/>--> <menuitem id="menu_product_in_config_purchase" name="Products" @@ -64,13 +63,11 @@ <!--Inventory control--> <menuitem id="menu_procurement_management_inventory" name="Receive Products" - parent="base.menu_purchase_root" sequence="4" - groups="base.group_extended"/> + parent="base.menu_purchase_root" sequence="4"/> <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory" name="Incoming Shipments" sequence="9"/> <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move" - parent="menu_procurement_management_inventory" sequence="11" - groups="base.group_extended"/> + parent="menu_procurement_management_inventory" sequence="11"/> <!--Invoice control--> <menuitem id="menu_procurement_management_invoice" name="Invoice Control" @@ -148,7 +145,7 @@ <page string="Purchase Order"> <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" options='{"quick_create": false}'/> <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/> - <field name="origin" groups="base.group_extended"/> + <field name="origin"/> <newline/> <field colspan="4" name="order_line" nolabel="1" mode="tree,form"> <tree string="Purchase Order Lines"> @@ -180,7 +177,7 @@ <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/> </group> </page> - <page string="Delivery & Invoicing" groups="base.group_extended"> + <page string="Delivery & Invoicing"> <group colspan="2" col="2"> <separator string="Delivery" colspan="2"/> <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/> @@ -200,7 +197,7 @@ </group> <separator string="Invoices" colspan="4"/> <newline/> - <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/> + <field name="invoice_ids" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/> </page> <page string="Notes"> <field colspan="4" name="notes" nolabel="1"/> @@ -223,7 +220,7 @@ <separator orientation="vertical"/> <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/> + <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/> <separator orientation="vertical"/> <field name="name" string="Reference"/> <field name="partner_id"/> @@ -231,7 +228,7 @@ <field name="create_uid"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> @@ -259,7 +256,7 @@ <separator orientation="vertical"/> <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/> <separator orientation="vertical"/> - <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/> + <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/> <separator orientation="vertical"/> <field name="name" string="Reference"/> <field name="partner_id"/> @@ -267,7 +264,7 @@ <field name="create_uid"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> @@ -350,7 +347,7 @@ domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> </group> </page> - <page string="Invoicing" groups="base.group_extended"> + <page string="Invoicing"> <separator colspan="4" string="Manual Invoices"/> <field name="invoiced"/> <newline/> @@ -359,7 +356,7 @@ <page string="Notes"> <field colspan="4" name="notes" nolabel="1"/> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <separator colspan="4" string="Stock Moves"/> <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/> </page> @@ -407,13 +404,13 @@ <field name="price_unit"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/> - <group colspan="4" col="4" groups="base.group_extended"> + <group colspan="4" col="4"> <separator colspan="4" string="Taxes"/> <field colspan="4" nolabel="1" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> </group> </page> - <page string="Invoicing" groups="base.group_extended"> + <page string="Invoicing"> <separator colspan="4" string="Manual Invoices"/> <field name="invoiced"/> <newline/> @@ -422,7 +419,7 @@ <page string="Notes"> <field colspan="4" name="notes" nolabel="1"/> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <separator colspan="4" string="Stock Moves"/> <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/> </page> @@ -496,7 +493,6 @@ <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" - groups="base.group_extended" parent="menu_procurement_management_invoice" sequence="72"/> diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 0ac69172612..399db12fb01 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -81,7 +81,7 @@ <field name="product_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="user_id"/> <field name="validator"/> <separator orientation="vertical"/> @@ -103,7 +103,7 @@ <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/> <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/> - <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/> + <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/> <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/> <separator orientation="vertical"/> <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 06d67eed281..f29783c67ae 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -29,7 +29,6 @@ id="act_purchase_order_2_stock_picking" name="Receptions" res_model="stock.picking" - groups="base.group_extended" src_model="purchase.order" context="{'default_purchase_id': active_id, 'contact_display': 'partner'}" /> @@ -72,14 +71,14 @@ domain="[('state','=','done')]" help="Incoming Shipments already processed"/> <separator orientation="vertical"/> <filter icon="terp-accessories-archiver-minus" string="Back Orders" - domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/> + domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> <separator orientation="vertical"/> <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/> <separator orientation="vertical"/> <field name="name"/> <field name="origin"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> <newline/> @@ -94,7 +93,7 @@ domain="[]" context="{'group_by':'min_date'}"/> <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" - domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/> + domain="[]" context="{'group_by':'stock_journal_id'}"/> </group> </search> </field> diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml index 912325e2ca5..4cef53f51b2 100644 --- a/addons/purchase/wizard/purchase_order_group_view.xml +++ b/addons/purchase/wizard/purchase_order_group_view.xml @@ -34,7 +34,6 @@ Lines will only be merged if: target="new" multi="True" key2="client_action_multi" - groups="base.group_extended" id="action_view_purchase_order_group"/> </data> diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml index 849c0260470..498ceb2bd0a 100644 --- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml +++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml @@ -9,7 +9,7 @@ <field name="inherit_id" ref="purchase.purchase_order_line_form"/> <field name="arch" type="xml"> <field name="account_analytic_id" position="replace"> - <field name="analytics_id" domain="[('plan_id','<>',False)]" groups="base.group_extended"/> + <field name="analytics_id" domain="[('plan_id','<>',False)]"/> </field> </field> </record> diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index d6a736eea9c..c03afa7b544 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -10,7 +10,7 @@ <field name="inherit_id" ref="purchase.purchase_order_form"/> <field name="arch" type="xml"> <field name="shipped" position="after"> - <field name="requisition_id" groups="base.group_extended"/> + <field name="requisition_id"/> </field> </field> </record> @@ -54,7 +54,7 @@ <field name="date_start"/> <field name="date_end"/> <field name="origin"/> - <field name="warehouse_id" groups="base.group_extended" widget="selection"/> + <field name="warehouse_id" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <notebook colspan="4"> @@ -146,7 +146,7 @@ <field name="exclusive" /> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 8187df71f87..1cd4336ab6c 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -19,7 +19,7 @@ <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/> @@ -182,7 +182,7 @@ <field name="company_id" widget="selection" groups="base.group_multi_company"/> <newline/> <field name="calendar_id" string="Working Period"/> - <field name="time_efficiency" groups="base.group_extended"/> + <field name="time_efficiency"/> </group> </form> </field> @@ -199,7 +199,7 @@ <field name="company_id" groups="base.group_multi_company"/> <field name="resource_type" /> <field name="calendar_id" string="Working Period"/> - <field name="time_efficiency" groups="base.group_extended"/> + <field name="time_efficiency"/> </tree> </field> </record> @@ -257,7 +257,7 @@ <field name="view_mode">tree,form,calendar</field> <field name="search_view_id" ref="view_resource_calendar_leaves_search"/> </record> - <menuitem id="menu_resource_config" name="Resource" parent="base.next_id_4" sequence="5" groups="base.group_extended"/> + <menuitem id="menu_resource_config" name="Resource" parent="base.next_id_4" sequence="5"/> <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="1"/> </data> </openerp> diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 4c1a85a7b86..a86df29d56f 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -85,7 +85,7 @@ </field> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="shop_id" widget="selection"/> <field name="categ_id" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 3d597b80dea..278f21cafc2 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -112,7 +112,7 @@ <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"/> - <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/> + <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/> <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> @@ -122,7 +122,7 @@ <group col="4" colspan="4"> <field name="name"/> <field name="date_order"/> - <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/> + <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/> <field name="client_order_ref"/> </group> <group col="2" colspan="2"> @@ -164,14 +164,14 @@ <newline/> <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" - domain="[('product_id','=',product_id)]" groups="base.group_extended" + domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" colspan="3"/> <field name="discount" groups="sale.group_discount_per_so_line"/> <separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/> <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/> <separator colspan="5" string="Taxes"/> <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/> - <group colspan="5" col="5" groups="base.group_extended"> + <group colspan="5" col="5"> <separator colspan="5" string="States"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/> <field name="invoiced"/> @@ -189,7 +189,7 @@ <separator colspan="4" string="Properties"/> <field name="property_ids" colspan="4" nolabel="1"/> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <separator colspan="4" string="Invoice Lines"/> <field colspan="4" name="invoice_lines" nolabel="1"/> <separator colspan="4" string="Stock Moves"/> @@ -222,7 +222,7 @@ <field colspan="4" name="note" nolabel="1"/> </page> <page string="Other Information"> - <group colspan="2" col="2" groups="base.group_extended" name="logistics"> + <group colspan="2" col="2" name="logistics"> <separator string="Logistic" colspan="2"/> <field name="incoterm" widget="selection"/> <field name="picking_policy" required="True"/> @@ -232,9 +232,9 @@ <group colspan="2" col="2"> <separator string="References" colspan="2"/> <field name="user_id"/> - <field groups="base.group_extended" name="origin"/> + <field groups="base.group_no_one" name="origin"/> </group> - <group name="sale_pay" colspan="2" col="2" groups="base.group_extended" > + <group name="sale_pay" colspan="2" col="2"> <separator string="Conditions" colspan="2"/> <field name="payment_term" widget="selection"/> <field name="fiscal_position" widget="selection"/> @@ -243,7 +243,7 @@ <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/> <field colspan="4" name="note" nolabel="1" groups="base.group_sale_notes_subtotal"/> </page> - <page string="History" groups="base.group_extended"> + <page string="History"> <separator colspan="4" string="Invoices"/> <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/> <separator colspan="4" string="Packings"/> @@ -276,7 +276,7 @@ <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/> </field> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> @@ -393,7 +393,7 @@ <field name="product_uom" groups="product.group_uom"/> <newline/> - <field colspan="4" name="name" groups="base.group_extended"/> + <field colspan="4" name="name" groups="base.group_no_one"/> <field name="company_id" groups="base.group_multi_company" readonly="1"/> </group> <separator colspan="4" string="Price"/> diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index a96892b990f..32e23a10666 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -21,8 +21,8 @@ <field name="inherit_id" ref="sale.view_order_form"/> <field name="arch" type="xml"> <field name="user_id" position="after"> - <field name="section_id" widget="selection" groups="base.group_extended"/> - <field name="categ_id" widget="selection" groups="base.group_extended"/> + <field name="section_id" widget="selection"/> + <field name="categ_id" widget="selection"/> </field> </field> </record> @@ -34,10 +34,9 @@ <field name="inherit_id" ref="sale.view_sales_order_filter"/> <field name="arch" type="xml"> <field name="user_id" position="after"> - <field name="section_id" widget="selection" string="Sales Team" groups="base.group_extended"> + <field name="section_id" widget="selection" string="Sales Team"> <filter icon="terp-personal+" domain="[('section_id.user_id','=',uid)]" - groups="base.group_extended" help="My Sales Team(s)"/> </field> </field> diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml index d43ecdaf4d6..4c4300b497f 100644 --- a/addons/sale_layout/sale_layout_view.xml +++ b/addons/sale_layout/sale_layout_view.xml @@ -19,7 +19,7 @@ <page string="Order Line"> <group colspan="4" col="5"> <field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence" groups="base.group_no_one"/> <field colspan="3" context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" name="product_id" @@ -55,7 +55,7 @@ context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" - groups="base.group_extended"/> + groups="product.group_stock_packaging"/> <field name="discount" attrs="{'invisible':[('layout_type','!=','article')]}"/> @@ -80,16 +80,14 @@ </group> </group> </page> - <page groups="base.group_extended" string="Extra Info" - attrs="{'invisible':[('layout_type','!=','article')]}"> + <page string="Extra Info" attrs="{'invisible':[('layout_type','!=','article')]}"> <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/> <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/> <field name="address_allotment_id" select="2"/> <separator colspan="4" string="Properties"/> <field colspan="4" name="property_ids" nolabel="1"/> </page> - <page string="History" groups="base.group_extended" - attrs="{'invisible':[('layout_type','!=','article')]}"> + <page string="History" attrs="{'invisible':[('layout_type','!=','article')]}"> <separator colspan="4" string="Invoice Lines"/> <field colspan="4" name="invoice_lines" nolabel="1"/> <separator colspan="4" string="Stock Moves"/> diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml index ced19625784..d4d2c153d76 100644 --- a/addons/sale_mrp/sale_mrp_view.xml +++ b/addons/sale_mrp/sale_mrp_view.xml @@ -9,8 +9,8 @@ <field name="type">form</field> <field name="arch" type="xml"> <xpath expr="/form/notebook/page/field[@name='move_prod_id']" position="after"> - <field name="sale_name" groups="base.group_extended"/> - <field name="sale_ref" groups="base.group_extended"/> + <field name="sale_name"/> + <field name="sale_ref"/> </xpath> </field> </record> diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 19533933002..5af954a023a 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -86,9 +86,9 @@ </group> <group colspan="2" col="2"> <field name="property_stock_account_input" attrs="{'readonly':[('valuation', '!=', 'real_time')]}" - domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended"/> + domain="[('type','<>','view'),('type','<>','consolidation')]"/> <field name="property_stock_account_output" attrs="{'readonly':[('valuation', '!=', 'real_time')]}" - domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended"/> + domain="[('type','<>','view'),('type','<>','consolidation')]"/> </group> </group> <newline/> @@ -111,7 +111,7 @@ <newline/> <field name="virtual_available"/> </group> - <group colspan="2" col="2" name="stock_variations" groups="base.group_extended"> + <group colspan="2" col="2" name="stock_variations"> <separator string="Expected Stock Variations" colspan="2"/> <field name="incoming_qty"/> <field name="outgoing_qty"/> diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 029e514c33e..01ef4a70289 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -100,7 +100,7 @@ <field name="partner_id" context="{'contact_display':'partner'}"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="location_id" /> <field name="location_dest_id" /> <field name="categ_id"/> @@ -224,7 +224,7 @@ <field name="company_id" groups="base.group_multi_company"/> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <group expand="0" string="Extended Filters..."> <field name="partner_id" context="{'contact_display':'partner'}"/> <field name="product_categ_id" /> <field name="prodlot_id"/> diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml index fe49e8eae9f..7d3fc6074f3 100644 --- a/addons/stock/report/report_stock_view.xml +++ b/addons/stock/report/report_stock_view.xml @@ -7,8 +7,7 @@ id="act_stock_product_location_open" name="Stock by Location" res_model="stock.location" - src_model="product.product" - groups="base.group_extended"/> + src_model="product.product"/> <act_window domain="[('tracking_id', '=', active_id)]" diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml index 0f7411a1430..96e0ee5cd59 100644 --- a/addons/stock/stock_report.xml +++ b/addons/stock/stock_report.xml @@ -4,7 +4,7 @@ <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/> <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" rml="stock/report/picking.rml"/> <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/> - <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Inventory Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/> + <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Inventory Overview" rml="stock/report/lot_overview.rml"/> <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content" rml="stock/report/lot_overview_all.rml"/> <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Stock Inventory" rml="stock/report/stock_inventory_move.rml"/> </data> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index eece3980963..95d0acd853d 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -7,7 +7,7 @@ web_icon="images/warehouse.png" web_icon_hover="images/warehouse-hover.png"/> <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/> - <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2" groups="base.group_extended"/> + <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/> <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/> <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action" parent="stock.menu_stock_product" sequence="0"/> @@ -81,7 +81,7 @@ <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> </group> @@ -140,7 +140,7 @@ </group> </form> </field> - </page><page string="Posted Inventory" groups="base.group_extended"> + </page><page string="Posted Inventory"> <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list" context="{'inventory_id':active_id}" > <tree string="Stock Moves"> <field name="product_id"/> @@ -278,7 +278,7 @@ <field name="name" /> <field name="serial" /> <field name="date" /> - <field name="active" groups="base.group_extended"/> + <field name="active"/> </group> </search> </field> @@ -511,11 +511,11 @@ <separator string="Additional Information" colspan="4"/> <field name="partner_id" colspan="4"/> <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/> - <field name="icon" groups="base.group_extended" colspan="4"/> - <field name="scrap_location" groups="base.group_extended"/> - <field name="active" groups="base.group_extended"/> + <field name="icon" colspan="4"/> + <field name="scrap_location"/> + <field name="active"/> </group> - <group col="2" colspan="2" groups="base.group_extended"> + <group col="2" colspan="2"> <separator string="Chained Locations" colspan="2"/> <field name="chained_location_type"/> <field name="chained_location_id" attrs="{'required':[('chained_location_type','=','fixed')]}"/> @@ -530,9 +530,9 @@ <field name="posx"/> <field name="posy"/> <field name="posz"/> - <separator string="Accounting Information" colspan="2" groups="base.group_extended"/> - <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}" groups="base.group_extended"/> - <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}" groups="base.group_extended"/> + <separator string="Accounting Information" colspan="2"/> + <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/> + <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/> </group> <separator string="Additional Information" colspan="4"/> <field colspan="4" name="comment" nolabel="1"/> @@ -674,12 +674,12 @@ <field name="arch" type="xml"> <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date < current_date" string="Picking list"> <field name="name"/> - <field name="backorder_id" groups="base.group_extended"/> + <field name="backorder_id"/> <field name="origin"/> <field name="date"/> <field name="min_date"/> <field name="invoice_state"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> <field name="state"/> <button name="action_process" states="assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/> </tree> @@ -697,13 +697,13 @@ <field name="name" readonly="1"/> <field name="origin"/> <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/> - <field name="invoice_state" string="Invoice Control" groups="base.group_extended"/> - <field name="backorder_id" readonly="1" groups="base.group_extended"/> + <field name="invoice_state" string="Invoice Control"/> + <field name="backorder_id" readonly="1"/> </group> <group colspan="2" col="2"> <field name="date"/> <field name="min_date" readonly="1"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> </group> </group> <notebook colspan="4"> @@ -717,8 +717,7 @@ <button name="%(stock.move_scrap)d" string="Scrap Products" type="action" icon="gtk-convert" context="{'scrap': True}" - states="draft,waiting,confirmed,assigned" - groups="base.group_extended"/> + states="draft,waiting,confirmed,assigned"/> <field name="scrapped" invisible="1"/> <field name="prodlot_id" groups="stock.group_production_lot"/> <button @@ -748,7 +747,7 @@ <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/> <button name="%(stock.move_scrap)d" - string="Scrap" type="action" groups="base.group_extended" + string="Scrap" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned" colspan="1"/> <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/> @@ -807,11 +806,11 @@ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" /> </group> </page> - <page string="Additional info" groups="base.group_extended,base.group_multi_company"> - <field name="auto_picking" groups="base.group_extended"/> - <field name="date_done" groups="base.group_extended"/> - <field name="move_type" groups="base.group_extended"/> - <field name="type" groups="base.group_extended"/> + <page string="Additional info"> + <field name="auto_picking"/> + <field name="date_done"/> + <field name="move_type"/> + <field name="type"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </page> <page string="Notes"> @@ -833,13 +832,13 @@ <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/> <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/> <separator orientation="vertical"/> - <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/> + <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> <separator orientation="vertical"/> <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/> <separator orientation="vertical"/> <field name="name"/> <field name="partner_id"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> </group> <newline/> <group expand="0" string="Group By..."> @@ -848,7 +847,7 @@ <separator orientation="vertical" /> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <separator orientation="vertical" /> - <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/> + <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" /> </group> </search> </field> @@ -869,9 +868,9 @@ <field name="origin"/> <field name="date"/> <field name="min_date"/> - <field name="backorder_id" groups="base.group_extended"/> + <field name="backorder_id"/> <field name="invoice_state"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> <field name="state"/> <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/> </tree> @@ -889,12 +888,12 @@ <field name="origin" readonly="1"/> <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/> <field name="invoice_state"/> - <field name="backorder_id" readonly="1" groups="base.group_extended"/> + <field name="backorder_id" readonly="1"/> </group> <group colspan="2" col="2"> <field name="date"/> <field name="min_date" readonly="1"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> </group> </group> <notebook colspan="4"> @@ -939,7 +938,7 @@ <button name="%(stock.move_scrap)d" string="Scrap" type="action" icon="gtk-convert" context="{'scrap': True}" - states="draft,waiting,confirmed,assigned" colspan="1" groups="base.group_extended"/> + states="draft,waiting,confirmed,assigned" colspan="1"/> <field name="product_uom" string="Unit Of Measure" colspan="4" groups="product.group_uom"/> <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" /> <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" /> @@ -990,18 +989,18 @@ <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/> <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/> <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/> - <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/> + <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/> <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/> <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/> <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/> <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/> </group> </page> - <page string="Additional info" groups="base.group_extended,base.group_multi_company"> - <field name="auto_picking" groups="base.group_extended"/> - <field name="date_done" groups="base.group_extended"/> - <field name="move_type" groups="base.group_extended"/> - <field name="type" groups="base.group_extended"/> + <page string="Additional info"> + <field name="auto_picking"/> + <field name="date_done"/> + <field name="move_type"/> + <field name="type"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </page> <page string="Notes"> @@ -1024,13 +1023,13 @@ <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/> <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/> <separator orientation="vertical"/> - <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/> + <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> <separator orientation="vertical"/> <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/> <separator orientation="vertical"/> <field name="name"/> <field name="origin"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> <newline/> @@ -1041,7 +1040,7 @@ <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> <separator orientation="vertical" /> - <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/> + <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" /> </group> </search> </field> @@ -1084,12 +1083,12 @@ <field name="arch" type="xml"> <tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date < current_date" string="Picking list"> <field name="name"/> - <field name="backorder_id" groups="base.group_extended"/> + <field name="backorder_id"/> <field name="origin"/> <field name="date"/> <field name="min_date"/> - <field name="invoice_state" groups="base.group_extended"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="invoice_state"/> + <field name="stock_journal_id" widget="selection"/> <field name="state"/> <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/> <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the shipment. Do you want to continue?" /> @@ -1108,12 +1107,12 @@ <field name="origin"/> <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/> <field name="invoice_state" string="Invoice Control"/> - <field name="backorder_id" readonly="1" groups="base.group_extended"/> + <field name="backorder_id" readonly="1"/> </group> <group colspan="2" col="2"> <field name="date"/> <field name="min_date" readonly="1"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> </group> </group> <notebook colspan="4"> @@ -1126,8 +1125,7 @@ <button name="%(stock.move_scrap)d" string="Scrap Products" type="action" icon="gtk-convert" context="{'scrap': True}" - states="draft,waiting,confirmed,assigned" - groups="base.group_extended"/> + states="draft,waiting,confirmed,assigned"/> <field name="scrapped" invisible="1"/> <field name="prodlot_id" groups="stock.group_production_lot"/> <button @@ -1155,7 +1153,7 @@ <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/> <button name="%(stock.move_scrap)d" - string="Scrap" type="action" groups="base.group_extended" + string="Scrap" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned" colspan="1"/> <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/> @@ -1209,14 +1207,14 @@ <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/> <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/> <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/> - <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/> + <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/> <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/> <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/> <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" /> </group> </page> - <page string="Additional Info" groups="base.group_extended,base.group_multi_company"> - <field name="type" groups="base.group_extended"/> + <page string="Additional Info"> + <field name="type"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </page> <page string="Notes"> @@ -1238,13 +1236,13 @@ <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" /> <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/> <separator orientation="vertical" /> - <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/> + <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> <separator orientation="vertical"/> <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" /> <separator orientation="vertical"/> <field name="name"/> <field name="origin"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> <field name="company_id" widget="selection" groups="base.group_multi_company" /> </group> <newline/> @@ -1255,7 +1253,7 @@ <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> <separator orientation="vertical" /> - <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/> + <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" /> </group> </search> </field> @@ -1304,7 +1302,7 @@ <separator orientation="vertical"/> <field name="name"/> <field name="origin"/> - <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> + <field name="stock_journal_id" widget="selection"/> <field name="company_id" widget="selection"/> </group> <newline/> @@ -1316,7 +1314,7 @@ <separator orientation="vertical"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> <separator orientation="vertical" /> - <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/> + <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/> </group> </search> </field> @@ -1349,7 +1347,7 @@ - <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2" groups="base.group_extended"/> + <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/> <record id="view_move_tree" model="ir.ui.view"> <field name="name">stock.move.tree</field> @@ -1370,7 +1368,7 @@ string="Scrap Products" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned" - groups="base.group_extended"/> + /> <field name="prodlot_id" groups="stock.group_production_lot"/> <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}" @@ -1408,7 +1406,7 @@ <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/> - <button name="%(stock.move_scrap)d" groups="base.group_extended" + <button name="%(stock.move_scrap)d" string="Scrap" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned" colspan="1"/> @@ -1438,8 +1436,8 @@ <field name="date_expected" on_change="onchange_date(date,date_expected)"/> </group> - <group colspan="2" col="4" groups="base.group_extended"> - <separator string="Traceability" colspan="4" groups="base.group_extended"/> + <group colspan="2" col="4"> + <separator string="Traceability" colspan="4"/> <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/> <button name="%(split_into)d" string="New pack" type="action" groups="product.group_stock_packaging" @@ -1489,7 +1487,7 @@ <field name="prodlot_id"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'picking_id'}"/> <filter string="Lot" name="groupby_prodlot_id" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'prodlot_id'}"/> @@ -1541,7 +1539,7 @@ <button name="%(stock.move_scrap)d" string="Scrap Products" type="action" icon="gtk-convert" context="{'scrap': True}" - states="draft,waiting,confirmed,assigned" groups="base.group_extended"/> + states="draft,waiting,confirmed,assigned"/> <field name="prodlot_id" groups="stock.group_production_lot"/> <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}" @@ -1594,7 +1592,7 @@ <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/> - <button name="%(stock.move_scrap)d" groups="base.group_extended" + <button name="%(stock.move_scrap)d" string="Scrap" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned" colspan="1"/> @@ -1672,7 +1670,7 @@ <field name="prodlot_id"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <separator orientation="vertical"/> <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> @@ -1703,7 +1701,7 @@ <field name="prodlot_id"/> </group> <newline/> - <group expand="0" string="Group By..." groups="base.group_extended"> + <group expand="0" string="Group By..."> <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> @@ -1805,8 +1803,7 @@ id="act_product_stock_move_futur_open" name="Future Stock Moves" res_model="stock.move" - src_model="product.product" - groups="base.group_extended"/> + src_model="product.product"/> <record id="ir_act_product_location_open" model="ir.values"> <field name="key2">tree_but_open</field> @@ -1876,8 +1873,8 @@ <field name="act_window_id" ref="action_out_picking_move"/> </record> - <menuitem action="action_reception_picking_move" id="menu_action_pdct_in" parent="menu_stock_products_moves" sequence="1" groups="base.group_extended"/> - <menuitem action="action_out_picking_move" id="menu_action_pdct_out" parent="menu_stock_products_moves" sequence="2" groups="base.group_extended"/> + <menuitem action="action_reception_picking_move" id="menu_action_pdct_in" parent="menu_stock_products_moves" sequence="1"/> + <menuitem action="action_out_picking_move" id="menu_action_pdct_out" parent="menu_stock_products_moves" sequence="2"/> <record id="view_stock_journal_filter" model="ir.ui.view"> diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml index b2b9ab69287..12b20f0d1aa 100644 --- a/addons/stock/wizard/stock_partial_move_view.xml +++ b/addons/stock/wizard/stock_partial_move_view.xml @@ -44,7 +44,7 @@ <field name="product_uom" /> <field name="location_id" /> <field name="location_dest_id" /> - <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" /> + <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/> <field name="update_cost" invisible="1"/> <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/> <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/> @@ -63,7 +63,7 @@ <field name="product_uom" /> <field name="location_id" /> <field name="location_dest_id" /> - <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" /> + <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/> <field name="update_cost" invisible="1"/> <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/> <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/> diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index 3c859c288a8..c461f42a322 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -50,7 +50,7 @@ <field name="quantity" /> <field name="product_uom" /> <field name="tracking" invisible="1"/> - <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}" groups="base.group_extended" /> + <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/> <!-- Removed as this feature is not logic: price must be updated upon reception of invoice --> <field name="update_cost" invisible="1"/> <field name="cost" invisible="1"/> @@ -70,7 +70,7 @@ <field name="location_id" /> <field name="location_dest_id" /> <field name="tracking" invisible="1"/> - <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}" groups="base.group_extended" /> + <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/> <field name="update_cost" invisible="1"/> <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/> <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/> diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml index f34d34da4ab..94a9feb9d57 100644 --- a/addons/stock_location/stock_location_view.xml +++ b/addons/stock_location/stock_location_view.xml @@ -46,7 +46,7 @@ <field name="name"/> <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/> <field name="type_proc"/> - <field name="journal_id" groups="base.group_extended"/> + <field name="journal_id"/> <field name="company_id" groups="base.group_multi_company"/> </tree> <form string="Pulled Paths"> @@ -65,7 +65,7 @@ <field name="procure_method"/> <field name="cancel_cascade"/> <field name="invoice_state"/> - <field name="journal_id" groups="base.group_extended"/> + <field name="journal_id"/> </group> </form> </field> @@ -86,7 +86,7 @@ <field name="location_dest_id"/> <field name="auto"/> <field name="delay"/> - <field name="journal_id" groups="base.group_extended"/> + <field name="journal_id"/> </group> <field name="picking_type"/> <field name="invoice_state"/> diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 3ce0184eb00..b29eb7baace 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -184,7 +184,7 @@ <!-- Forecast section --> <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" - parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/> + parent="base.menu_base_partner" sequence="5"/> <record id="view_stock_sale_forecast_filter" model="ir.ui.view"> <field name="name">stock.sale.forecast.list.select</field> diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index 550240d522e..5235e0410bf 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -18,7 +18,7 @@ <field name="name" select="1"/> <field name="partner_id" select="1"/> <field name="user_id" select="1"/> - <field name="active" select="1" groups="base.group_extended"/> + <field name="active" select="1"/> </group> <notebook colspan="4"> <page string="Subsription Data"> @@ -59,7 +59,7 @@ <tree string="Subscriptions"> <field name="name"/> <field name="partner_id"/> - <field name="active" groups="base.group_extended"/> + <field name="active"/> <field name="user_id" select="1"/> <field name="state"/> <button name="set_process" states="draft" string="Process" type="object" icon="terp-check"/> diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 4673bcd9846..36a15948b5a 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -36,7 +36,7 @@ <field name="page_ids" colspan="4" nolabel="1" mode="form,tree"> <form string="Survey Page"> <field name="title" select="1"/> - <field name="sequence" groups="base.group_extended"/> + <field name="sequence" groups="base.group_no_one"/> <separator string="Description" colspan="4"/> <field name="note" colspan="4" nolabel="1"/> <field name="question_ids" height="200" width="200" colspan="4" nolabel="1"> diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index eeec9302004..c10890d3928 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -130,7 +130,7 @@ <group col="6" colspan="4"> <field name="name" select="1" colspan="6"/> <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/> - <field name="parent_id" groups="base.group_extended" domain="[('group_id','=',group_id)]"/> + <field name="parent_id" domain="[('group_id','=',group_id)]"/> <field name="section"/> </group> <notebook colspan="4"> @@ -139,16 +139,16 @@ <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/> </page> </notebook> - <group col="2" colspan="2"> + <group col="2" colspan="2" groups="base.group_no_one"> <separator colspan="4" string="Modification Information"/> - <field name="write_date" readonly="1" groups="base.group_no_one"/> - <field name="minor_edit" groups="base.group_extended"/> - <field name="review" select="1" groups="base.group_extended"/> + <field name="write_date" readonly="1"/> + <field name="minor_edit"/> + <field name="review" select="1"/> </group> <group col="2" colspan="2"> <separator colspan="4" string="Meta Information"/> <field name="tags" select="1"/> - <field name="toc" groups="base.group_extended"/> + <field name="toc" groups="base.group_no_one"/> </group> </form> </field> @@ -166,7 +166,7 @@ <field name="name"/> <field name="group_id"/> <field name="tags"/> - <field name="section" groups="base.group_extended"/> + <field name="section"/> <field name="write_uid"/> <field name="write_date" groups="base.group_no_one"/> <newline/> @@ -215,7 +215,7 @@ <tree string="Wiki History"> <field name="create_date"/> <field name="write_uid"/> - <field name="minor_edit" groups="base.group_extended"/> + <field name="minor_edit" groups="base.group_no_one"/> <field name="summary"/> </tree> </field> @@ -232,7 +232,7 @@ <field name="summary" select="1" colspan="4"/> <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/> <field name="create_date" select="1" readonly="1"/> - <field name="minor_edit" select="1" groups="base.group_extended"/> + <field name="minor_edit" select="1" groups="base.group_no_one"/> </form> </field> </record> |
