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

[MERGE] Merged with main server 

bzr revid: tde@openerp.com-20120418150754-gijvu06jii2hzz8g
bzr revid: tde@openerp.com-20120504073145-tc7jwahqavtxg4iw
This commit is contained in:
Thibault Delavallée 2012-05-04 09:31:45 +02:00
parent bad0a7e8b3 cbf1c12698
commit 9a0cf94c75
32 changed files with 384 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
doc/api/font_style.rst Normal file
View File

@ -0,0 +1,28 @@
Font style in list views
========================
.. versionadded:: 7.0
This revision adds font styles in list views. Before this revision it was
possible to define some colors in list view. This revision allows to define
the a font style, based on an evaluated Python expression. The definition syntax is
the same than the colors feature. Supported styles are bold, italic and
underline.
Rng modification
+++++++++++++++++
This revision adds the ``fonts`` optional attribute in ``view.rng``.
Addon implementation example
++++++++++++++++++++++++++++
In your ``foo`` module, you want to specify that when any record is in ``pending``
state then it should be displayed in bold in the list view. Edit your foo_view.xml
file that define the views, and add the fonts attribute to the tree tag.
.. code-block:: xml
<tree string="Foo List View" fonts="bold:state=='pending'">
[...]
</tree>

1
doc/index.rst.inc
View File

@ -29,3 +29,4 @@ Main revisions and new features
revisions/user_img_specs
revisions/need_action_specs
api/font_style

57
doc/revisions/need_action_specs.rst
View File

@ -1,41 +1,84 @@
Need action mechanism
=====================
ir.needaction mixin class
++++++++++++++++++++++++++
.. versionadded:: 7.0
ir.needaction_mixin class
+++++++++++++++++++++++++
.. versionadded:: openobject-server.4124
This revision adds a mixin class for objects using the need action feature.
Need action feature can be used by objects willing to be able to signal that an action is required on a particular record. If in the business logic an action must be performed by somebody, for instance validation by a manager, this mechanism allows to set a list of users asked to perform an action.
This class wraps a class (ir.needaction_users) that behaves like a many2many field. However, no field is added to the model inheriting from base.needaction. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
This class wraps a class (ir.ir_needaction_users_rel) that behaves like a many2many field. However, no field is added to the model inheriting from ir.needaction_mixin. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
Objects using the need_action feature should override the ``get_needaction_user_ids`` method. This methods returns a dictionary whose keys are record ids, and values a list of user ids, like in a many2many relationship. Therefore by defining only one method, you can specify if an action is required by defining the users that have to do it, in every possible situation.
This class also offers several global services,:
- ``needaction_get_record_ids``: for the current model and uid, get all record ids that ask this user to perform an action. This mechanism is used for instance to display the number of pending actions in menus, such as Leads (12)
- ``needaction_get_action_count``: as ``needaction_get_record_ids`` but returns only the number of action, not the ids (performs a search with count=True)
- ``needaction_get_user_record_references``: for a given uid, get all the records that ask this user to perform an action. Records are given as references, a list of tuples (model_name, record_id)
- ``needaction_get_user_record_references``: for a given uid, get all the records that ask this user to perform an action. Records are given as references, a list of tuples (model_name, record_id).
.. versionadded:: openobject-server.4137
This revision of the needaction_mixin mechanism slighty modifies the class behavior. The ``ir_needaction_mixin`` class now adds a function field on models inheriting from the class. This field allows to state whether a given record has a needaction for the current user. This is usefull if you want to customize views according to the needaction feature. For example, you may want to set records in bold in a list view if the current user has an action to perform on the record. This makes the class not a pure abstract class, but allows to easily use the action information. The field definition is::
def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
res = {}
needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
for id in ids:
res[id] = uid in needaction_user_ids[id]
return res
_columns = {
'needaction_pending': fields.function(get_needaction_pending, type='boolean',
string='Need action pending',
help='If True, this field states that users have to perform an action. \
This field comes from the needaction mechanism. Please refer \
to the ir.needaction_mixin class.'),
}
ir.needaction_users_rel class
+++++++++++++++++++++++++++++
.. versionadded:: openobject-server.4124
This class essentially wraps a database table that behaves like a many2many.
It holds data related to the needaction mechanism inside OpenERP. A row
in this model is characterized by:
- ``res_model``: model of the record requiring an action
- ``res_id``: ID of the record requiring an action
- ``user_id``: foreign key to the res.users table, to the user that
has to perform the action
This model can be seen as a many2many, linking (res_model, res_id) to
users (those whose attention is required on the record)
Menu modification
+++++++++++++++++
.. versionchanged:: openobject-server.4137
This revision adds three functional fields to ``ir.ui.menu`` model :
- ``uses_needaction``: boolean field. If the menu entry action is an act_window action, and if this action is related to a model that uses the need_action mechanism, this field is set to true. Otherwise, it is false.
- ``needaction_uid_ctr``: integer field. If the target model uses the need action mechanism, this field gives the number of actions the current user has to perform.
- ``needaction_record_ids``: many2many field. If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action.
- **REMOVED** ``needaction_record_ids``: many2many field. If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action. **This field has been removed on version XXXX**.
Those fields are functional, because they depend on the user and must therefore be computed at every refresh, each time menus are displayed. The use of the need action mechanism is done by taking into account the action domain in order to display accurate results. When computing the value of the functional fields, the ids of records asking the user to perform an action is concatenated to the action domain. A counting search is then performed on the model, giving back the number of action the users has to perform, limited to the domain of the action.
Addon implementation example
++++++++++++++++++++++++++++
In your ``foo`` module, you want to specify that when it is in state ``confirmed``, it has to be validated by a manager, given by the field ``manager_id``. After making ``foo`` inheriting from ``base.needaction``, you override the ``get_needaction_user_ids`` method:
In your ``foo`` module, you want to specify that when it is in state ``confirmed``, it has to be validated by a manager, given by the field ``manager_id``. After making ``foo`` inheriting from ``ir.needaction_mixin``, you override the ``get_needaction_user_ids`` method:
::
[...]
_inherit = [base.needaction]
_inherit = [`ir.needaction_mixin]
[...]
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = dict.fromkeys(ids)

2
openerp/addons/base/base.sql
View File

@ -59,7 +59,7 @@ ALTER TABLE ir_model_fields ADD column serialization_field_id int references ir_
CREATE TABLE ir_actions (
id serial NOT NULL,
name varchar(64) DEFAULT ''::varchar NOT NULL,
"type" varchar(32) DEFAULT 'window'::varchar NOT NULL,
"type" varchar(32) NOT NULL,
usage varchar(32) DEFAULT null,
primary key(id)
);

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

@ -1,36 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem icon="terp-administration" id="menu_administration"
name="Settings" sequence="50"
web_icon="data/administration.png"
web_icon_hover="data/administration-hover.png"/>
<menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
<menuitem id="menu_custom" name="Customization"
parent="base.menu_administration" sequence="6"
groups="base.group_extended"/>
<menuitem id="next_id_4" name="Low Level Objects"
parent="base.menu_custom" sequence="30"/>
<menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
<menuitem id="menu_custom_action" name="Actions" parent="base.menu_custom" groups="base.group_extended" sequence="20"/>
<menuitem id="menu_config" name="Configuration" parent="base.menu_administration" sequence="1"/>
<menuitem id="menu_translation" name="Translations" parent="base.menu_administration" sequence="6"/>
<menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4" groups="base.group_extended"/>
<menuitem id="menu_translation_export" name="Import / Export"
groups="base.group_extended" parent="base.menu_translation" sequence="3"/>
<menuitem id="menu_users" name="Users" parent="base.menu_administration" sequence="4"/>
<menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="5"
groups="base.group_extended"/>
<menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="0"/>
<menuitem id="reporting_menu"
parent="base.menu_custom" name="Reporting" sequence="30"
/>
<menuitem id="base.menu_reporting" name="Reporting" sequence="45"/>
<menuitem id="base.menu_reporting_dashboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
<menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50" groups="base.group_system"/>
<menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100" groups="base.group_system"/>
<menuitem id="menu_reporting" name="Reporting" sequence="90"/>
<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="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"/>
<menuitem id="menu_low_workflow" name="Workflows" parent="next_id_4"/>
<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="base.group_no_one"/>
<menuitem id="menu_translation_export" name="Import / Export" groups="base.group_no_one" parent="menu_translation" sequence="3"/>
</data>
</openerp>

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

@ -1,18 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--
======================
Languages
======================
-->
<menuitem id="next_id_2" name="User Interface" parent="base.menu_custom" groups="base.group_extended"/>
<!--
======================
Groups
======================
-->
<!-- res.groups -->
<record id="view_groups_form" model="ir.ui.view">
<field name="name">res.groups.form</field>
<field name="model">res.groups</field>
@ -87,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"/>
@ -132,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"/>
@ -142,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"/>
@ -231,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">
@ -257,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"/>
@ -266,13 +254,13 @@
<button name="%(preview_report)d" string="Preview Header" 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"/>
@ -283,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>

228
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-16 18:23+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-17 04:51+0000\n"
"X-Generator: Launchpad (build 15099)\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"
@ -193,7 +193,7 @@ msgstr "販売分析の配布"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_process
msgid "Process"
msgstr ""
msgstr "プロセス"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
@ -492,7 +492,7 @@ msgstr "PADの仕様"
msgid ""
"The user this filter is available to. When left empty the filter is usable "
"by the system only."
msgstr ""
msgstr "このフィルタを使用可能であるユーザ。フィルタを空のままにすると、システムのみが使用します。"
#. module: base
#: help:res.partner,website:0
@ -596,7 +596,7 @@ msgstr "スペイン語（ベネズエラ）/ Español (VE)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
msgid "Invoice on Timesheets"
msgstr "タイムシートによる請求書"
msgstr "勤務表による請求書"
#. module: base
#: view:base.module.upgrade:0
@ -632,6 +632,22 @@ msgid ""
" Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
"\n"
msgstr ""
"\n"
"未払いの請求書のために多レベルで思い起こさせるための手紙の自動化モジュールです。\n"
"==========================================================================\n"
"\n"
"メニューから思い出させるための多くのレベルが定義できます：\n"
"　　会計 / 設定 / その他 / フォローアップ\n"
"\n"
"定義を終えたら、メニューから単純にクリックするだけで毎日自動的に印刷ができます：\n"
"　　会計 / 定期処理 / 請求書 / フォローアップの送信\n"
"\n"
"定義された異なったレベルで思い出させる方法に従って全ての手紙をPDFで作成します。\n"
"異なる会社のために異なるポリシーを定義でき、顧客にメールすることもできます。\n"
"\n"
"所定のパートナ / アカウントエントリーのためにフォローアップレベルをチェックしたい場合は、このメニューを使うことができます：\n"
"　　会計 / レポート / 一般的なレポート / パートナ / フォローアップ送信済\n"
"\n"
#. module: base
#: field:res.country,name:0
@ -661,7 +677,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.pw
msgid "Palau"
msgstr ""
msgstr "パラオ"
#. module: base
#: view:res.partner:0
@ -689,7 +705,7 @@ msgstr "ウィザード"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
msgid "Miscellaneous Suppliers"
msgstr ""
msgstr "その他仕入先"
#. module: base
#: code:addons/base/ir/ir_model.py:287
@ -715,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
@ -763,7 +779,7 @@ msgstr "エリトリア"
#. module: base
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr "会社名は固有でなければなりません。"
msgstr "会社名は固有でなければいけません。"
#. module: base
#: view:res.config:0
@ -859,7 +875,7 @@ msgstr "言語のインポート"
#. module: base
#: help:ir.cron,interval_number:0
msgid "Repeat every x."
msgstr ""
msgstr "全ての x で繰り返す"
#. module: base
#: selection:base.language.install,lang:0
@ -928,7 +944,7 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_4
msgid "Basic Partner"
msgstr ""
msgstr "基本的なパートナ"
#. module: base
#: report:ir.module.reference.graph:0
@ -1187,13 +1203,13 @@ msgstr ""
"==============================================\n"
"\n"
"このモジュールは分析的な会計を基本として、以下の機能が統合されています。\n"
"　・ タイムシートの割り当て\n"
"　・ 勤務表の割り当て\n"
"　・ 休日管理\n"
"　・ プロジェクト管理\n"
"\n"
"各部門のマネジャは、チームの誰かが計画上妥当性を考慮中の未割り当ての時間があるか、タスクの割り当てを必要としている誰かがいるのかを知ることができます。\n"
"\n"
"月末に計画マネジャは、割り当てられたタイムシートがそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
"月末に計画マネジャは、割り当てられた勤務表がそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
#. module: base
#: selection:ir.property,type:0
@ -1297,7 +1313,7 @@ msgstr "アクションURL"
#. module: base
#: field:base.module.import,module_name:0
msgid "Module Name"
msgstr ""
msgstr "モジュール名"
#. module: base
#: model:res.country,name:base.mh
@ -1331,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
@ -1384,6 +1400,8 @@ msgid ""
"use the accounting application of OpenERP, journals and accounts will be "
"created automatically based on these data."
msgstr ""
"あなたの会社の銀行口座を設定し、レポートのフッターに現れるべきそれを選択して下さい。リストビューから銀行口座の並べ替えができます。OpenERPの会計アプ"
"リケーションを使う場合は、仕訳帳とアカウントはそれらのデータを元に自動的に作成されます。"
#. module: base
#: view:ir.module.module:0
@ -1604,7 +1622,7 @@ msgstr "ログイン"
#: model:ir.actions.act_window,name:base.action_wizard_update_translations
#: model:ir.ui.menu,name:base.menu_wizard_update_translations
msgid "Synchronize Terms"
msgstr ""
msgstr "用語の同期"
#. module: base
#: view:ir.actions.server:0
@ -1847,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"
@ -2224,7 +2242,7 @@ msgstr "表示モード"
msgid ""
"Display this bank account on the footer of printed documents like invoices "
"and sales orders."
msgstr ""
msgstr "請求書や受注オーダーのような印刷されるドキュメントのフッターに現れる銀行口座を示して下さい。"
#. module: base
#: view:base.language.import:0
@ -2296,7 +2314,7 @@ msgstr ""
" ・ 配達がトラックなのかUPSなのかの仕訳\n"
"\n"
"仕訳帳にはそうした責任があり、そして異なる状態に進展します：\n"
" ・ ドラフト、オープン、キャンセル、完了\n"
" ・ ドラフト、オープン、キャンセル、終了\n"
"\n"
"バッチ操作は一度に全ての受注の確認、検証、請求書集荷といった異なる仕訳帳を処理できます。\n"
"\n"
@ -2353,7 +2371,7 @@ msgstr ""
" ・ 従業員へ請求書に基づく支払い\n"
"\n"
"このモジュールは分析会計も使うとともに、プロジェクトによる作業の場合は、顧客の出費の\n"
"再請求書を自動的に作成するタイムシート上の請求書と互換性があります。\n"
"再請求書を自動的に作成する勤務表上の請求書と互換性があります。\n"
" "
#. module: base
@ -2457,7 +2475,7 @@ msgstr "ベリーズ"
#. module: base
#: help:ir.actions.report.xml,header:0
msgid "Add or not the corporate RML header"
msgstr ""
msgstr "会社のRMLヘッダーを追加するか否か"
#. module: base
#: model:ir.module.module,description:base.module_hr_recruitment
@ -2560,6 +2578,14 @@ msgid ""
"and categorize your interventions with a channel and a priority level.\n"
" "
msgstr ""
"\n"
"Helpdesk\n"
"====================\n"
"\n"
"ライクレコード、クレーム処理、ヘルプデスク、サポートは仲裁の追跡のために良いツールです。\n"
"このメニューは口頭コミュニケーションよりも適しており、必ずしもクレームとは関係がありません。\n"
"顧客を選択し、注記を加えそしてチャンネルと優先度レベルとともに仲裁を分類して下さい。\n"
" "
#. module: base
#: sql_constraint:ir.ui.view_sc:0
@ -2650,7 +2676,7 @@ msgstr "オブジェクト名は x_ で始める必要があり、特殊文字
#. module: base
#: field:ir.actions.configuration.wizard,note:0
msgid "Next Wizard"
msgstr ""
msgstr "次のウィザード"
#. module: base
#: model:ir.actions.act_window,name:base.action_menu_admin
@ -2830,7 +2856,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.tt
msgid "Trinidad and Tobago"
msgstr ""
msgstr "トリニダード・トバゴ"
#. module: base
#: model:res.country,name:base.lv
@ -2900,7 +2926,7 @@ msgstr "継承"
#. module: base
#: field:ir.model.fields,serialization_field_id:0
msgid "Serialization Field"
msgstr ""
msgstr "シリアライズ項目"
#. module: base
#: model:ir.module.category,description:base.module_category_report_designer
@ -2918,7 +2944,7 @@ msgstr "%y - ２桁の年[00,99]."
#: code:addons/base/res/res_company.py:155
#, python-format
msgid "Fax: "
msgstr ""
msgstr "FAX： "
#. module: base
#: model:res.country,name:base.si
@ -3235,7 +3261,7 @@ msgstr "繰り返しの設定"
#. module: base
#: selection:publisher_warranty.contract,state:0
msgid "Canceled"
msgstr "キャンセル済み"
msgstr "キャンセル済"
#. module: base
#: model:res.country,name:base.at
@ -3245,7 +3271,7 @@ msgstr "オーストリア"
#. module: base
#: view:ir.module.module:0
msgid "Cancel Install"
msgstr ""
msgstr "インストールのキャンセル"
#. module: base
#: model:ir.module.module,description:base.module_l10n_be_invoice_bba
@ -3339,7 +3365,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_ir_module_module_dependency
msgid "Module dependency"
msgstr ""
msgstr "モジュール依存度"
#. module: base
#: selection:publisher_warranty.contract.wizard,state:0
@ -3438,7 +3464,7 @@ msgstr "式表現を使う場合は、可変的な'object'によるPython表現
#. module: base
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr "エラー！再帰的な関係となる会社を作ることはできません。"
msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
#. module: base
#: model:ir.actions.act_window,name:base.action_res_users
@ -3606,7 +3632,7 @@ msgstr ""
"------------------\n"
" ・ オーダー時に請求（発送前または発送後）\n"
" ・ 配達時に請求\n"
" ・ タイムシートによる請求\n"
" ・ 勤務表による請求\n"
" ・ 前請求\n"
"\n"
"パートナの選択：\n"
@ -3624,7 +3650,7 @@ msgstr ""
" ・ 複数の小包\n"
" ・ 配送コスト\n"
"\n"
"セールス管理のダッシュボードに含むもの：\n"
"受注管理のダッシュボードに含むもの：\n"
"------------------------------------------\n"
" ・ 見積り\n"
" ・ 月別受注\n"
@ -5165,7 +5191,7 @@ msgstr "アブハジア語 / аҧсуа"
#. module: base
#: view:base.module.configuration:0
msgid "System Configuration Done"
msgstr "システム設定完了"
msgstr "システム設定終了"
#. module: base
#: code:addons/orm.py:1459
@ -5404,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
@ -5572,7 +5598,7 @@ msgid ""
"revenue\n"
"reports, etc."
msgstr ""
"経費、タイムシート入力などから請求書を作成します。\n"
"経費、勤務表入力などから請求書を作成します。\n"
"コスト（人的資源、経費など）に基づく請求書を作成するためのモジュールです。========================================"
"====================================\n"
"\n"
@ -6154,23 +6180,23 @@ msgstr ""
" ・ 全てのトランザクションコード、構造化された形式の通信の解析とロギング\n"
" ・ CODA構成パラメータを通した自動金融仕訳帳割り当て\n"
" ・ 銀行口座番号ごとの複数仕訳帳のサポート\n"
" ・ １つのCODAファイル中の異なった銀行口座の複数の口座明細をサポート\n"
" ・ １つのCODAファイル中の異なった銀行口座の複数の口座取引明細書をサポート\n"
" ・ CODA銀行口座の構文解析のみをサポート（CODA銀行口座設定でtype='info'と定義された）\n"
" ・ 多言語CODA解析、イギリス、オランダ、フランスのために与えられた解析設定データ\n"
"\n"
" 機械で読み込み可能なCODAファイルはCODA銀行明細の中に人間が読むことのできる形式に解析され保存されます。\n"
" また、銀行明細はCODA情報のサブセットを含むように生成されます（これらのトランザクション行は金融会計レコード\n"
" 機械で読み込み可能なCODAファイルはCODA銀行取引明細書の中に人間が読むことのできる形式に解析され保存されます。\n"
" また、銀行取引明細書はCODA情報のサブセットを含むように生成されます（これらのトランザクション行は金融会計レコード\n"
" 生成のためだけに要求されます）。\n"
" CODA銀行明細は読み込み専用オブジェクトです。銀行明細が会計ビジネス処理の要求によって\n"
" CODA銀行取引明細書は読み込み専用オブジェクトです。銀行取引明細書が会計ビジネス処理の要求によって\n"
" 更新されるのに対して、オリジナルのCODAファイルは信頼できるものとして残されます。\n"
"\n"
" タイプが'Info'として設定されたCODA銀行口座は、CODA銀行明細を作るだけです。\n"
" タイプが'Info'として設定されたCODA銀行口座は、CODA銀行取引明細書を作るだけです。\n"
"\n"
" CODA処理の中の１つのオブジェクトの除去は結果として関連付けられたオブジェクトを除去します。\n"
" 複数銀行明細を含むCODAファイルの除去は同じくそれらの関連する明細を除去します。\n"
" 複数銀行取引明細書を含むCODAファイルの除去は同じくそれらの関連する取引明細書を除去します。\n"
"\n"
" 次の調停のロジックはCODA処理の中に実装されています:\n"
" 1) CODA明細の会社の銀行口座番号は、会社のCODA銀行口座設定レコード（銀行口座のタイプ\n"
" 1) CODA取引明細書の会社の銀行口座番号は、会社のCODA銀行口座設定レコード（銀行口座のタイプ\n"
" が’info’と定義された設定レコードは無視されます）の銀行口座番号項目を基準に判断されます。\n"
" '内部転送'トランザクションはCODAファイルインポートウィザードの’内部転送口座’項目を使って生成されます。\n"
" 2) 第２ステップとしてCODAトランザクション行の’構造化通信’項目は内部あるいは外部への請求書\n"
@ -6180,7 +6206,7 @@ msgstr ""
" 4) 上記のステップが成功しないケースは、さらに手作業による処理を行うために、CODAファイルインポート\n"
" ウィザードの’認識できない移動のためのデフォルト口座’項目を使ってトランザクションは生成されます。\n"
"\n"
" 生成された銀行明細の手作業による調整の代わりに、不十分な自動的な認識情報であったOpenERPデータ\n"
" 生成された銀行取引明細書の手作業による調整の代わりに、不十分な自動的な認識情報であったOpenERPデータ\n"
" ベースを更新した後のCODAを再度インポートすることもできます。\n"
"\n"
" CODA V1 サポートの注意事項:\n"
@ -6255,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"
@ -6271,7 +6297,7 @@ msgstr ""
#. module: base
#: help:res.country.state,code:0
msgid "The state code in three chars.\n"
msgstr ""
msgstr "３文字の状態コード\n"
#. module: base
#: model:res.country,name:base.sj
@ -6294,7 +6320,7 @@ msgstr "基本かんばん"
#: view:ir.actions.server:0
#: view:res.request:0
msgid "Group By"
msgstr ""
msgstr "グループ化"
#. module: base
#: view:res.config:0
@ -6343,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
@ -6947,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
@ -7003,7 +7029,7 @@ msgstr ""
"============================================================================="
"=======================\n"
"\n"
"ユーザが自身のタイムシートをエンコードするときに主に利用されます： \n"
"ユーザが自身の勤務表をエンコードするときに主に利用されます： \n"
"値が引き出され、それらの項目は自動的に埋められます。しかし、変更の可能性のためにそれらの値は利用可能です。\n"
"\n"
"明確に現在のアカウントに何も記録されていない場合は、このモジュールは古い設定と完全に互換性を持つために、\n"
@ -7136,7 +7162,7 @@ msgstr "モジュール"
#: field:workflow.activity,subflow_id:0
#: field:workflow.workitem,subflow_id:0
msgid "Subflow"
msgstr ""
msgstr "サブフロー"
#. module: base
#: model:ir.model,name:base.model_res_config
@ -7358,7 +7384,7 @@ msgstr "ソース用語"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
msgid "Timesheets Validation"
msgstr "タイムシートの検証"
msgstr "勤務表の検証"
#. module: base
#: model:ir.ui.menu,name:base.menu_main_pm
@ -7428,7 +7454,7 @@ msgstr "保守契約"
#: model:res.groups,name:base.group_user
#: field:res.partner,employee:0
msgid "Employee"
msgstr ""
msgstr "従業員"
#. module: base
#: field:ir.model.access,perm_create:0
@ -7727,7 +7753,7 @@ msgstr "エクアドル - 会計"
#. module: base
#: field:res.partner.category,name:0
msgid "Category Name"
msgstr ""
msgstr "分類名"
#. module: base
#: view:res.widget:0
@ -8594,7 +8620,7 @@ msgid ""
msgstr ""
"\n"
"\n"
"このアドオンは既にシステムにインストール済みです。"
"このアドオンは既にシステムにインストール済です。"
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@ -8865,7 +8891,7 @@ msgstr "親分類"
#. module: base
#: selection:ir.property,type:0
msgid "Integer Big"
msgstr ""
msgstr "大きな整数"
#. module: base
#: selection:res.partner.address,type:0
@ -10510,25 +10536,25 @@ msgid ""
" "
msgstr ""
"\n"
"このモジュールはタイムシートと出勤のエンコードと検証を同じビューの中で簡易にできるように手助けします。\n"
"このモジュールは勤務表と出勤のエンコードと検証を同じビューの中で簡易にできるように手助けします。\n"
"============================================================================="
"======================\n"
"\n"
"ビューの上部は出勤と追跡（Sign In / Sign Out）イベントのためにあります。\n"
"ビューの下部はタイムシートのためにあります。\n"
"ビューの下部は勤務表のためにあります。\n"
"\n"
"その他のタブはあなたの時間やあなたのチームの時間を分析を手助けする統計的なビューが含まれています：\n"
"・ 日別の勤務時間（出勤を含む）\n"
"・ プロジェクト別の勤務時間\n"
"\n"
"このモジュールは完全なタイムシートの検証プロセスも実装されています：\n"
"このモジュールは完全な勤務表の検証プロセスも実装されています：\n"
"・ ドラフトシート\n"
"・ 従業員による期間の終わりの確認\n"
"・ プロジェクトマネジャによる検証\n"
"\n"
"検証は会社に対して構成されます：\n"
"・ 期間のサイズ（日、週、月、年）\n"
"・ タイムシートと出勤の間の最大の相違\n"
"・ 勤務表と出勤の間の最大の相違\n"
" "
#. module: base
@ -10668,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
@ -10761,7 +10787,7 @@ msgstr "会社"
#. module: base
#: help:res.currency,symbol:0
msgid "Currency sign, to be used when printing amounts."
msgstr ""
msgstr "通貨記号：印刷時に使用される"
#. module: base
#: view:res.lang:0
@ -10937,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
@ -10979,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
@ -11080,7 +11106,7 @@ msgstr "ガイアナ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_expiry
msgid "Products Expiry Date"
msgstr ""
msgstr "製品の有効期限"
#. module: base
#: model:ir.module.module,description:base.module_account
@ -11114,6 +11140,32 @@ msgid ""
"module named account_voucher.\n"
" "
msgstr ""
"\n"
"会計と財務管理\n"
"====================================\n"
"\n"
"財務と会計モジュールは次をカバーします：\n"
"--------------------------------------------\n"
"一般的な会計\n"
"コスト / 分析会計\n"
"サードパーティ会計\n"
"\n"
"税金管理\n"
"予算\n"
"顧客と仕入先請求書\n"
"銀行取引明細書\n"
"パートナによる調整処理\n"
"\n"
"会計士のための次のものを含むダッシュボードを作成して下さい：\n"
"--------------------------------------------------\n"
"・承認すべき顧客請求書のリスト\n"
"・ 会社分析\n"
"・ 売掛金年齢表\n"
"・ 金庫のグラフ\n"
"\n"
"総勘定元帳を維持するような処理が、特定の会計年度のため、そしてaccount_voucherというモジュールによる証書の準備のための定義された財務仕訳帳（"
"エントリー移動行または仕訳帳を通して維持されたグループ化）を通して実行されます。\n"
" "
#. module: base
#: help:ir.actions.act_window,view_type:0
@ -11350,7 +11402,7 @@ msgstr ""
#: field:res.partner,comment:0
#: model:res.widget,title:base.note_widget
msgid "Notes"
msgstr "注釈"
msgstr "注記"
#. module: base
#: field:ir.config_parameter,value:0
@ -11413,7 +11465,7 @@ msgstr "もし指定した場合は、このアクションは標準メニュー
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_map
msgid "Google Maps on Customers"
msgstr ""
msgstr "顧客のGoogle Maps"
#. module: base
#: model:ir.actions.report.xml,name:base.preview_report
@ -11449,7 +11501,7 @@ msgstr ""
"============================================================================="
"=================================\n"
"\n"
"これは主にユーザが自身のタイムシートをエンコードする時に使用されています：\n"
"これは主にユーザが自身の勤務表をエンコードする時に使用されています：\n"
"値は取り出され、そして項目は自動的に埋められます。しかし、これらの値の変更は可能です。\n"
"\n"
"現在のアカウントに何のデータも記録されていないことが明らかな場合は、このモジュールは古い構成と完全に互換性があるためアカウントデータによるデフォルト値がい"
@ -11933,7 +11985,7 @@ msgstr "その他のアクション"
#. module: base
#: selection:ir.actions.todo,state:0
msgid "Done"
msgstr "完了"
msgstr "終了"
#. module: base
#: help:ir.cron,doall:0
@ -12090,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
@ -12178,7 +12230,7 @@ msgstr ""
"============================================================================="
"========================================\n"
"\n"
"１つの明細書のIBAN口座から正確に表現されたローカル口座を抜き抜く能力\n"
"１つの取引明細書のIBAN口座から正確に表現されたローカル口座を抜き抜く能力\n"
" "
#. module: base
@ -12752,7 +12804,7 @@ msgstr "アラビア語 / الْعَرَبيّة"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_hello
msgid "Hello"
msgstr ""
msgstr "こんにちは"
#. module: base
#: view:ir.actions.configuration.wizard:0
@ -13508,7 +13560,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_analytic_plans
msgid "Multiple Analytic Plans"
msgstr ""
msgstr "多数の分析プラン"
#. module: base
#: model:ir.module.module,description:base.module_project_timesheet
@ -13674,7 +13726,7 @@ msgstr "ユーザの参照"
#: code:addons/base/res/res_users.py:118
#, python-format
msgid "Warning !"
msgstr "警告!"
msgstr "警告"
#. module: base
#: model:res.widget,title:base.google_maps_widget
@ -13877,7 +13929,7 @@ msgstr "Trueにセットする場合、ウィザードはフォームビュー
#. module: base
#: view:base.language.import:0
msgid "- type,name,res_id,src,value"
msgstr ""
msgstr "- タイプ、名前、リソースID、ソース、値"
#. module: base
#: model:res.country,name:base.hm
@ -13929,7 +13981,7 @@ msgstr ""
"============================================================================="
"================================\n"
"\n"
"状態：ドラフト、確認、完了、キャンセル\n"
"状態：ドラフト、確認、終了、キャンセル\n"
"終了する、確認する、キャンセルする時に、製造オーダーは全ての状態行を状態に応じて設定する。\n"
"\n"
"メニューの作成：\n"
@ -13939,7 +13991,7 @@ msgstr ""
"\n"
"ワークセンタタブの下に製造オーダーのフォームビューにボタンを追加して下さい：\n"
"　・ 開始（確認状態に設定）、開始日付の設定\n"
"　・ 完了（完了状態に設定）、中止日付の設定\n"
"　・ 終了（終了状態に設定）、中止日付の設定\n"
"　・ ドラフトに設定（ドラフト状態に設定）\n"
"　・ キャンセル（キャンセル状態に設定）\n"
"\n"
@ -14545,7 +14597,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_project_management_time_tracking
msgid "Time Tracking"
msgstr "追跡時間"
msgstr "時間記録"
#. module: base
#: view:res.partner.category:0
@ -15133,7 +15185,7 @@ msgstr ""
"・ 多数の支払いタイプのためにDTAの作成\n"
"・ BVR管理（番号生成、レポート他）\n"
"・ 銀行ファイルからインポート口座の移動（v11 他）\n"
"・ 調和のために銀行明細書を扱う方法の簡素化\n"
"・ 調和のために銀行取引明細書を扱う方法の簡素化\n"
"\n"
"次のZIPと銀行の不足項目の追加ができます：\n"
"・ l10n_ch_zip\n"
@ -16156,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
@ -17056,7 +17108,7 @@ msgid ""
" "
msgstr ""
"\n"
"このモジュールはタイムシートシステムを実装します。\n"
"このモジュールは勤務表システムを実装します。\n"
"==========================================\n"
"\n"
"それぞれの従業員は異なったプロジェクトに費やした時間のエンコードと追跡ができます。\n"
@ -17085,7 +17137,7 @@ msgstr "クック諸島"
#. module: base
#: field:ir.model.data,noupdate:0
msgid "Non Updatable"
msgstr ""
msgstr "更新可能でない"
#. module: base
#: selection:base.language.install,lang:0
@ -17191,7 +17243,7 @@ msgstr "国"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_messages
msgid "In-Project Messaging System"
msgstr ""
msgstr "プロジェクト内部のメッセージングシステム"
#. module: base
#: model:res.country,name:base.pn

10
openerp/addons/base/i18n/mn.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2011-09-30 21:29+0000\n"
"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
"PO-Revision-Date: 2012-04-20 10:05+0000\n"
"Last-Translator: Bayuka <bayuka1988@gmail.com>\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-03-10 04:50+0000\n"
"X-Generator: Launchpad (build 14914)\n"
"X-Launchpad-Export-Date: 2012-04-21 05:00+0000\n"
"X-Generator: Launchpad (build 15120)\n"
#. module: base
#: model:res.country,name:base.sh
@ -88,7 +88,7 @@ msgstr "Ажлын урсгал"
#. module: base
#: selection:ir.sequence,implementation:0
msgid "No gap"
msgstr ""
msgstr "Зөрүүгүй"
#. module: base
#: selection:base.language.install,lang:0

85
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>
@ -662,9 +662,9 @@
<menuitem action="ir_action_wizard" id="menu_ir_action_wizard" parent="base.next_id_6"/>
<!-- Needaction mechanism -->
<record model="ir.ui.view" id="view_ir_needaction_users_tree">
<field name="name">ir.needaction_users.tree</field>
<field name="model">ir.needaction_users</field>
<record model="ir.ui.view" id="view_ir_needaction_users_rel_tree">
<field name="name">ir.needaction_users_rel.tree</field>
<field name="model">ir.needaction_users_rel</field>
<field name="type">tree</field>
<field name="sequence">10</field>
<field name="arch" type="xml">
@ -676,14 +676,14 @@
</field>
</record>
<record id="action_view_needaction_users" model="ir.actions.act_window">
<record id="action_view_needaction_users_rel" model="ir.actions.act_window">
<field name="name">Need action relationships</field>
<field name="res_model">ir.needaction_users</field>
<field name="res_model">ir.needaction_users_rel</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_needaction_users" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users" groups="base.group_no_one"/>
<menuitem id="menu_needaction_users_rel" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users_rel" groups="base.group_no_one"/>
<!-- Companies -->
<menuitem id="menu_res_company_global"
@ -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">
@ -893,7 +893,7 @@
<field name="res_model">ir.ui.view.custom</field>
<field name="help">Customized views are used when users reorganize the content of their dashboard views (via web client)</field>
</record>
<menuitem action="action_ui_view_custom" id="menu_action_ui_view_custom" parent="base.next_id_4"/>
<menuitem id="menu_action_ui_view_custom" action="action_ui_view_custom" parent="base.next_id_2"/>
<!-- Attachment -->
@ -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">
@ -1479,11 +1479,8 @@
</record>
<menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/>
<!--
=============================================================
Cron Jobs
=============================================================
-->
<!-- ir.cron -->
<record id="ir_cron_view_tree" model="ir.ui.view">
<field name="name">ir.cron.tree</field>
<field name="model">ir.cron</field>
@ -1520,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"/>
@ -1574,9 +1571,10 @@
<field name="view_id" ref="ir_cron_view_tree"/>
</record>
<menuitem id="next_id_10" name="Scheduler" parent="base.menu_config" groups="base.group_extended" sequence="23"/>
<menuitem action="ir_cron_act" id="menu_ir_cron_act" parent="next_id_10"/>
<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 -->
<record id="ir_access_view_tree" model="ir.ui.view">
<field name="name">ir.model.access.tree</field>
@ -1633,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>
@ -1878,6 +1876,8 @@
</record>
<menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
<!-- ir.actions.todo -->
<record id="ir_actions_todo_tree" model="ir.ui.view">
<field name="model">ir.actions.todo</field>
<field name="name">Config Wizard Steps</field>
@ -1950,13 +1950,8 @@
<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="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="20"
groups="base.group_extended"/>
<menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
parent="next_id_11" sequence="20"/>
<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">
<field name='name'>AutoVacuum osv_memory objects</field>
@ -1969,7 +1964,9 @@
<field name="function">power_on</field>
<field name="args">()</field>
</record>
<!-- ir.actions.todo category -->
<record id="ir_actions_todo_category_form" model="ir.ui.view">
<field name="name">ir.actions.todo.category.form</field>
<field name="model">ir.actions.todo.category</field>
@ -1982,7 +1979,7 @@
</form>
</field>
</record>
<record id="ir_actions_todo_category_tree" model="ir.ui.view">
<field name="name">ir.actions.todo.category.tree</field>
<field name="model">ir.actions.todo.category</field>
@ -1998,12 +1995,12 @@
<record id="category_sales_management_config" model="ir.actions.todo.category">
<field name="name">Sales Management</field>
<field name="sequence">5</field>
</record>
</record>
<record id="category_tools_customization_config" model="ir.actions.todo.category">
<field name="name">Tools / Customization</field>
<field name="sequence">5</field>
</record>
</record>
<!-- ir.mail.server -->
<record model="ir.ui.view" id="ir_mail_server_form">
@ -2020,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"/>
@ -2070,8 +2067,6 @@
<field name="view_id" ref="ir_mail_server_list" />
<field name="search_view_id" ref="view_ir_mail_server_search"/>
</record>
<menuitem id="menu_email" name="Email" parent="base.menu_config" sequence="22"/>
<menuitem id="menu_mail_servers" parent="menu_email" action="action_ir_mail_server_list" sequence="15" groups="base.group_no_one"/>
</data>

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>

102
openerp/addons/base/ir/ir_needaction.py
View File

@ -24,17 +24,18 @@ from operator import itemgetter
from osv import osv, fields
from tools.translate import _
class ir_needaction_users(osv.osv):
class ir_needaction_users_rel(osv.osv):
'''
ir_needaction_users holds data related to the needaction
mechanism inside OpenERP. A needaction is characterized by:
ir_needaction_users_rel holds data related to the needaction
mechanism inside OpenERP. A row in this model is characterized by:
- res_model: model of the record requiring an action
- res_id: ID of the record requiring an action
- user_id: foreign key to the res.users table, to the user that
has to perform the action
'''
This model can be seen as a many2many, linking (res_model, res_id) to
users (those whose attention is required on the record).'''
_name = 'ir.needaction_users'
_name = 'ir.needaction_users_rel'
_description = 'Needaction relationship table'
_rec_name = 'id'
_order = 'id desc'
@ -49,15 +50,11 @@ class ir_needaction_users(osv.osv):
def _get_users(self, cr, uid, res_ids, res_model, context=None):
"""Given res_ids of res_model, get user_ids present in table"""
if context is None:
context = {}
needact_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
return map(itemgetter('res_id'), self.read(cr, uid, needact_ids, context=context))
rel_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
return list(set(map(itemgetter('user_id'), self.read(cr, uid, rel_ids, ['user_id'], context=context))))
def create_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
"""Given res_ids of res_model, add user_ids to the relationship table"""
if context is None:
context = {}
for res_id in res_ids:
for user_id in user_ids:
self.create(cr, uid, {'res_model': res_model, 'res_id': res_id, 'user_id': user_id}, context=context)
@ -65,8 +62,6 @@ class ir_needaction_users(osv.osv):
def unlink_users(self, cr, uid, res_ids, res_model, context=None):
"""Given res_ids of res_model, delete all entries in the relationship table"""
if context is None:
context = {}
to_del_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
return self.unlink(cr, uid, to_del_ids, context=context)
@ -74,7 +69,7 @@ class ir_needaction_users(osv.osv):
"""Given res_ids of res_model, update their entries in the relationship table to user_ids"""
# read current records
cur_users = self._get_users(cr, uid, res_ids, res_model, context=context)
if len(cur_users) == len(user_ids) and all([cur_user in user_ids for cur_user in cur_users]):
if len(cur_users) == len(user_ids) and all(cur_user in user_ids for cur_user in cur_users):
return True
# unlink old records
self.unlink_users(cr, uid, res_ids, res_model, context=context)
@ -92,13 +87,13 @@ class ir_needaction_mixin(osv.osv):
validation by a manager, this mechanism allows to set a list of
users asked to perform an action.
This class wraps a class (ir.needaction_users) that behaves
This class wraps a class (ir.ir_needaction_users_rel) that behaves
like a many2many field. However, no field is added to the model
inheriting from base.needaction. The mixin class manages the low-level
inheriting from this mixin class. This class handles the low-level
considerations of updating relationships. Every change made on the
record calls a method that updates the relationships.
Objects using the need_action feature should override the
Objects using the 'need_action' feature should override the
``get_needaction_user_ids`` method. This methods returns a dictionary
whose keys are record ids, and values a list of user ids, like
in a many2many relationship. Therefore by defining only one method,
@ -116,9 +111,32 @@ class ir_needaction_mixin(osv.osv):
- ``needaction_get_user_record_references``: for a given uid, get all
the records that ask this user to perform an action. Records
are given as references, a list of tuples (model_name, record_id)
'''
The ``ir_needaction_mixin`` class adds a function field on models inheriting
from the class. This field allows to state whether a given record has
a needaction for the current user. This is usefull if you want to customize
views according to the needaction feature. For example, you may want to
set records in bold in a list view if the current user has an action to
perform on the record. This makes the class not a pure abstract class,
but allows to easily use the action information.'''
_name = 'ir.needaction_mixin'
_description = 'Need action of users on records API'
_description = '"Need action" mixin'
def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
res = {}
needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
for id in ids:
res[id] = uid in needaction_user_ids[id]
return res
_columns = {
'needaction_pending': fields.function(get_needaction_pending, type='boolean',
string='Need action pending',
help='If True, this field states that users have to perform an action. \
This field comes from the needaction mechanism. Please refer \
to the ir.needaction_mixin class.'),
}
#------------------------------------------------------
# Addon API
@ -131,68 +149,56 @@ class ir_needaction_mixin(osv.osv):
return dict.fromkeys(ids, [])
def create(self, cr, uid, values, context=None):
if context is None:
context = {}
needact_table_obj = self.pool.get('ir.needaction_users')
rel_obj = self.pool.get('ir.needaction_users_rel')
# perform create
obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
# link user_ids
needaction_user_ids = self.get_needaction_user_ids(cr, uid, [obj_id], context=context)
needact_table_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
rel_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
return obj_id
def write(self, cr, uid, ids, values, context=None):
if context is None:
context = {}
needact_table_obj = self.pool.get('ir.needaction_users')
rel_obj = self.pool.get('ir.needaction_users_rel')
# perform write
write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
# get and update user_ids
needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
for id in ids:
needact_table_obj.update_users(cr, uid, [id], self._name, needaction_user_ids[id], context=context)
rel_obj.update_users(cr, uid, [id], self._name, needaction_user_ids[id], context=context)
return write_res
def unlink(self, cr, uid, ids, context=None):
if context is None:
context = {}
# unlink user_ids
needact_table_obj = self.pool.get('ir.needaction_users')
needact_table_obj.unlink_users(cr, uid, ids, self._name, context=context)
rel_obj = self.pool.get('ir.needaction_users_rel')
rel_obj.unlink_users(cr, uid, ids, self._name, context=context)
# perform unlink
return super(ir_needaction_mixin, self).unlink(cr, uid, ids, context=context)
#------------------------------------------------------
# Need action API
# "Need action" API
#------------------------------------------------------
def needaction_get_record_ids(self, cr, uid, user_id, limit=80, context=None):
"""Given the current model and a user_id
get the number of actions it has to perform"""
if context is None:
context = {}
needact_table_obj = self.pool.get('ir.needaction_users')
needact_table_ids = needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
return map(itemgetter('res_id'), needact_table_obj.read(cr, uid, needact_table_ids, context=context))
return the record ids that require the user to perform an
action"""
rel_obj = self.pool.get('ir.needaction_users_rel')
rel_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
return map(itemgetter('res_id'), rel_obj.read(cr, uid, rel_ids, ['res_id'], context=context))
def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
"""Given the current model and a user_id
get the number of actions it has to perform"""
if context is None:
context = {}
needact_table_obj = self.pool.get('ir.needaction_users')
return needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
rel_obj = self.pool.get('ir.needaction_users_rel')
return rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
def needaction_get_record_references(self, cr, uid, user_id, offset=None, limit=None, order=None, context=None):
"""For a given user_id, get all the records that asks this user to
perform an action. Records are given as references, a list of
tuples (model_name, record_id).
This method is trans-model."""
if context is None:
context = {}
needact_table_obj = self.pool.get('ir.needaction_users')
needact_table_ids = needact_table_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
needact_records = needact_table_obj.read(cr, uid, needact_table_ids, context=context)
return map(itemgetter('res_model', 'id'), needact_records)
rel_obj = self.pool.get('ir.needaction_users_rel')
rel_ids = rel_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
return map(itemgetter('res_model', 'res_id'), rel_obj.read(cr, uid, rel_ids, ['res_model', 'res_id'], context=context))
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

11
openerp/addons/base/ir/ir_ui_menu.py
View File

@ -258,19 +258,15 @@ class ir_ui_menu(osv.osv):
def _get_needaction(self, cr, uid, ids, field_names, args, context=None):
if context is None:
context = {}
res = dict.fromkeys(ids)
res = {}
for menu in self.browse(cr, uid, ids, context=context):
res[menu.id] = {}
if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
menu_needaction_res = self.pool.get(menu.action.res_model).get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
# TODO: find the addon that causes a bug on runbot, not on local
if not isinstance(menu_needaction_res[1], (int, long)): menu_needaction_res[1] = 0
menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
else:
menu_needaction_res = [False, 0, ()]
menu_needaction_res = [False, 0]
res[menu.id]['needaction_enabled'] = menu_needaction_res[0]
res[menu.id]['needaction_counter'] = menu_needaction_res[1]
# not used currently, therefore set to a void list
res[menu.id]['needaction_record_ids'] = []
return res
_columns = {
@ -291,7 +287,6 @@ class ir_ui_menu(osv.osv):
'web_icon_hover_data':fields.function(_get_image_icon, string='Web Icon Image (hover)', type='binary', readonly=True, store=True, multi='icon'),
'needaction_enabled': fields.function(_get_needaction, string='Target model uses the need action mechanism', type='boolean', help='If the menu entry action is an act_window action, and if this action is related to a model that uses the need_action mechanism, this field is set to true. Otherwise, it is false.', multi='_get_needaction'),
'needaction_counter': fields.function(_get_needaction, string='Number of actions the user has to perform', type='integer', help='If the target model uses the need action mechanism, this field gives the number of actions the current user has to perform.', multi='_get_needaction'),
'needaction_record_ids': fields.function(_get_needaction, string='Ids of records requesting an action from the user', type='many2many', help='If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action.', multi='_get_needaction'),
'action': fields.function(_action, fnct_inv=_action_inv,
type='reference', string='Action',
selection=[

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"/>

14
openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"/>
<record id="publisher_warranty_contract_tree_view" model="ir.ui.view">
<field name="name">publisher_warranty.contract.tree</field>
@ -81,12 +82,7 @@
<field name="view_mode">tree,form,calendar</field>
<field name="search_view_id" ref="publisher_warranty_contract_search_view"/>
</record>
<menuitem name="Publisher Warranty" id="publisher_warranty"
parent="base.menu_administration"/>
<menuitem action="action_publisher_warranty_contract_form" id="menu_publisher_warranty_contract"
parent="publisher_warranty" sequence="2"/>
<menuitem id="menu_publisher_warranty_contract" parent="menu_publisher_warranty" action="action_publisher_warranty_contract_form" sequence="2"/>
<record id="publisher_warranty_contract_add_wizard" model="ir.ui.view">
@ -139,11 +135,7 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<menuitem
action="action_publisher_warranty_contract_add_wizard"
id="menu_publisher_warranty_contract_add"
parent="publisher_warranty" sequence="1"/>
<menuitem id="menu_publisher_warranty_contract_add" action="action_publisher_warranty_contract_add_wizard" parent="menu_publisher_warranty" sequence="1"/>
</data>
</openerp>

6
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="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" sequence="24"/>
<menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
<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__'):

1
openerp/addons/base/rng/view.rng
View File

@ -222,6 +222,7 @@
<rng:ref name="overload"/>
<rng:optional><rng:attribute name="string"/></rng:optional>
<rng:optional><rng:attribute name="colors"/></rng:optional>
<rng:optional><rng:attribute name="fonts"/></rng:optional>
<rng:optional>
<rng:attribute name="editable">
<rng:choice>

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>

2
openerp/addons/base/security/ir.model.access.csv
View File

@ -121,6 +121,6 @@
"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
"access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
"access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
"access_ir_needaction_users","ir_needaction_users","model_ir_needaction_users",,1,1,1,1
"access_ir_needaction_users_rel","ir_needaction_users_rel","model_ir_needaction_users_rel",,1,1,1,1
"access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
121 access_ir_mail_server_all ir_mail_server model_ir_mail_server 1 0 0 0
122 access_ir_actions_todo_category ir_actions_todo_category model_ir_actions_todo_category group_system 1 1 1 1
123 access_ir_actions_client ir_actions_client all model_ir_actions_client 1 0 0 0
124 access_ir_needaction_users access_ir_needaction_users_rel ir_needaction_users ir_needaction_users_rel model_ir_needaction_users model_ir_needaction_users_rel 1 1 1 1
125 access_ir_needaction_mixin ir_needaction_mixin model_ir_needaction_mixin 1 1 1 1
126

2
openerp/osv/fields.py
View File

@ -1057,7 +1057,7 @@ class function(_column):
# This is not needed for stored fields and non-functional integer
# fields, as their values are constrained by the database backend
# to the same 32bits signed int limit.
result = float(value)
result = __builtin__.float(value)
return result
def get(self, cr, obj, ids, name, uid=False, context=None, values=None):

10
openerp/osv/orm.py
View File

@ -4866,7 +4866,7 @@ class BaseModel(object):
get_xml_id = get_external_id
_get_xml_ids = _get_external_ids
def get_needaction_info(self, cr, uid, user_id, limit=None, order=None, domain=False, context=None):
def _get_needaction_info(self, cr, uid, user_id, limit=None, order=None, domain=False, context=None):
"""Base method for needaction mechanism
- see ir.needaction for actual implementation
- if the model uses the need action mechanism
@ -4883,16 +4883,18 @@ class BaseModel(object):
:return: [uses_needaction=True/False, needaction_uid_ctr=%d]
"""
if hasattr(self, 'needaction_get_record_ids'):
# Arbitrary limit, but still much lower thant infinity, to avoid
# getting too much data.
ids = self.needaction_get_record_ids(cr, uid, user_id, limit=8192, context=context)
if not ids:
return [True, 0, []]
return [True, 0]
if domain:
new_domain = eval(domain, locals_dict={'uid': user_id}) + [('id', 'in', ids)]
else:
new_domain = [('id', 'in', ids)]
return [True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context), ids]
return [True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context)]
else:
return [False, 0, []]
return [False, 0]
# Transience
def is_transient(self):