odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge with main server branch 

bzr revid: psi@tinyerp.com-20120424063105-kd3j7akoyrzejy38
bzr revid: psi@tinyerp.com-20120430060434-ys3xjc9vhlng5igv
This commit is contained in:
Purnendu Singh (OpenERP) 2012-04-30 11:34:34 +05:30
parent b26f2b5790 cbf1c12698
commit e6dea6d5f3
20 changed files with 86 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openerp/addons/base/base_menu.xml
View File

@ -2,13 +2,13 @@
<openerp>
<data>
<menuitem id="menu_reporting" name="Reporting" sequence="90"/>
<menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0" groups="group_extended"/>
<menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="group_system"/>
<menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0" groups="base.group_no_one"/>
<menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
<menuitem id="menu_administration" name="Settings" sequence="100" icon="terp-administration"/>
<menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
<menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
<menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="group_extended"/>
<menuitem id="next_id_2" name="User Interface" parent="menu_custom" groups="base.group_extended"/>
<menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="base.group_no_one"/>
<menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
<menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
<menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
<menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
@ -16,7 +16,7 @@
<menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
<menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/>
<menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
<menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="group_extended"/>
<menuitem id="menu_translation_export" name="Import / Export" groups="group_extended" parent="menu_translation" sequence="3"/>
<menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
<menuitem id="menu_translation_export" name="Import / Export" groups="base.group_no_one" parent="menu_translation" sequence="3"/>
</data>
</openerp>

17
openerp/addons/base/base_update.xml
View File

@ -76,7 +76,6 @@
<group colspan="2" col="3">
<group col="2" colspan="2" name="preferences">
<separator string="Preferences" colspan="2"/>
<field name="view" readonly="0"/>
<field name="context_lang" readonly="0"/>
<field name="context_tz" readonly="0"/>
<field name="menu_tips" readonly="0" groups="base.group_no_one"/>
@ -121,8 +120,8 @@
<separator string="Avatar" colspan="2"/>
<field name="avatar" widget='image' nolabel="1" colspan="2" on_change="onchange_avatar(avatar)"/>
</group>
<group col="3" colspan="2" name="preferences">
<separator string="Preferences" colspan="3"/>
<group col="2" colspan="2" name="preferences">
<separator string="Preferences" colspan="2"/>
<field name="context_lang"/>
<field name="context_tz"/>
<field name="menu_tips"/>
@ -131,7 +130,7 @@
<separator string="Default Filters" colspan="2"/>
<field name="company_id" required="1" context="{'user_preference': 0}" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="2" groups="base.group_extended">
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Action" colspan="2"/>
<field name="action_id"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
@ -220,7 +219,7 @@
<group colspan="4" col="6">
<group colspan="4" col="4">
<field name="name"/>
<field name="partner_id" readonly="1" required="0" groups="base.group_extended"/>
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
<field name="parent_id" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="2">
@ -246,7 +245,7 @@
<group colspan="4" col="3">
<field name="rml_header1" colspan="3"/>
<newline/>
<field name="rml_footer1" colspan="3" groups="base.group_extended"/>
<field name="rml_footer1" colspan="3" groups="base.group_no_one"/>
<newline/>
<field name="rml_footer2" colspan="2"/>
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
@ -255,13 +254,13 @@
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
</group>
</page>
<page string="Header/Footer" groups="base.group_extended">
<page string="Header/Footer" groups="base.group_no_one">
<group colspan="2" col="4">
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
</group>
<field colspan="4" name="rml_header" nolabel="1"/>
</page>
<page string="Internal Header/Footer" groups="base.group_extended">
<page string="Internal Header/Footer" groups="base.group_no_one">
<separator string="Portrait" colspan="2"/>
<separator string="Landscape" colspan="2"/>
<field colspan="2" name="rml_header2" nolabel="1"/>
@ -272,7 +271,7 @@
<field name="currency_id" colspan="2"/>
<newline/>
</page>
<page string="Bank Accounts" groups="base.group_extended">
<page string="Bank Accounts">
<field name="bank_ids" nolabel="1"/>
</page>
</notebook>

58
openerp/addons/base/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-04-19 04:33+0000\n"
"PO-Revision-Date: 2012-04-25 21:09+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-20 04:42+0000\n"
"X-Generator: Launchpad (build 15120)\n"
"X-Launchpad-Export-Date: 2012-04-26 04:40+0000\n"
"X-Generator: Launchpad (build 15149)\n"
#. module: base
#: model:res.country,name:base.sh
@ -71,7 +71,7 @@ msgid ""
" "
msgstr ""
"\n"
"プロジェクト管理モジュールは複数レベルのプロジェクト、タスク、完了したタスクなどを追跡します。=============================="
"プロジェクト管理モジュールは複数レベルのプロジェクト、タスク、終了したタスクなどを追跡します。=============================="
"========================================================\n"
"\n"
"計画の立案、タスクの命令などが可能です。\n"
@ -646,7 +646,7 @@ msgstr ""
"異なる会社のために異なるポリシーを定義でき、顧客にメールすることもできます。\n"
"\n"
"所定のパートナ / アカウントエントリーのためにフォローアップレベルをチェックしたい場合は、このメニューを使うことができます：\n"
"　　会計 / レポート / 一般的なレポート / パートナ / フォローアップ送信済み\n"
"　　会計 / レポート / 一般的なレポート / パートナ / フォローアップ送信済\n"
"\n"
#. module: base
@ -731,7 +731,7 @@ msgstr "アンギラ"
#. module: base
#: view:base.language.export:0
msgid "Export done"
msgstr "エクスポート完了"
msgstr "エクスポート終了"
#. module: base
#: model:ir.module.module,shortdesc:base.module_plugin_outlook
@ -1347,8 +1347,8 @@ msgid ""
"- creation/update: a mandatory field is not correctly set"
msgstr ""
"その操作は完了できません。おそらく、次の理由によります：\n"
" ・ 削除：他から参照されているレコードの削除を行おうとした\n"
" ・ 作成 / 更新：必須項目が正しくセットされていない"
" ・ 削除：他から参照されているレコードの削除を行おうとした。\n"
" ・ 作成 / 更新：必須項目が正しくセットされていない。"
#. module: base
#: field:ir.module.category,parent_id:0
@ -1865,9 +1865,9 @@ msgstr ""
"\n"
" ・ デフォルトでは国のための知られている検査ルール、通常は簡単なチェックディジットを\n"
"　　使って簡便なオフラインチェックが実行されます。これは簡単でいつでも利用できますが、\n"
"　　割り当て済みの番号や正しくない値を許してしまいます。\n"
" ・ 'VAT VIES Check' オプションが使用可能（ユーザの会社の設定にある）な\n"
"　　時は、VAT番号はEU VIESデータベースに問い合わせて、その番号がEU会社として実際に割り当て\n"
"　　割当済の番号や正しくない値を許してしまいます。\n"
" ・ 'VAT VIES Check' オプションが使用可能（ユーザの会社の設定にある）な時は、\n"
"　　VAT番号はEU VIESデータベースに問い合わせて、その番号がEU会社として実際に割り当て\n"
"　　られているかを検査します。これは単純なオフラインチェックに比較して多少時間がかり、\n"
"　　インターネット接続も必要です。全ての時間に利用可能ではないため、サービスが利用可能でき\n"
"　　ない時や対象外の国（例えば非EU国）の場合は、簡便なチェックが代わりに実行されます。\n"
@ -2314,7 +2314,7 @@ msgstr ""
" ・ 配達がトラックなのかUPSなのかの仕訳\n"
"\n"
"仕訳帳にはそうした責任があり、そして異なる状態に進展します：\n"
" ・ ドラフト、オープン、キャンセル、完了\n"
" ・ ドラフト、オープン、キャンセル、終了\n"
"\n"
"バッチ操作は一度に全ての受注の確認、検証、請求書集荷といった異なる仕訳帳を処理できます。\n"
"\n"
@ -3261,7 +3261,7 @@ msgstr "繰り返しの設定"
#. module: base
#: selection:publisher_warranty.contract,state:0
msgid "Canceled"
msgstr "キャンセル済み"
msgstr "キャンセル済"
#. module: base
#: model:res.country,name:base.at
@ -5191,7 +5191,7 @@ msgstr "アブハジア語 / аҧсуа"
#. module: base
#: view:base.module.configuration:0
msgid "System Configuration Done"
msgstr "システム設定完了"
msgstr "システム設定終了"
#. module: base
#: code:addons/orm.py:1459
@ -5430,7 +5430,7 @@ msgstr "南アフリカ"
#: selection:ir.module.module,state:0
#: selection:ir.module.module.dependency,state:0
msgid "Installed"
msgstr "インストール済み"
msgstr "インストール済"
#. module: base
#: selection:base.language.install,lang:0
@ -6281,8 +6281,8 @@ msgstr ""
" Eric\n"
" Fabien\n"
"\n"
"ここで、２つの計画があります： プロジェクトとセールスマン。請求書は２つの計画の中に分析的入力を書き込み可能でなければなりません： SubProj "
"1.1とFabien。量は分割することができます。次は２つのサブプロジェクトに関連し、１人のセールスマンに割り当てる請求書の例です：\n"
"ここで、２つの計画があります： プロジェクトと販売員。請求書は２つの計画の中に分析的入力を書き込み可能でなければなりません： SubProj "
"1.1とFabien。量は分割することができます。次は２つのサブプロジェクトに関連し、１人の販売員に割り当てる請求書の例です：\n"
"\n"
"Plan1:\n"
" SubProject 1.1 : 50%\n"
@ -6369,7 +6369,7 @@ msgstr "翻訳"
#. module: base
#: selection:res.request,state:0
msgid "closed"
msgstr "閉鎖済み"
msgstr "閉鎖済"
#. module: base
#: model:ir.module.module,description:base.module_l10n_cr
@ -6973,7 +6973,7 @@ msgstr "自らの必要と希望によるクライアントにより解釈され
#. module: base
#: sql_constraint:ir.rule:0
msgid "Rule must have at least one checked access right !"
msgstr "ルールは少なくとも１つのチェック済みのアクセス権限を持たねばなりません。"
msgstr "ルールは少なくとも１つのチェック済のアクセス権限を持たねばなりません。"
#. module: base
#: model:res.country,name:base.fj
@ -8620,7 +8620,7 @@ msgid ""
msgstr ""
"\n"
"\n"
"このアドオンは既にシステムにインストール済みです。"
"このアドオンは既にシステムにインストール済です。"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@ -10694,7 +10694,7 @@ msgstr "このモジュールはresユーザの中にGoogleユーザを加えま
#: selection:base.module.import,state:0
#: selection:base.module.update,state:0
msgid "done"
msgstr "完了"
msgstr "終了"
#. module: base
#: view:ir.actions.act_window:0
@ -10963,7 +10963,7 @@ msgstr "%I - 時（12時間表示）[01,12]."
#. module: base
#: selection:publisher_warranty.contract.wizard,state:0
msgid "Finished"
msgstr "完了"
msgstr "終了"
#. module: base
#: model:res.country,name:base.de
@ -11005,12 +11005,12 @@ msgstr ""
#. module: base
#: sql_constraint:res.currency:0
msgid "The currency code must be unique per company!"
msgstr "通貨コードは会社ごとに一意でなければなりません。"
msgstr "通貨コードは会社ごとに固有でなければいけません。"
#. module: base
#: model:ir.model,name:base.model_ir_property
msgid "ir.property"
msgstr ""
msgstr "ir.property"
#. module: base
#: model:ir.module.module,description:base.module_fetchmail
@ -11985,7 +11985,7 @@ msgstr "その他のアクション"
#. module: base
#: selection:ir.actions.todo,state:0
msgid "Done"
msgstr "完了"
msgstr "終了"
#. module: base
#: help:ir.cron,doall:0
@ -12142,7 +12142,7 @@ msgstr ""
#. module: base
#: field:ir.module.module,latest_version:0
msgid "Installed version"
msgstr "インストール済みのバージョン"
msgstr "インストール済のバージョン"
#. module: base
#: selection:base.language.install,lang:0
@ -13981,7 +13981,7 @@ msgstr ""
"============================================================================="
"================================\n"
"\n"
"状態：ドラフト、確認、完了、キャンセル\n"
"状態：ドラフト、確認、終了、キャンセル\n"
"終了する、確認する、キャンセルする時に、製造オーダーは全ての状態行を状態に応じて設定する。\n"
"\n"
"メニューの作成：\n"
@ -13991,7 +13991,7 @@ msgstr ""
"\n"
"ワークセンタタブの下に製造オーダーのフォームビューにボタンを追加して下さい：\n"
"　・ 開始（確認状態に設定）、開始日付の設定\n"
"　・ 完了（完了状態に設定）、中止日付の設定\n"
"　・ 終了（終了状態に設定）、中止日付の設定\n"
"　・ ドラフトに設定（ドラフト状態に設定）\n"
"　・ キャンセル（キャンセル状態に設定）\n"
"\n"
@ -16208,7 +16208,7 @@ msgstr "イベントログ"
#: code:addons/base/module/wizard/base_module_configuration.py:38
#, python-format
msgid "System Configuration done"
msgstr "システム設定が完了しました。"
msgstr "システム設定が終了しました。"
#. module: base
#: view:ir.actions.server:0

40
openerp/addons/base/ir/ir.xml
View File

@ -143,7 +143,7 @@
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="active" groups="base.group_extended"/>
<field name="active" groups="base.group_no_one"/>
</group>
<notebook colspan="4">
<page string="Sequence">
@ -269,7 +269,7 @@
<field eval="False" name="view_id"/>
</record>
<menuitem action="ir_sequence_type" id="menu_ir_sequence_type"
groups="base.group_extended"
groups="base.group_no_one"
parent="base.next_id_5"/>
<!-- Actions -->
@ -356,8 +356,8 @@
<field name="name"/>
<field name="model_id"/>
<field name="user_id"/>
<field name="domain" groups="base.group_extended"/>
<field name="context" groups="base.group_extended"/>
<field name="domain" groups="base.group_no_one"/>
<field name="context" groups="base.group_no_one"/>
</tree>
</field>
</record>
@ -764,7 +764,7 @@
<field name="help">A group is a set of functional areas that will be assigned to the user in order to give them access and rights to specific applications and tasks in the system. You can create custom groups or edit the ones existing by default in order to customize the view of the menu that users will be able to see. Whether they can have a read, write, create and delete access right can be managed from here.</field>
</record>
<menuitem action="action_res_groups" id="menu_action_res_groups" parent="base.menu_users"
groups="base.group_extended"/>
groups="base.group_no_one"/>
<!-- View -->
<record id="view_view_form" model="ir.ui.view">
@ -927,7 +927,7 @@
<field name="res_id"/>
<field name="res_name"/>
</group>
<group col="2" groups="base.group_extended">
<group col="2" groups="base.group_no_one">
<separator string="Created" colspan="2"/>
<field name="create_uid" select="2"/>
<field name="create_date" select="2"/>
@ -984,7 +984,7 @@
<newline/>
<group expand="0" string="Group By...">
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_extended"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
<filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
@ -1287,7 +1287,7 @@
<field name="context">{'manual':True}</field>
<field name="view_id" ref="view_model_tree"/>
</record>
<menuitem id="next_id_9" name="Database Structure" parent="base.menu_custom" groups="base.group_extended"/>
<menuitem id="next_id_9" name="Database Structure" parent="base.menu_custom" groups="base.group_no_one"/>
<menuitem action="action_model_model" id="ir_model_model_menu" parent="next_id_9"/>
<record id="action_model_fields" model="ir.actions.act_window">
@ -1306,7 +1306,7 @@
<field name="view_id" ref="view_model_data_list"/>
</record>
<menuitem action="action_model_data" id="ir_model_data_menu" parent="base.next_id_5"
groups="base.group_extended"/>
groups="base.group_no_one"/>
<!-- Translations -->
@ -1429,11 +1429,11 @@
<field name="action" colspan="2" />
<field name="icon" colspan="2"/>
<group col="4" colspan="6" groups="base.group_extended">
<field name="web_icon" groups="base.group_extended" />
<field name="web_icon_hover" groups="base.group_extended" />
<field name="web_icon_data" widget="image" groups="base.group_extended"/>
<field name="web_icon_hover_data" widget="image" groups="base.group_extended"/>
<group col="4" colspan="6" groups="base.group_no_one">
<field name="web_icon"/>
<field name="web_icon_hover"/>
<field name="web_icon_data" widget="image"/>
<field name="web_icon_hover_data" widget="image"/>
</group>
</group>
<notebook colspan="4">
@ -1517,9 +1517,9 @@
<field name="numbercall"/>
<field name="doall"/>
</page>
<page string="Technical Data" groups="base.group_extended">
<page string="Technical Data" groups="base.group_no_one">
<separator string="Action to Trigger" colspan="4"/>
<field name="model" groups="base.group_extended"/>
<field name="model"/>
<field name="function"/>
<separator string="Arguments" colspan="4"/>
<field colspan="4" name="args" nolabel="1"/>
@ -1571,7 +1571,7 @@
<field name="view_id" ref="ir_cron_view_tree"/>
</record>
<menuitem id="menu_ir_cron" name="Scheduler" parent="menu_custom" groups="base.group_extended" sequence="23"/>
<menuitem id="menu_ir_cron" name="Scheduler" parent="menu_custom" groups="base.group_no_one" sequence="23"/>
<menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="menu_ir_cron"/>
<!-- ir.model.access -->
@ -1631,7 +1631,7 @@
<field name="group_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
<filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
@ -1950,7 +1950,7 @@
<field name="view_type">form</field>
<field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field>
</record>
<menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_extended"/>
<menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_no_one"/>
<menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="menu_ir_actions_todo"/>
<record model="ir.cron" id="cronjob_osv_memory_autovacuum">
@ -2017,7 +2017,7 @@
<separator string="Connection Information" colspan="4"/>
<field name="smtp_host"/>
<field name="smtp_port"/>
<field name="smtp_debug" groups="base.group_extended"/>
<field name="smtp_debug" groups="base.group_no_one"/>
</group>
<group col="2" colspan="4">
<separator string="Security and Authentication" colspan="2"/>

2
openerp/addons/base/ir/ir_config_parameter_view.xml
View File

@ -37,6 +37,6 @@
<act_window name="System Parameters" res_model="ir.config_parameter" id="ir_config_list_action"/>
<menuitem name="System Parameters" id="ir_config_menu"
parent="base.next_id_4" action="ir_config_list_action" groups="base.group_extended"/>
parent="base.next_id_4" action="ir_config_list_action" groups="base.group_no_one"/>
</data>
</openerp>

2
openerp/addons/base/ir/workflow/workflow_view.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="menu_workflow_root" name="Workflows" parent="base.menu_custom" groups="base.group_extended"/>
<menuitem id="menu_workflow_root" name="Workflows" parent="base.menu_custom" groups="base.group_no_one"/>
<!--
================================

3
openerp/addons/base/module/module_data.xml
View File

@ -132,9 +132,6 @@
<record model="res.groups" id="group_multi_company">
<field name="category_id" ref="module_category_usability"/>
</record>
<record model="res.groups" id="group_extended">
<field name="category_id" ref="module_category_usability"/>
</record>
<record model="res.groups" id="group_no_one">
<field name="category_id" ref="module_category_usability"/>
</record>

2
openerp/addons/base/module/wizard/base_language_install_view.xml
View File

@ -22,7 +22,7 @@
<separator string="Load an Official Translation" colspan="4"/>
<group states="init" colspan="4">
<field name="lang" colspan="4"/>
<field name="overwrite" colspan="4" groups="base.group_extended"/>
<field name="overwrite" colspan="4" groups="base.group_no_one"/>
</group>
<group states="done" colspan="4">
<label string="The selected language has been successfully installed.

2
openerp/addons/base/module/wizard/base_module_import_view.xml
View File

@ -61,7 +61,7 @@ After importing a new module you can install it by clicking on the button "Insta
action="action_view_base_module_import"
id="menu_view_base_module_import"
parent="menu_management"
groups="base.group_extended"
groups="base.group_no_one"
sequence="1"/>
-->

2
openerp/addons/base/module/wizard/base_module_update_view.xml
View File

@ -58,7 +58,7 @@
name="Update Modules List"
action="action_view_base_module_update"
id="menu_view_base_module_update"
groups="base.group_extended"
groups="base.group_no_one"
parent="menu_management"
sequence="2"
icon="STOCK_CONVERT"/>

2
openerp/addons/base/module/wizard/base_module_upgrade_view.xml
View File

@ -33,7 +33,7 @@
<menuitem
name="Apply Scheduled Upgrades"
action="action_view_base_module_upgrade"
groups="base.group_extended"
groups="base.group_no_one"
id="menu_view_base_module_upgrade"
parent="menu_management"
sequence="3"/>

4
openerp/addons/base/res/ir_property_view.xml
View File

@ -50,7 +50,7 @@
<field colspan="4" name="value_binary" />
</group>
<separator colspan="4" string="Resource"/>
<field colspan="4" name="res_id" groups="base.group_extended"/>
<field colspan="4" name="res_id"/>
</form>
</field>
</record>
@ -75,7 +75,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="ir_property_view_tree"/>
</record>
<menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" groups="group_extended" sequence="24"/>
<menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" groups="base.group_no_one" sequence="24"/>
<menuitem id="menu_ir_property_form_all" parent="menu_ir_property" action="ir_property_form"/>
</data>
</openerp>

2
openerp/addons/base/res/res_bank_view.xml
View File

@ -113,7 +113,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" attrs="{'required': [('company_id','&lt;&gt;',False)]}"/>
<field name="bank_bic"/>
</group>

2
openerp/addons/base/res/res_country_view.xml
View File

@ -26,7 +26,7 @@
<form string="Country">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="address_format" colspan="4" groups="base.group_extended"/>
<field name="address_format" colspan="4" groups="base.group_no_one"/>
</form>
</field>
</record>

2
openerp/addons/base/res/res_lang_view.xml
View File

@ -126,6 +126,6 @@
<field name="context">{'active_test': False}</field>
<field name="search_view_id" ref="res_lang_search"/>
</record>
<menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation" groups="base.group_extended" sequence="1"/>
<menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation" groups="base.group_no_one" sequence="1"/>
</data>
</openerp>

2
openerp/addons/base/res/res_partner_report.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<report id="res_partner_address_report" model="res.partner" name="res.partner" string="Labels" xml="base/res/report/partner_address.xml" xsl="base/res/report/partner_address.xsl" groups="base.group_extended"/>
<report id="res_partner_address_report" model="res.partner" name="res.partner" string="Labels" xml="base/res/report/partner_address.xml" xsl="base/res/report/partner_address.xsl" groups="base.group_no_one"/>
<!--
<report string="Business Cards" model="res.partner" name="res.partner.businesscard" xml="base/res/report/business_card.xml" xsl="base/res/report/business_card.xsl"/>
-->

20
openerp/addons/base/res/res_partner_view.xml
View File

@ -202,9 +202,6 @@
<field name="view_id" ref="view_partner_address_form1"/>
<field name="act_window_id" ref="action_partner_address_form"/>
</record>
<!--menuitem action="action_partner_address_form" id="menu_partner_address_form"
groups="base.group_extended" name="Contacts"
parent="base.menu_address_book" sequence="30"/-->
<!--
=========================================
@ -339,7 +336,7 @@
<group colspan="4">
<h2><field name="name" required="1" nolabel="1" colspan="4"/></h2><newline/>
<field name="function" attrs="{'invisible': [('is_company', '=', True)]}"/>
<field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
<field name="title" size="0" domain="[('domain', '=', 'contact')]"/>
<field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', True)]}"
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
on_change="onchange_address(use_parent_address, parent_id)"/>
@ -374,7 +371,7 @@
<field name="fax" colspan="4"/>
<field name="email" widget="email" colspan="4"/>
<field name="website" widget="url" colspan="4"/>
<field name="ref" groups="base.group_extended" colspan="4"/>
<field name="ref" colspan="4"/>
</group>
<group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
<field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban,list">
@ -433,14 +430,14 @@
<separator string="General Information" colspan="4"/>
<field name="lang" colspan="4"/>
<field name="user_id"/>
<field name="active" groups="base.group_extended"/>
<field name="active"/>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
</page>
<page string="History" groups="base.group_extended" invisible="True">
<page string="History" invisible="True">
</page>
<page string="Categories" groups="base.group_extended">
<page string="Categories">
<field name="category_id" colspan="4" nolabel="1"/>
</page>
<page string="Notes">
@ -467,7 +464,7 @@
<field name="name" select="1"/>
<!--field name="address" select="1"/-->
<!--field name="country" select="1"/-->
<field name="category_id" select="1" groups="base.group_extended"/>
<field name="category_id" select="1"/>
<field name="user_id" select="1">
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
</field>
@ -654,7 +651,7 @@
<field name="arch" type="xml">
<form string="Partner Category">
<field name="name" select="1"/>
<field name="active" groups="base.group_extended"/>
<field name="active"/>
<field name="parent_id"/>
<separator colspan="4" string="Partners"/>
<field colspan="4" name="partner_ids" nolabel="1"/>
@ -693,7 +690,7 @@
<field name="domain">[('parent_id','=',False)]</field>
</record>
<menuitem action="action_partner_category" id="menu_partner_category_main" parent="base.menu_address_book" sequence="1"
groups="base.group_extended"/>
groups="base.group_no_one"/>
-->
<record id="action_partner_by_category" model="ir.actions.act_window">
@ -727,7 +724,6 @@
id="act_res_partner_event" name="Events"
res_model="res.partner.event"
src_model="res.partner"
groups="base.group_extended"
/>
</data>

4
openerp/addons/base/res/res_request_view.xml
View File

@ -47,12 +47,12 @@
<button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
</group>
</page>
<page string="References" groups="base.group_extended">
<page string="References">
<field name="ref_partner_id"/>
<field colspan="4" name="ref_doc1"/>
<field colspan="4" name="ref_doc2"/>
</page>
<page string="History" groups="base.group_extended">
<page string="History">
<field colspan="4" name="history" nolabel="1" widget="one2many_list"/>
</page>
</notebook>

39
openerp/addons/base/res/res_users.py
View File

@ -96,11 +96,6 @@ class groups(osv.osv):
self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
return res
def get_extended_interface_group(self, cr, uid, context=None):
data_obj = self.pool.get('ir.model.data')
extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')
return data_obj.browse(cr, uid, extended_group_data_id, context=context).res_id
groups()
def _lang_get(self, cr, uid, context=None):
@ -156,35 +151,6 @@ class users(osv.osv):
body=(self.get_welcome_mail_body(cr, uid, context=context) % user))
return ir_mail_server.send_email(cr, uid, msg, context=context)
def _set_interface_type(self, cr, uid, ids, name, value, arg, context=None):
"""Implementation of 'view' function field setter, sets the type of interface of the users.
@param name: Name of the field
@param arg: User defined argument
@param value: new value returned
@return: True/False
"""
if not value or value not in ['simple','extended']:
return False
group_obj = self.pool.get('res.groups')
extended_group_id = group_obj.get_extended_interface_group(cr, uid, context=context)
# First always remove the users from the group (avoids duplication if called twice)
self.write(cr, uid, ids, {'groups_id': [(3, extended_group_id)]}, context=context)
# Then add them back if requested
if value == 'extended':
self.write(cr, uid, ids, {'groups_id': [(4, extended_group_id)]}, context=context)
return True
def _get_interface_type(self, cr, uid, ids, name, args, context=None):
"""Implementation of 'view' function field getter, returns the type of interface of the users.
@param field_name: Name of the field
@param arg: User defined argument
@return: Dictionary of values
"""
group_obj = self.pool.get('res.groups')
extended_group_id = group_obj.get_extended_interface_group(cr, uid, context=context)
extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users']
return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids]))
def onchange_avatar(self, cr, uid, ids, value, context=None):
if not value:
return {'value': {'avatar_big': value, 'avatar': value} }
@ -264,9 +230,6 @@ class users(osv.osv):
help="The user's timezone, used to output proper date and time values inside printed reports. "
"It is important to set a value for this field. You should use the same timezone "
"that is otherwise used to pick and render date and time values: your computer's timezone."),
'view': fields.function(_get_interface_type, type='selection', fnct_inv=_set_interface_type,
selection=[('simple','Simplified'),('extended','Extended')],
string='Interface', help="OpenERP offers a simplified and an extended user interface. If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier to use. You can switch to the other interface from the User/Preferences menu at any time."),
'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
'date': fields.datetime('Latest Connection', readonly=True),
}
@ -375,7 +338,7 @@ class users(osv.osv):
}
# User can write to a few of her own fields (but not her groups for example)
SELF_WRITEABLE_FIELDS = ['menu_tips','view', 'password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
SELF_WRITEABLE_FIELDS = ['menu_tips','password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
def write(self, cr, uid, ids, values, context=None):
if not hasattr(ids, '__iter__'):

4
openerp/addons/base/security/base_security.xml
View File

@ -24,10 +24,6 @@
<field name="name">Multi Companies</field>
</record>
<record model="res.groups" id="group_extended">
<field name="name">Extended View</field>
</record>
<record model="res.groups" id="group_no_one">
<field name="name">Technical Features</field>
</record>