diff --git a/doc/index.rst.inc b/doc/index.rst.inc
index 842888aecb2..31ac2494a48 100644
--- a/doc/index.rst.inc
+++ b/doc/index.rst.inc
@@ -6,6 +6,7 @@ OpenERP Server
:maxdepth: 1
import
+ module-versioning
test-framework
Changed in 7.0
@@ -17,4 +18,4 @@ Changed in 7.0
api/user_img_specs
api/need_action_specs
api/font_style
- api/field_level_acl
\ No newline at end of file
+ api/field_level_acl
diff --git a/doc/module-versioning.rst b/doc/module-versioning.rst
new file mode 100644
index 00000000000..7a4c127d6d8
--- /dev/null
+++ b/doc/module-versioning.rst
@@ -0,0 +1,69 @@
+.. _module_versioning:
+
+Module versioning
+=================
+
+OpenERP has been developed with modularity in mind: OpenERP should be flexible
+enough so it can be adopted by any enterprise, of any size and in any market.
+By using modules one can adapt OpenERP in many different ways: from completely
+different business to smaller, company-specific changes.
+
+As modules (and the core framework itself) evolve, it is necessary to identify
+modules by their version so a sensible set of modules can be chosen for a
+particular deployment.
+
+There are two trends re-inforcing each others. Firstly OpenERP s.a. will work
+on a smaller number of official modules and let the community handles more and
+more development. Secondly all those modules will receive greater exposure on
+`OpenERP Apps`_ where each module will be owned by a single author.
+
+The solution advocated by OpenERP is straightforward and aims to avoid the
+`dependency hell`_. In particular we don't want to deal with versioned
+dependencies (i.e. a module depends on a specific version of another module).
+
+For each stable release (e.g. OpenERP 6.1, or OpenERP 7.0) or, said in other
+words, for each major version, there is only one (major) version of each
+module. The minor version is bumped for bug fixes but is otherwise not
+important here.
+
+Making variations on some business needs must be done by creating new modules,
+possibly depending on previously written modules. If depending on a module
+proves too difficult, you can write a new module (not a new _version_). But
+generally Python is flexible enough that depending on the existing module
+should work.
+
+For the next major version, refactoring modules can be done and similar
+functionalities can be brought together in a better module.
+
+.. _`OpenERP Apps`: http://apps.openerp.com/
+
+.. _`dependency hell`: http://en.wikipedia.org/wiki/Dependency_hell
+
+Example
+-------
+
+Whenever a new module is developed or must evolve, the above versioning policy
+should be respected.
+
+A particular concern one can face when deploying OpenERP to multiple customers
+is now detailed as an example to provide a few guidelines. The hypotethical
+situation is as follow. A partner needs to create a new module, called ``M``, for a
+customer. Shortly after (but still within a typical OpenERP release cycle, so
+there is no chance to bump the version number except for bug fixes), ``M`` must be
+adapted for another customer.
+
+The correct way to handle it is to leave ``M`` as it is and create a new module,
+say called ``X``, that depends on ``M`` for the second customer. Both modules have the
+same version (i.e. 6.1 or 7.0, targeting the corresponding OpenERP version).
+
+If leaving ``M`` as it is is not possible (which should be very rare as Python
+is incredibly flexible), the ``X`` module for the new customer can depend on a
+new module ``N``, derived from ``M``. At this point, ``N`` is a new,
+differently named module. It is not a ``M`` module with a increased version
+number. Your goal should be to make ``N`` as close as possible to ``M``, so
+that at the next version of OpenERP, the first customer can switch to ``N``
+instead of ``M`` (or include the changes in a new version of ``M``). At that
+point you are in the ideal situation: you have a module ``N`` for one customer,
+and a module ``X`` depending on N to account for the differences between those
+two customers.
+
diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index f6a8f4f84b5..2d5d9740aea 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -43,12 +43,22 @@ The kernel of OpenERP, needed for all installation.
'res/res_config.xml',
'data/res.country.state.csv',
'ir/wizard/wizard_menu_view.xml',
- 'ir/ir.xml',
- 'ir/ir_translation_view.xml',
- 'ir/ir_filters.xml',
+ 'ir/ir_actions.xml',
+ 'ir/ir_attachment_view.xml',
'ir/ir_config_parameter_view.xml',
- 'ir/workflow/workflow_view.xml',
+ 'ir/ir_cron_view.xml',
+ 'ir/ir_filters.xml',
+ 'ir/ir_mail_server_view.xml',
+ 'ir/ir_model_view.xml',
+ 'ir/ir_rule_view.xml',
+ 'ir/ir_sequence_view.xml',
+ 'ir/ir_translation_view.xml',
+ 'ir/ir_ui_menu_view.xml',
+ 'ir/ir_ui_view_view.xml',
+ 'ir/ir_values_view.xml',
+ 'ir/osv_memory_autovacuum.xml',
'ir/report/ir_report.xml',
+ 'ir/workflow/workflow_view.xml',
'module/module_view.xml',
'module/module_data.xml',
'module/module_report.xml',
diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 6186cb742ec..ebd3bbc9178 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 10c4ef3a73d..39b53936197 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 27aaf0c5a05..74bdf694446 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 180e7fc450e..a8e993c9d2d 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index cb97a8e030b..c9f16a47376 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 138f14299fd..7bb40fc9a61 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 823ff68dda8..1cb4016b6dd 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index f35a33d13a4..29612c9a0be 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
"X-Poedit-Language: Czech\n"
#. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 2a2ed7015c9..91954085a73 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 8b79ca7b746..5e2f55c70a4 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 494dd7644b9..a9a20427187 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index dd91a5c2cd6..4ae7f2fb5b3 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 1f9565339c8..22d1a7100c8 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 81edd41b083..e855282ca1f 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index aedc3181be1..7c54dc867bf 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 636ed963d30..7494ec52b04 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
"Language: \n"
#. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 84617d0a2bc..d7304775587 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index 3e7f975f118..67e9aa9956a 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 9d8b95b83c9..9fe26471d0d 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index cf88512fe08..61ed6fda3ba 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 98f1b514c4b..4ec2a4611ef 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"
@@ -165,7 +165,7 @@ msgstr "پنجره هدف"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
msgid "Sales Analytic Distribution"
-msgstr ""
+msgstr "تحلیل توزیع فروش"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_process
@@ -175,7 +175,7 @@ msgstr "روند"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
msgid "Billing Rates on Contracts"
-msgstr ""
+msgstr "نرخ صورت حساب در قراردادها"
#. module: base
#: code:addons/base/res/res_users.py:558
@@ -195,7 +195,7 @@ msgstr ""
#: code:addons/osv.py:129
#, python-format
msgid "Constraint Error"
-msgstr ""
+msgstr "خطا در محدودیت"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_custom
@@ -286,7 +286,7 @@ msgstr "تعداد پیمانهها"
#. module: base
#: help:multi_company.default,company_dest_id:0
msgid "Company to store the current record"
-msgstr ""
+msgstr "شرکت ذخیره رکورد جاری"
#. module: base
#: field:res.partner.bank.type.field,size:0
@@ -361,7 +361,7 @@ msgstr "مدیریت شریک"
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
-msgstr ""
+msgstr "مدیریت ارتباط با مشتری"
#. module: base
#: view:ir.module.module:0
@@ -397,7 +397,7 @@ msgstr "تاریخ بروزرسانی"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
msgid "Automated Action Rules"
-msgstr ""
+msgstr "قوانین عملیات خودکار"
#. module: base
#: view:ir.attachment:0
@@ -527,7 +527,7 @@ msgstr ""
#. module: base
#: view:ir.values:0
msgid "Action Binding"
-msgstr ""
+msgstr "عمل اجباری"
#. module: base
#: model:res.country,name:base.gf
@@ -659,7 +659,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
@@ -755,7 +755,7 @@ msgstr "حسابداری - رومانی"
#. module: base
#: view:partner.wizard.ean.check:0
msgid "Want to check Ean ? "
-msgstr ""
+msgstr "آیا میخواهید بررسی شود؟ "
#. module: base
#: help:ir.actions.server,mobile:0
@@ -771,7 +771,7 @@ msgstr ""
#. module: base
#: view:ir.mail_server:0
msgid "Security and Authentication"
-msgstr ""
+msgstr "امنیت و احراز هویت"
#. module: base
#: view:base.language.export:0
@@ -814,32 +814,32 @@ msgstr "کامبوج، پادشاهی"
#: field:base.language.import,overwrite:0
#: field:base.language.install,overwrite:0
msgid "Overwrite Existing Terms"
-msgstr ""
+msgstr "بازنویسی قوانین موجود"
#. module: base
#: model:ir.model,name:base.model_base_language_import
msgid "Language Import"
-msgstr ""
+msgstr "ورود زبان"
#. module: base
#: help:ir.cron,interval_number:0
msgid "Repeat every x."
-msgstr ""
+msgstr "تکرار هر X."
#. module: base
#: selection:base.language.install,lang:0
msgid "Albanian / Shqip"
-msgstr ""
+msgstr "آلبانیایی / Shqip"
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
msgid "Opportunities"
-msgstr ""
+msgstr "فرصت"
#. module: base
#: model:ir.model,name:base.model_base_language_export
msgid "base.language.export"
-msgstr ""
+msgstr "پایه.زبان.خروج"
#. module: base
#: help:ir.actions.server,write_id:0
@@ -858,7 +858,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_document_webdav
msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "منابع مشترک"
#. module: base
#: model:ir.module.module,description:base.module_import_google
@@ -870,7 +870,7 @@ msgstr ""
#. module: base
#: view:res.users:0
msgid "Email Preferences"
-msgstr ""
+msgstr "تنظیمات ایمیل"
#. module: base
#: model:ir.module.module,description:base.module_audittrail
@@ -904,7 +904,7 @@ msgstr "همکاران من"
#. module: base
#: view:ir.actions.report.xml:0
msgid "XML Report"
-msgstr ""
+msgstr "گزارش XML"
#. module: base
#: model:res.country,name:base.es
@@ -914,7 +914,7 @@ msgstr "اسپانیا"
#. module: base
#: view:base.module.update:0
msgid "Please be patient, as this operation may take a few seconds..."
-msgstr ""
+msgstr "لطفا منتظر بمانید ممکن است این عملیات طولانی شود."
#. module: base
#: help:ir.actions.act_window,domain:0
@@ -926,12 +926,12 @@ msgstr ""
#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
#: model:ir.model,name:base.model_base_module_upgrade
msgid "Module Upgrade"
-msgstr ""
+msgstr "به روز رسانی ماژول"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (UY) / Español (UY)"
-msgstr ""
+msgstr "اسپانیایی / Español (UY)"
#. module: base
#: field:res.partner,mobile:0
@@ -947,7 +947,7 @@ msgstr "عمان"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp
msgid "MRP"
-msgstr ""
+msgstr "برنامه ریزی ساخت منابع"
#. module: base
#: report:ir.module.reference.graph:0
@@ -962,7 +962,7 @@ msgstr "نیوئه"
#. module: base
#: model:ir.module.module,shortdesc:base.module_membership
msgid "Membership Management"
-msgstr ""
+msgstr "مدیریت عضویت"
#. module: base
#: selection:ir.module.module,license:0
@@ -984,12 +984,12 @@ msgstr "هند"
#: model:ir.actions.act_window,name:base.res_request_link-act
#: model:ir.ui.menu,name:base.menu_res_request_link_act
msgid "Request Reference Types"
-msgstr ""
+msgstr "درخواست انواع مرجع"
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_base_account
msgid "Google Users"
-msgstr ""
+msgstr "کاربران گوگل"
#. module: base
#: help:ir.server.object.lines,value:0
@@ -1026,6 +1026,8 @@ msgstr "بایگانی TGZ"
msgid ""
"Users added to this group are automatically added in the following groups."
msgstr ""
+"کاربرانی که به این گروه اضافه میشوند به صورت خودکار به گروه های زیر افزوده "
+"میشوند."
#. module: base
#: view:res.lang:0
@@ -1052,7 +1054,7 @@ msgstr "نوع"
#. module: base
#: field:ir.mail_server,smtp_user:0
msgid "Username"
-msgstr ""
+msgstr "نام کاربری"
#. module: base
#: code:addons/orm.py:398
@@ -1071,13 +1073,13 @@ msgstr "گوام (آمریکا)"
#: code:addons/base/res/res_users.py:558
#, python-format
msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr ""
+msgstr "به دلایل امنیتی کلمه عبور نمیتواند خالی باشد!"
#. module: base
#: code:addons/base/ir/ir_mail_server.py:192
#, python-format
msgid "Connection test failed!"
-msgstr ""
+msgstr "آزمایش ارتباط ناموفق بود!"
#. module: base
#: selection:ir.actions.server,state:0
@@ -1116,7 +1118,7 @@ msgstr ""
#. module: base
#: field:ir.module.module,contributors:0
msgid "Contributors"
-msgstr ""
+msgstr "شرکت کنندگان"
#. module: base
#: model:ir.module.module,description:base.module_project_planning
@@ -1147,7 +1149,7 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Slovak / Slovenský jazyk"
-msgstr ""
+msgstr "اسلواکی / Slovenský jazyk"
#. module: base
#: selection:base.language.install,lang:0
@@ -1162,7 +1164,7 @@ msgstr "اوگاندا"
#. module: base
#: field:ir.model.access,perm_unlink:0
msgid "Delete Access"
-msgstr ""
+msgstr "حذف دسترسی"
#. module: base
#: model:res.country,name:base.ne
@@ -1172,7 +1174,7 @@ msgstr "نیجر"
#. module: base
#: selection:base.language.install,lang:0
msgid "Chinese (HK)"
-msgstr ""
+msgstr "چینی"
#. module: base
#: model:res.country,name:base.ba
@@ -1190,17 +1192,17 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (GT) / Español (GT)"
-msgstr ""
+msgstr "اسپانیایی / Español (GT)"
#. module: base
#: field:ir.mail_server,smtp_port:0
msgid "SMTP Port"
-msgstr ""
+msgstr "پورت SMTP"
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_sugarcrm
msgid "SugarCRM Import"
-msgstr ""
+msgstr "ورود SugarCRM"
#. module: base
#: view:res.lang:0
@@ -1217,12 +1219,12 @@ msgstr ""
#: code:addons/base/module/wizard/base_language_install.py:55
#, python-format
msgid "Language Pack"
-msgstr ""
+msgstr "بسته زبان"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_tests
msgid "Tests"
-msgstr ""
+msgstr "آزمونها"
#. module: base
#: field:ir.ui.view_sc,res_id:0
@@ -1242,7 +1244,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
@@ -1253,7 +1255,7 @@ msgstr "جزایر مارشال"
#: code:addons/base/ir/ir_model.py:368
#, python-format
msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "تغییر مدل این فیلد ممنوع است"
#. module: base
#: model:res.country,name:base.ht
@@ -1279,13 +1281,13 @@ msgstr ""
#. module: base
#: field:ir.module.category,parent_id:0
msgid "Parent Application"
-msgstr ""
+msgstr "برنامه اصلی"
#. module: base
#: code:addons/base/res/res_users.py:222
#, python-format
msgid "Operation Canceled"
-msgstr ""
+msgstr "عملیات لغوشده"
#. module: base
#: help:base.language.export,lang:0
@@ -1296,17 +1298,17 @@ msgstr "برای برونش زبانی نو، چیزی را برنگزینید."
#: model:ir.module.module,shortdesc:base.module_document
#: model:ir.module.module,shortdesc:base.module_knowledge
msgid "Document Management System"
-msgstr ""
+msgstr "سیستم مدیریت اسناد"
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_claim
msgid "Claims Management"
-msgstr ""
+msgstr "مدیریت ادعا"
#. module: base
#: model:ir.ui.menu,name:base.menu_purchase_root
msgid "Purchases"
-msgstr ""
+msgstr "خریدها"
#. module: base
#: model:res.country,name:base.md
@@ -1349,7 +1351,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_sequence
msgid "Entries Sequence Numbering"
-msgstr ""
+msgstr "مرتب سازی ورودی ها"
#. module: base
#: model:ir.model,name:base.model_ir_exports
@@ -1416,7 +1418,7 @@ msgstr ""
#. module: base
#: view:wizard.ir.model.menu.create:0
msgid "Create _Menu"
-msgstr ""
+msgstr "ایجاد منو"
#. module: base
#: field:res.payterm,name:0
@@ -1461,12 +1463,12 @@ msgstr ""
msgid ""
"If you check this box, your customized translations will be overwritten and "
"replaced by the official ones."
-msgstr ""
+msgstr "اگر این گزینه فعال باشد، ترجمه شما جایگزین ترجمه های قبلی میشود."
#. module: base
#: field:ir.actions.report.xml,report_rml:0
msgid "Main report file path"
-msgstr ""
+msgstr "مسیر فایل گزارش اصلی"
#. module: base
#: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -1512,7 +1514,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
@@ -1542,18 +1544,18 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_tools
msgid "Tools"
-msgstr ""
+msgstr "ابزار"
#. module: base
#: selection:ir.property,type:0
msgid "Float"
-msgstr ""
+msgstr "شناور"
#. module: base
#: model:ir.module.category,name:base.module_category_warehouse_management
#: model:ir.module.module,shortdesc:base.module_stock
msgid "Warehouse Management"
-msgstr ""
+msgstr "مدیریت انبار"
#. module: base
#: model:ir.model,name:base.model_res_request_link
@@ -1570,7 +1572,7 @@ msgstr "آگهگان تردست"
#: model:ir.actions.act_window,name:base.action_wizard_lang_export
#: model:ir.ui.menu,name:base.menu_wizard_lang_export
msgid "Export Translation"
-msgstr ""
+msgstr "خروج ترجمه"
#. module: base
#: help:res.log,secondary:0
@@ -1582,7 +1584,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_lu
msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "حسابداری - لوکزامبرگ"
#. module: base
#: model:res.country,name:base.tp
@@ -1753,27 +1755,27 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_html_view
msgid "Html View"
-msgstr ""
+msgstr "مشاهده HTML"
#. module: base
#: field:res.currency,position:0
msgid "Symbol position"
-msgstr ""
+msgstr "جایگاه نماد"
#. module: base
#: model:ir.module.module,shortdesc:base.module_process
msgid "Enterprise Process"
-msgstr ""
+msgstr "فرآیند سازمانی"
#. module: base
#: help:ir.cron,function:0
msgid "Name of the method to be called when this job is processed."
-msgstr ""
+msgstr "نام این روش زمانی که این عمل در حال انجام است به آن داده میشود."
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_evaluation
msgid "Employee Appraisals"
-msgstr ""
+msgstr "ارزیابی کارکنان"
#. module: base
#: selection:ir.actions.server,state:0
@@ -1790,7 +1792,7 @@ msgstr " STOCK_COPY"
#. module: base
#: field:res.company,rml_footer1:0
msgid "General Information Footer"
-msgstr ""
+msgstr "اطلاعات عمومی پاورقی"
#. module: base
#: view:res.lang:0
@@ -1822,7 +1824,7 @@ msgstr "مدل پیوست"
#. module: base
#: field:res.partner.bank,footer:0
msgid "Display on Reports"
-msgstr ""
+msgstr "نمایش در گزارش"
#. module: base
#: model:ir.module.module,description:base.module_l10n_cn
@@ -1897,7 +1899,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_chart
msgid "Template of Charts of Accounts"
-msgstr ""
+msgstr "قالب نمودار حساب ها"
#. module: base
#: field:res.partner.address,type:0
@@ -1907,7 +1909,7 @@ msgstr "نوع نشانی"
#. module: base
#: view:ir.ui.menu:0
msgid "Full Path"
-msgstr ""
+msgstr "آدرس کامل"
#. module: base
#: model:ir.module.module,description:base.module_l10n_br
@@ -1973,7 +1975,7 @@ msgstr ""
#. module: base
#: view:ir.ui.view:0
msgid "Advanced"
-msgstr ""
+msgstr "پیشرفته"
#. module: base
#: model:res.country,name:base.fi
@@ -1984,12 +1986,12 @@ msgstr "فنلاند"
#: code:addons/base/res/res_company.py:156
#, python-format
msgid "Website: "
-msgstr ""
+msgstr "وب سایت "
#. module: base
#: model:ir.ui.menu,name:base.menu_administration
msgid "Settings"
-msgstr ""
+msgstr "تنظیمات"
#. module: base
#: selection:ir.actions.act_window,view_type:0
@@ -2003,12 +2005,12 @@ msgstr "درخت"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_multicurrency
msgid "Multi-Currency in Analytic"
-msgstr ""
+msgstr "تحلیل چند ارزی"
#. module: base
#: view:base.language.export:0
msgid "https://help.launchpad.net/Translations"
-msgstr ""
+msgstr "https://help.launchpad.net/Translations"
#. module: base
#: field:ir.actions.act_window,view_mode:0
@@ -2020,7 +2022,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
@@ -2032,7 +2034,7 @@ msgstr ""
#. module: base
#: view:res.log:0
msgid "Logs"
-msgstr ""
+msgstr "گزارشات"
#. module: base
#: selection:base.language.install,lang:0
@@ -2042,7 +2044,7 @@ msgstr "اسپانیایی / Español"
#. module: base
#: selection:base.language.install,lang:0
msgid "Korean (KP) / 한국어 (KP)"
-msgstr ""
+msgstr "کره / 한국어 (KP)"
#. module: base
#: view:base.module.update:0
@@ -2090,7 +2092,7 @@ msgstr "نشان"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_cr
msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "حسابداری - کاستاریکا"
#. module: base
#: view:ir.module.module:0
@@ -2120,12 +2122,12 @@ msgstr ""
#. module: base
#: field:ir.values,action_id:0
msgid "Action (change only)"
-msgstr ""
+msgstr "عملیات (فقط تغییر)"
#. module: base
#: model:ir.module.module,shortdesc:base.module_subscription
msgid "Recurring Documents"
-msgstr ""
+msgstr "اسناد دوره ای"
#. module: base
#: model:res.country,name:base.bs
@@ -2163,7 +2165,7 @@ msgstr "تعداد پیمانههای بروزرسانده"
#. module: base
#: field:ir.cron,function:0
msgid "Method"
-msgstr ""
+msgstr "روش"
#. module: base
#: view:res.partner.event:0
@@ -2173,7 +2175,7 @@ msgstr "شرح کلی"
#. module: base
#: view:workflow.activity:0
msgid "Workflow Activity"
-msgstr ""
+msgstr "فعالیت گردش کار"
#. module: base
#: model:ir.actions.act_window,help:base.action_ui_view
@@ -2185,7 +2187,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_setup
msgid "Initial Setup Tools"
-msgstr ""
+msgstr "ابزار تنظیمات اولیه"
#. module: base
#: field:ir.actions.act_window,groups_id:0
@@ -2209,7 +2211,7 @@ msgstr "گروهها"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (CL) / Español (CL)"
-msgstr ""
+msgstr "اسپانیایی / Español (CL)"
#. module: base
#: model:res.country,name:base.bz
@@ -2242,12 +2244,12 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_res_widget_wizard
msgid "Homepage Widgets Management"
-msgstr ""
+msgstr "مدیریت ابزارک های صفحه اصلی"
#. module: base
#: field:res.company,rml_header1:0
msgid "Report Header / Company Slogan"
-msgstr ""
+msgstr "سربرگ گزارش / شعار شرکت"
#. module: base
#: model:res.country,name:base.pl
@@ -2270,7 +2272,7 @@ msgstr ""
#. module: base
#: view:workflow:0
msgid "Workflow Editor"
-msgstr ""
+msgstr "ویرایشگر گردش کار"
#. module: base
#: selection:ir.module.module,state:0
@@ -2297,7 +2299,7 @@ msgstr ""
#. module: base
#: field:ir.mail_server,smtp_debug:0
msgid "Debugging"
-msgstr ""
+msgstr "اشکالزدایی"
#. module: base
#: model:ir.module.module,description:base.module_crm_helpdesk
@@ -2317,7 +2319,7 @@ msgstr ""
#. module: base
#: sql_constraint:ir.ui.view_sc:0
msgid "Shortcut for this menu already exists!"
-msgstr ""
+msgstr "میانبر این منو موجود است"
#. module: base
#: model:ir.module.module,description:base.module_resource
@@ -2337,12 +2339,12 @@ msgstr ""
#. module: base
#: view:ir.rule:0
msgid "Groups (no group = global)"
-msgstr ""
+msgstr "گروه ها (بدون گروه = عمومی)"
#. module: base
#: selection:res.users,view:0
msgid "Simplified"
-msgstr ""
+msgstr "ساده شده"
#. module: base
#: model:res.country,name:base.st
@@ -2357,7 +2359,7 @@ msgstr "سیاهه"
#. module: base
#: selection:base.language.install,lang:0
msgid "Portugese (BR) / Português (BR)"
-msgstr ""
+msgstr "پرتقالی / Português (BR)"
#. module: base
#: model:res.country,name:base.bb
@@ -2406,7 +2408,7 @@ msgstr "نرخ کنونی"
#. module: base
#: model:ir.module.module,shortdesc:base.module_idea
msgid "Ideas"
-msgstr ""
+msgstr "ایدهها"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_crm
@@ -2433,22 +2435,22 @@ msgstr "هدف کنش"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_calendar
msgid "Calendar Layer"
-msgstr ""
+msgstr "لایه تقویم"
#. module: base
#: model:ir.actions.report.xml,name:base.report_ir_model_overview
msgid "Model Overview"
-msgstr ""
+msgstr "بازنگری مدل"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_margin
msgid "Margins by Products"
-msgstr ""
+msgstr "حاشیه های محصولات"
#. module: base
#: model:ir.ui.menu,name:base.menu_invoiced
msgid "Invoicing"
-msgstr ""
+msgstr "صورتحساب"
#. module: base
#: field:ir.ui.view_sc,name:0
@@ -2483,13 +2485,13 @@ msgstr "درونش / برونش"
#. module: base
#: model:ir.actions.todo.category,name:base.category_tools_customization_config
msgid "Tools / Customization"
-msgstr ""
+msgstr "ابزار / شخصی سازی"
#. module: base
#: field:ir.model.data,res_id:0
#: field:ir.values,res_id:0
msgid "Record ID"
-msgstr ""
+msgstr "شناسه ثبت شده"
#. module: base
#: field:ir.actions.server,email:0
@@ -2567,13 +2569,13 @@ msgstr "نگاشتهای فیلد"
#: code:addons/base/publisher_warranty/publisher_warranty.py:163
#, python-format
msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "خطا در هنگام ارتباط با سرور ناشر گارانتی"
#. module: base
#: model:res.groups,name:base.group_sale_manager
#: model:res.groups,name:base.group_tool_manager
msgid "Manager"
-msgstr ""
+msgstr "مدیر"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -2605,17 +2607,17 @@ msgstr "لیتوانی"
#: model:ir.model,name:base.model_partner_clear_ids
#: view:partner.clear.ids:0
msgid "Clear IDs"
-msgstr ""
+msgstr "پاک کردن شناسه ها"
#. module: base
#: view:res.groups:0
msgid "Inherited"
-msgstr ""
+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
@@ -2649,7 +2651,7 @@ msgstr ""
#: model:ir.actions.act_window,name:base.res_log_act_window
#: model:ir.ui.menu,name:base.menu_res_log_act_window
msgid "Client Logs"
-msgstr ""
+msgstr "ثبت مشتری"
#. module: base
#: code:addons/orm.py:1883
@@ -2670,7 +2672,7 @@ msgstr ""
#: code:addons/base/module/wizard/base_update_translations.py:38
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "خطا!"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_fr_rib
@@ -2690,7 +2692,7 @@ msgstr "کنشهای تکرار"
#. module: base
#: help:multi_company.default,company_id:0
msgid "Company where the user is connected"
-msgstr ""
+msgstr "شرکتی که کاربر از آن وصل شده"
#. module: base
#: field:publisher_warranty.contract,date_stop:0
@@ -2732,7 +2734,7 @@ msgstr "جزیرهی نورفولک"
#. module: base
#: selection:base.language.install,lang:0
msgid "Korean (KR) / 한국어 (KR)"
-msgstr ""
+msgstr "کره / 한국어 (KR)"
#. module: base
#: help:ir.model.fields,model:0
@@ -2758,14 +2760,14 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_planning
msgid "Master Procurement Schedule"
-msgstr ""
+msgstr "کارشناس ارشد برنامه ریز تدارکات"
#. module: base
#: model:ir.model,name:base.model_ir_module_category
#: field:ir.module.module,application:0
#: field:res.groups,category_id:0
msgid "Application"
-msgstr ""
+msgstr "برنامه"
#. module: base
#: selection:publisher_warranty.contract,state:0
@@ -2804,7 +2806,7 @@ msgstr ""
#. module: base
#: field:ir.actions.client,params_store:0
msgid "Params storage"
-msgstr ""
+msgstr "پارامترهای ذخیره سازی"
#. module: base
#: code:addons/base/module/module.py:409
@@ -2851,7 +2853,7 @@ msgstr ""
#. module: base
#: model:res.widget,title:base.facebook_widget
msgid "Facebook"
-msgstr ""
+msgstr "فیسبوک"
#. module: base
#: model:res.country,name:base.am
@@ -2862,12 +2864,12 @@ msgstr "ارمنستان"
#: model:ir.actions.act_window,name:base.ir_property_form
#: model:ir.ui.menu,name:base.menu_ir_property_form_all
msgid "Configuration Parameters"
-msgstr ""
+msgstr "پارامترهای پیکربندی"
#. module: base
#: constraint:ir.cron:0
msgid "Invalid arguments"
-msgstr ""
+msgstr "آرگومانهای نامعتبر"
#. module: base
#: model:res.country,name:base.se
@@ -2906,7 +2908,7 @@ msgstr "نوع حساب بانکی"
#: field:res.config,config_logo:0
#: field:res.config.installer,config_logo:0
msgid "Image"
-msgstr ""
+msgstr "تصویر"
#. module: base
#: view:ir.actions.server:0
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 4455b4b1bc2..59c8c758790 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index a636d8a94c2..b9beaf709f1 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 5401ac31f42..e4a1a52c5b3 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 4d020749af9..e792b065d9c 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index da4a5d6d519..d6ec727bf97 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index dc41897f839..f8fdf675216 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 9006415c054..0d93cb32df3 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
"Language: hr\n"
#. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index d421d8874de..21fb2b5761c 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -218,7 +218,7 @@ msgstr "ir.ui.view.custom"
#: code:addons/base/ir/ir_model.py:313
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
-msgstr ""
+msgstr "Nem megengedett a \"%s\" ritka mező átnevezése"
#. module: base
#: model:res.country,name:base.sz
@@ -234,12 +234,12 @@ msgstr "létrehozva."
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_tr
msgid "Turkey - Accounting"
-msgstr ""
+msgstr "Török - könyvelés"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp_subproduct
msgid "MRP Subproducts"
-msgstr ""
+msgstr "MRP altermékek"
#. module: base
#: code:addons/base/module/module.py:390
@@ -272,7 +272,7 @@ msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
#: model:ir.module.category,name:base.module_category_sales_management
#: model:ir.module.module,shortdesc:base.module_sale
msgid "Sales Management"
-msgstr ""
+msgstr "Értékesítés menedzsment"
#. module: base
#: view:res.partner:0
@@ -368,12 +368,12 @@ msgstr "Varázsló Neve"
#. module: base
#: model:res.groups,name:base.group_partner_manager
msgid "Partner Manager"
-msgstr ""
+msgstr "Partner kapcsolati felelős"
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Ügyfél kapcsolati irányítás"
#. module: base
#: view:ir.module.module:0
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 038dd4c0a68..1458f997356 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 57806edb71c..fff6fde2d02 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index e5fa01a9dbd..6a8c075d62e 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index cf39f48fe37..a02be400545 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 8a6a41057ec..2d9e2dc9163 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 00a06bf9ba3..ad970a9b0a3 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index b17421be2f6..ff29e547a38 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 7a568c31b84..5f36c28683c 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index e08c3f152b9..fdb6451b3f4 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 27705b72e48..7f8d4ab10e4 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 2d66015cdb7..e02c1544aaf 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 1264b368a92..014d461f446 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 2a83f20f87f..a485a20f257 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 4ec2d171e4d..88fcc4ff3fb 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -12085,7 +12085,7 @@ msgstr "Wizards welke worden gestart"
#: model:ir.module.category,name:base.module_category_manufacturing
#: model:ir.ui.menu,name:base.menu_mrp_root
msgid "Manufacturing"
-msgstr "Productiebeheer"
+msgstr "Productie"
#. module: base
#: model:res.country,name:base.km
@@ -15550,10 +15550,11 @@ msgid ""
"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
"106,500. Provided ',' as the thousand separator in each case."
msgstr ""
-"Het scheidingsformaat moet zoals [,n] zijn waarin 0 < n: -1 eindigt de "
-"scheiding. Bijv. [3,2,-1] geeft op 106500 het volgende resultaat: 1,06,500. "
-"[1,2,-1] geeft 106,50,0; [3] geeft 106,500. Er is in deze voorbeelden "
-"uitgegaan van ',' als scheidingsteken."
+"De instellingen voor het scheidingsteken heeft het formaat [,n] waarbij n > "
+"0 gerekend vanaf het decimaalteken. -1 eindigt de scheiding. Bijv. [3,2,-1] "
+"geeft op 106500 het volgende resultaat: 1,06,500. [1,2,-1] geeft 106,50,0; "
+"[3] geeft 106,500. Er is in deze voorbeelden uitgegaan van ',' als "
+"scheidingsteken."
#. module: base
#: field:ir.module.module,auto_install:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 1313f114d81..c217bcd4738 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 4ad08ff73d8..62537c66f30 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -29,7 +29,7 @@ msgstr "Inna konfiguracja"
#. module: base
#: selection:ir.property,type:0
msgid "DateTime"
-msgstr ""
+msgstr "Data i godzina"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_mailgate
@@ -83,7 +83,7 @@ msgstr "Kod (np:en__US)"
#: field:workflow.transition,wkf_id:0
#: field:workflow.workitem,wkf_id:0
msgid "Workflow"
-msgstr "Obieg"
+msgstr "Przebieg procesu"
#. module: base
#: selection:ir.sequence,implementation:0
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 11e1ff3a38e..bb7183732b8 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index eb3b7918c24..1a212229730 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 8f673e6138f..03d0526aa40 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 57175fa581f..ebd9440ce32 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index ec4981d65af..f3328eb9821 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 6f5fea1a902..c8a34480cfa 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index f0ae2c5c50f..7a90c192789 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index d1da84e99c3..507b51c2ee2 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index c7ead346847..32ac03d03d4 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 693f4042c34..7d2558438d9 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 5c973f1c0f8..384802714a4 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 7c81a8298b4..92eaebf3d47 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 890ce6474dc..7cbd382b60c 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 84c39337199..0f21a89e35f 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 58b2ffd8cdf..1c6c02994f8 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index b071215c34c..d1db64fc445 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index b6261de14ba..0c224f68fdf 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index daf05edeaac..1fb09268685 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 4951c2fff9a..0eceae202ab 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
+"X-Generator: Launchpad (build 16130)\n"
#. module: base
#: model:res.country,name:base.sh
diff --git a/openerp/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py
index ba8b785f39d..c6034e0f7ee 100644
--- a/openerp/addons/base/ir/__init__.py
+++ b/openerp/addons/base/ir/__init__.py
@@ -20,8 +20,6 @@
##############################################################################
import ir_model
-import ir_model_constraint
-import ir_model_relation
import ir_sequence
import ir_needaction
import ir_ui_menu
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
deleted file mode 100644
index 491bc9c8131..00000000000
--- a/openerp/addons/base/ir/ir.xml
+++ /dev/null
@@ -1,1791 +0,0 @@
-
-
-
-
-
-
- ir.values.form.action
- ir.values
-
-
-
-
-
-
- ir.values.form.defaults
- ir.values
-
-
-
-
-
-
- ir.values.tree.action
- ir.values
-
-
-
-
-
-
-
-
-
-
- ir.values.search.action
- ir.values
-
-
-
-
-
-
-
-
-
-
-
-
- Action Bindings
- ir.actions.act_window
- ir.values
- form
- tree,form
-
- [('key','=','action')]
- {'default_key':'action'}
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- User-defined Defaults
- ir.actions.act_window
- ir.values
- form
- tree,form
-
- [('key','=','default')]
- {'default_key':'default','default_key2':''}
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
-
- ir.sequence.form
- ir.sequence
-
-
-
-
-
-
- ir.sequence.tree
- ir.sequence
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.sequence.search
- ir.sequence
-
-
-
-
-
-
-
-
-
-
- Sequences
- ir.actions.act_window
- ir.sequence
- form
-
- {'active_test': False}
-
-
-
-
-
-
-
- ir.sequence.type.form
- ir.sequence.type
-
-
-
-
-
-
- ir.sequence.type.tree
- ir.sequence.type
-
-
-
-
-
-
-
-
-
- ir.sequence.type.search
- ir.sequence.type
-
-
-
-
-
-
-
-
- Sequence Codes
- ir.actions.act_window
- ir.sequence.type
- form
- tree,form
-
-
-
-
-
-
-
- ir.actions.actions
- ir.actions.actions
-
-
-
-
-
- ir.actions.actions.tree
- ir.actions.actions
-
-
-
-
-
-
-
-
- ir.actions.actions.search
- ir.actions.actions
-
-
-
-
-
-
-
-
- Actions
- ir.actions.act_window
- ir.actions.actions
- form
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.report.xml
- ir.actions.report.xml
-
-
-
-
-
- ir.actions.report.xml.tree
- ir.actions.report.xml
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.report.xml.search
- ir.actions.report.xml
-
-
-
-
-
-
-
-
-
-
-
- Reports
- ir.actions.act_window
- ir.actions.report.xml
- form
-
-
-
-
-
-
- ir.actions.windows.tree
- ir.actions.act_window
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.windows.form
- ir.actions.act_window
-
-
-
-
-
- ir.actions.windows.search
- ir.actions.act_window
-
-
-
-
-
-
-
-
-
-
-
-
- Window Actions
- ir.actions.act_window
- ir.actions.act_window
- form
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
- ir.actions.wizard.tree
- ir.actions.wizard
-
-
-
-
-
-
-
-
-
-
- ir.actions.wizard
- ir.actions.wizard
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.wizard.search
- ir.actions.wizard
-
-
-
-
-
-
-
-
- Wizards
- ir.actions.act_window
- ir.actions.wizard
- form
-
-
-
-
-
-
-
- ir.ui.view
- ir.ui.view
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.ui.view.tree
- ir.ui.view
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.ui.view.search
- ir.ui.view
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Views
- ir.actions.act_window
- ir.ui.view
-
- Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need.
-
-
-
-
-
-
- ir.ui.view.custom.search
- ir.ui.view.custom
-
-
-
-
-
-
-
-
- ir.ui.view.custom.form
- ir.ui.view.custom
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.ui.view.custom.tree
- ir.ui.view.custom
-
-
-
-
-
-
-
-
- Customized Views
- ir.actions.act_window
- ir.ui.view.custom
- Customized views are used when users reorganize the content of their dashboard views (via web client)
-
-
-
-
-
-
- ir.attachment.view
- ir.attachment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- on
-
-
-
-
-
-
-
-
-
-
-
-
- ir.attachment.view.tree
- ir.attachment
-
-
-
-
-
-
-
-
-
-
-
-
- ir.attachment.search
- ir.attachment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Attachments
- ir.actions.act_window
- ir.attachment
- form
-
-
-
-
-
-
-
- ir.model.form
- ir.model
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.tree
- ir.model
-
-
-
-
-
-
-
-
-
-
-
- ir.model.search
- ir.model
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.fields.form
- ir.model.fields
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.fields.tree
- ir.model.fields
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.fields.search
- ir.model.fields
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.data.form
- ir.model.data
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.data.list
- ir.model.data
-
-
-
-
-
-
-
-
-
-
-
- ir.model.data.search
- ir.model.data
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.constraint.form
- ir.model.constraint
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.constraint.list
- ir.model.constraint
-
-
-
-
-
-
-
-
-
-
-
- ir.model.relation.form
- ir.model.relation
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.relation.list
- ir.model.relation
-
-
-
-
-
-
-
-
-
-
- Models
- ir.model
- form
- {'manual':True}
-
-
-
-
-
-
- Fields
- ir.model.fields
- form
- {'manual':True}
-
-
-
-
-
- External Identifiers
- ir.model.data
- form
-
-
-
-
-
- Model Constraints
- ir.model.constraint
- form
-
-
-
-
-
- ManyToMany Relations
- ir.model.relation
- form
-
-
-
-
-
-
-
- ir.ui.view_sc
- ir.ui.view_sc
-
-
-
-
-
-
-
-
-
-
- ir.ui.view_sc
- ir.ui.view_sc
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.cron.tree
- ir.cron
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.cron.form
- ir.cron
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.cron.search
- ir.cron
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.cron.calendar
- ir.cron
-
-
-
-
-
-
-
-
-
-
- Scheduled Actions
- ir.cron
- form
- tree,form,calendar
- {'active_test': False}
-
-
-
-
-
-
-
-
-
- ir.model.access.tree
- ir.model.access
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.access.form
- ir.model.access
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.model.access.search
- ir.model.access
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Access Controls List
- ir.model.access
- form
-
-
-
-
-
-
-
-
- Record rules
- ir.rule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Record rules
- ir.rule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Record rules
- ir.rule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Record Rules
- ir.rule
- form
-
-
-
-
-
-
- Property multi-company
-
-
- ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
-
-
-
-
-
- Server Action
- ir.actions.server
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Server Actions
- ir.actions.server
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.server.search
- ir.actions.server
-
-
-
-
-
-
-
-
-
-
-
-
-
- Server Actions
- ir.actions.act_window
- ir.actions.server
- form
- tree,form
-
-
- {'key':'server_action'}
-
-
-
-
-
-
- ir.actions.todo
- Config Wizard Steps
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.todo
- Config Wizard Steps
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.todo
- ir.actions.todo.select
-
-
-
-
-
-
-
-
-
-
- Configuration Wizards
- ir.actions.todo
-
- form
- 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.
-
-
-
-
-
- AutoVacuum osv_memory objects
- 30
- minutes
- -1
- True
-
- osv_memory.autovacuum
- power_on
- ()
-
-
-
-
- ir.mail.server.form
- ir.mail_server
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.mail.server.list
- ir.mail_server
-
-
-
-
-
-
-
-
-
-
-
-
- ir.mail.server.search
- ir.mail_server
-
-
-
-
-
-
-
-
-
- Outgoing Mail Servers
- ir.mail_server
- form
- tree,form
-
-
-
-
-
-
-
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
new file mode 100644
index 00000000000..2736f3ea252
--- /dev/null
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -0,0 +1,507 @@
+
+
+
+
+
+ ir.actions.actions
+ ir.actions.actions
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.actions.tree
+ ir.actions.actions
+
+
+
+
+
+
+
+
+ ir.actions.actions.search
+ ir.actions.actions
+
+
+
+
+
+
+
+
+ Actions
+ ir.actions.act_window
+ ir.actions.actions
+ form
+
+
+
+
+
+
+
+
+
+ ir.actions.report.xml
+ ir.actions.report.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.report.xml.tree
+ ir.actions.report.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.report.xml.search
+ ir.actions.report.xml
+
+
+
+
+
+
+
+
+
+
+
+ Reports
+ ir.actions.act_window
+ ir.actions.report.xml
+ form
+
+
+
+
+
+
+ ir.actions.windows.tree
+ ir.actions.act_window
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.windows.form
+ ir.actions.act_window
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.windows.search
+ ir.actions.act_window
+
+
+
+
+
+
+
+
+
+
+
+
+ Window Actions
+ ir.actions.act_window
+ ir.actions.act_window
+ form
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
+ ir.actions.wizard.tree
+ ir.actions.wizard
+
+
+
+
+
+
+
+
+
+
+ ir.actions.wizard
+ ir.actions.wizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.wizard.search
+ ir.actions.wizard
+
+
+
+
+
+
+
+
+ Wizards
+ ir.actions.act_window
+ ir.actions.wizard
+ form
+
+
+
+
+
+
+
+ Property multi-company
+
+
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
+
+
+
+
+
+ Server Action
+ ir.actions.server
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Server Actions
+ ir.actions.server
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.server.search
+ ir.actions.server
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Server Actions
+ ir.actions.act_window
+ ir.actions.server
+ form
+ tree,form
+
+
+ {'key':'server_action'}
+
+
+
+
+
+
+ ir.actions.todo
+ Config Wizard Steps
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.todo
+ Config Wizard Steps
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.actions.todo
+ ir.actions.todo.select
+
+
+
+
+
+
+
+
+
+
+ Configuration Wizards
+ ir.actions.todo
+
+ form
+ 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.
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_attachment_view.xml b/openerp/addons/base/ir/ir_attachment_view.xml
new file mode 100644
index 00000000000..4a65dd0ad0a
--- /dev/null
+++ b/openerp/addons/base/ir/ir_attachment_view.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+ ir.attachment
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ on
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.attachment
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.attachment
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Attachments
+ ir.actions.act_window
+ ir.attachment
+ form
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml
index e4af6c66bab..72ad43da710 100644
--- a/openerp/addons/base/ir/ir_config_parameter_view.xml
+++ b/openerp/addons/base/ir/ir_config_parameter_view.xml
@@ -1,9 +1,7 @@
-
- ir.config_parameter.search
ir.config_parameter
@@ -13,7 +11,6 @@
- ir.config_parameter.list
ir.config_parameter
@@ -23,7 +20,6 @@
- ir.config_parameter.form
ir.config_parameter
@@ -36,7 +32,6 @@
-
diff --git a/openerp/addons/base/ir/ir_cron_view.xml b/openerp/addons/base/ir/ir_cron_view.xml
new file mode 100644
index 00000000000..6a7cef3f1a8
--- /dev/null
+++ b/openerp/addons/base/ir/ir_cron_view.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+
+
+
+
+ ir.cron
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Scheduled Actions
+ ir.cron
+ form
+ tree,form,calendar
+ {'active_test': False}
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index e4b10d41a03..51215132079 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -1,6 +1,5 @@
-
@@ -12,7 +11,6 @@
- ir.filters.form
ir.filters
@@ -30,9 +28,7 @@
-
- ir.filters.tree
ir.filters
@@ -44,9 +40,7 @@
-
- ir.filters.search
ir.filters
@@ -62,13 +56,11 @@
-
Filters
ir.actions.act_window
ir.filters
-
diff --git a/openerp/addons/base/ir/ir_mail_server_view.xml b/openerp/addons/base/ir/ir_mail_server_view.xml
new file mode 100644
index 00000000000..ff7b61eaee3
--- /dev/null
+++ b/openerp/addons/base/ir/ir_mail_server_view.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+ ir.mail_server
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.mail_server
+
+
+
+
+
+
+
+
+
+
+
+ ir.mail_server
+
+
+
+
+
+
+
+
+ Outgoing Mail Servers
+ ir.mail_server
+ form
+ tree,form
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 633db6de6a3..e477f2f09a5 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -24,8 +24,11 @@ import re
import time
import types
-from openerp.osv import fields,osv
+import openerp
+from openerp import SUPERUSER_ID
from openerp import netsvc, pooler, tools
+from openerp.osv import fields,osv
+from openerp.osv.orm import Model
from openerp.tools.safe_eval import safe_eval as eval
from openerp.tools import config
from openerp.tools.translate import _
@@ -58,7 +61,6 @@ def _in_modules(self, cr, uid, ids, field_name, arg, context=None):
result[k] = ', '.join(sorted(installed_modules & set(xml_id.split('.')[0] for xml_id in v)))
return result
-
class ir_model(osv.osv):
_name = 'ir.model'
_description = "Models"
@@ -204,7 +206,6 @@ class ir_model(osv.osv):
else:
x_name = a._columns.keys()[0]
x_custom_model._rec_name = x_name
-ir_model()
class ir_model_fields(osv.osv):
_name = 'ir.model.fields'
@@ -462,7 +463,128 @@ class ir_model_fields(osv.osv):
obj._auto_init(cr, ctx)
return res
-ir_model_fields()
+class ir_model_constraint(Model):
+ """
+ This model tracks PostgreSQL foreign keys and constraints used by OpenERP
+ models.
+ """
+ _name = 'ir.model.constraint'
+ _columns = {
+ 'name': fields.char('Constraint', required=True, size=128, select=1,
+ help="PostgreSQL constraint or foreign key name."),
+ 'model': fields.many2one('ir.model', string='Model',
+ required=True, select=1),
+ 'module': fields.many2one('ir.module.module', string='Module',
+ required=True, select=1),
+ 'type': fields.char('Constraint Type', required=True, size=1, select=1,
+ help="Type of the constraint: `f` for a foreign key, "
+ "`u` for other constraints."),
+ 'date_update': fields.datetime('Update Date'),
+ 'date_init': fields.datetime('Initialization Date')
+ }
+
+ _sql_constraints = [
+ ('module_name_uniq', 'unique(name, module)',
+ 'Constraints with the same name are unique per module.'),
+ ]
+
+ def _module_data_uninstall(self, cr, uid, ids, context=None):
+ """
+ Delete PostgreSQL foreign keys and constraints tracked by this model.
+ """
+
+ if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
+ raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
+
+ context = dict(context or {})
+
+ ids_set = set(ids)
+ ids.sort()
+ ids.reverse()
+ for data in self.browse(cr, uid, ids, context):
+ model = data.model.model
+ model_obj = self.pool.get(model)
+ name = openerp.tools.ustr(data.name)
+ typ = data.type
+
+ # double-check we are really going to delete all the owners of this schema element
+ cr.execute("""SELECT id from ir_model_constraint where name=%s""", (data.name,))
+ external_ids = [x[0] for x in cr.fetchall()]
+ if (set(external_ids)-ids_set):
+ # as installed modules have defined this element we must not delete it!
+ continue
+
+ if typ == 'f':
+ # test if FK exists on this table (it could be on a related m2m table, in which case we ignore it)
+ cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
+ WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('f', name, model_obj._table))
+ if cr.fetchone():
+ cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
+ _logger.info('Dropped FK CONSTRAINT %s@%s', name, model)
+
+ if typ == 'u':
+ # test if constraint exists
+ cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
+ WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('u', name, model_obj._table))
+ if cr.fetchone():
+ cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
+ _logger.info('Dropped CONSTRAINT %s@%s', name, model)
+
+ self.unlink(cr, uid, ids, context)
+
+class ir_model_relation(Model):
+ """
+ This model tracks PostgreSQL tables used to implement OpenERP many2many
+ relations.
+ """
+ _name = 'ir.model.relation'
+ _columns = {
+ 'name': fields.char('Relation Name', required=True, size=128, select=1,
+ help="PostgreSQL table name implementing a many2many relation."),
+ 'model': fields.many2one('ir.model', string='Model',
+ required=True, select=1),
+ 'module': fields.many2one('ir.module.module', string='Module',
+ required=True, select=1),
+ 'date_update': fields.datetime('Update Date'),
+ 'date_init': fields.datetime('Initialization Date')
+ }
+
+ def _module_data_uninstall(self, cr, uid, ids, context=None):
+ """
+ Delete PostgreSQL many2many relations tracked by this model.
+ """
+
+ if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
+ raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
+
+ ids_set = set(ids)
+ to_drop_table = []
+ ids.sort()
+ ids.reverse()
+ for data in self.browse(cr, uid, ids, context):
+ model = data.model
+ model_obj = self.pool.get(model)
+ name = openerp.tools.ustr(data.name)
+
+ # double-check we are really going to delete all the owners of this schema element
+ cr.execute("""SELECT id from ir_model_relation where name = %s""", (data.name,))
+ external_ids = [x[0] for x in cr.fetchall()]
+ if (set(external_ids)-ids_set):
+ # as installed modules have defined this element we must not delete it!
+ continue
+
+ cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name=%s", (name,))
+ if cr.fetchone() and not name in to_drop_table:
+ to_drop_table.append(name)
+
+ self.unlink(cr, uid, ids, context)
+
+ # drop m2m relation tables
+ for table in to_drop_table:
+ cr.execute('DROP TABLE %s CASCADE'% (table),)
+ _logger.info('Dropped table %s', table)
+
+ cr.commit()
class ir_model_access(osv.osv):
_name = 'ir.model.access'
@@ -643,8 +765,6 @@ class ir_model_access(osv.osv):
res = super(ir_model_access, self).unlink(cr, uid, *args, **argv)
return res
-ir_model_access()
-
class ir_model_data(osv.osv):
"""Holds external identifier keys for records in the database.
This has two main uses:
@@ -978,5 +1098,4 @@ class ir_model_data(osv.osv):
_logger.info('Deleting %s@%s', res_id, model)
self.pool.get(model).unlink(cr, uid, [res_id])
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_model_constraint.py b/openerp/addons/base/ir/ir_model_constraint.py
deleted file mode 100644
index a3099339131..00000000000
--- a/openerp/addons/base/ir/ir_model_constraint.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import logging
-
-import openerp
-from openerp import SUPERUSER_ID
-from openerp.osv import fields
-from openerp.osv.orm import Model
-
-_logger = logging.getLogger(__name__)
-
-class ir_model_constraint(Model):
- """
- This model tracks PostgreSQL foreign keys and constraints used by OpenERP
- models.
- """
- _name = 'ir.model.constraint'
- _columns = {
- 'name': fields.char('Constraint', required=True, size=128, select=1,
- help="PostgreSQL constraint or foreign key name."),
- 'model': fields.many2one('ir.model', string='Model',
- required=True, select=1),
- 'module': fields.many2one('ir.module.module', string='Module',
- required=True, select=1),
- 'type': fields.char('Constraint Type', required=True, size=1, select=1,
- help="Type of the constraint: `f` for a foreign key, "
- "`u` for other constraints."),
- 'date_update': fields.datetime('Update Date'),
- 'date_init': fields.datetime('Initialization Date')
- }
-
- _sql_constraints = [
- ('module_name_uniq', 'unique(name, module)',
- 'Constraints with the same name are unique per module.'),
- ]
-
- def _module_data_uninstall(self, cr, uid, ids, context=None):
- """
- Delete PostgreSQL foreign keys and constraints tracked by this model.
- """
-
- if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
- raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
-
- context = dict(context or {})
-
- ids_set = set(ids)
- ids.sort()
- ids.reverse()
- for data in self.browse(cr, uid, ids, context):
- model = data.model.model
- model_obj = self.pool.get(model)
- name = openerp.tools.ustr(data.name)
- typ = data.type
-
- # double-check we are really going to delete all the owners of this schema element
- cr.execute("""SELECT id from ir_model_constraint where name=%s""", (data.name,))
- external_ids = [x[0] for x in cr.fetchall()]
- if (set(external_ids)-ids_set):
- # as installed modules have defined this element we must not delete it!
- continue
-
- if typ == 'f':
- # test if FK exists on this table (it could be on a related m2m table, in which case we ignore it)
- cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
- WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('f', name, model_obj._table))
- if cr.fetchone():
- cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
- _logger.info('Dropped FK CONSTRAINT %s@%s', name, model)
-
- if typ == 'u':
- # test if constraint exists
- cr.execute("""SELECT 1 from pg_constraint cs JOIN pg_class cl ON (cs.conrelid = cl.oid)
- WHERE cs.contype=%s and cs.conname=%s and cl.relname=%s""", ('u', name, model_obj._table))
- if cr.fetchone():
- cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
- _logger.info('Dropped CONSTRAINT %s@%s', name, model)
-
- self.unlink(cr, uid, ids, context)
diff --git a/openerp/addons/base/ir/ir_model_relation.py b/openerp/addons/base/ir/ir_model_relation.py
deleted file mode 100644
index fc6dae2ca52..00000000000
--- a/openerp/addons/base/ir/ir_model_relation.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import logging
-
-import openerp
-from openerp import SUPERUSER_ID
-from openerp.osv import fields
-from openerp.osv.orm import Model
-
-_logger = logging.getLogger(__name__)
-
-class ir_model_relation(Model):
- """
- This model tracks PostgreSQL tables used to implement OpenERP many2many
- relations.
- """
- _name = 'ir.model.relation'
- _columns = {
- 'name': fields.char('Relation Name', required=True, size=128, select=1,
- help="PostgreSQL table name implementing a many2many relation."),
- 'model': fields.many2one('ir.model', string='Model',
- required=True, select=1),
- 'module': fields.many2one('ir.module.module', string='Module',
- required=True, select=1),
- 'date_update': fields.datetime('Update Date'),
- 'date_init': fields.datetime('Initialization Date')
- }
-
- def _module_data_uninstall(self, cr, uid, ids, context=None):
- """
- Delete PostgreSQL many2many relations tracked by this model.
- """
-
- if uid != SUPERUSER_ID and not self.pool.get('ir.model.access').check_groups(cr, uid, "base.group_system"):
- raise except_orm(_('Permission Denied'), (_('Administrator access is required to uninstall a module')))
-
- ids_set = set(ids)
- to_drop_table = []
- ids.sort()
- ids.reverse()
- for data in self.browse(cr, uid, ids, context):
- model = data.model
- model_obj = self.pool.get(model)
- name = openerp.tools.ustr(data.name)
-
- # double-check we are really going to delete all the owners of this schema element
- cr.execute("""SELECT id from ir_model_relation where name = %s""", (data.name,))
- external_ids = [x[0] for x in cr.fetchall()]
- if (set(external_ids)-ids_set):
- # as installed modules have defined this element we must not delete it!
- continue
-
- cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name=%s", (name,))
- if cr.fetchone() and not name in to_drop_table:
- to_drop_table.append(name)
-
- self.unlink(cr, uid, ids, context)
-
- # drop m2m relation tables
- for table in to_drop_table:
- cr.execute('DROP TABLE %s CASCADE'% (table),)
- _logger.info('Dropped table %s', table)
-
- cr.commit()
diff --git a/openerp/addons/base/ir/ir_model_view.xml b/openerp/addons/base/ir/ir_model_view.xml
new file mode 100644
index 00000000000..01ff918662f
--- /dev/null
+++ b/openerp/addons/base/ir/ir_model_view.xml
@@ -0,0 +1,416 @@
+
+
+
+
+
+ ir.model
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model
+
+
+
+
+
+
+
+
+
+
+ ir.model
+
+
+
+
+
+
+
+
+
+
+
+ Models
+ ir.model
+ form
+ {'manual':True}
+
+
+
+
+
+
+
+ ir.model.fields
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.fields
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.fields
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fields
+ ir.model.fields
+ form
+ {'manual':True}
+
+
+
+
+
+
+ ir.model.data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.data
+
+
+
+
+
+
+
+
+
+
+ ir.model.data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ External Identifiers
+ ir.model.data
+ form
+
+
+
+
+
+
+
+ ir.model.constraint
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.constraint
+
+
+
+
+
+
+
+
+
+
+ Model Constraints
+ ir.model.constraint
+ form
+
+
+
+
+
+
+ ir.model.relation
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.relation
+
+
+
+
+
+
+
+
+
+ ManyToMany Relations
+ ir.model.relation
+ form
+
+
+
+
+
+
+ ir.model.access
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.access
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.model.access
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Access Controls List
+ ir.model.access
+ form
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_rule_view.xml b/openerp/addons/base/ir/ir_rule_view.xml
new file mode 100644
index 00000000000..f67df822876
--- /dev/null
+++ b/openerp/addons/base/ir/ir_rule_view.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+ ir.rule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.rule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.rule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Record Rules
+ ir.rule
+ form
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_sequence_view.xml b/openerp/addons/base/ir/ir_sequence_view.xml
new file mode 100644
index 00000000000..0fa46d61957
--- /dev/null
+++ b/openerp/addons/base/ir/ir_sequence_view.xml
@@ -0,0 +1,130 @@
+
+
+
+
+
+ ir.sequence
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.sequence
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.sequence
+
+
+
+
+
+
+
+
+
+ Sequences
+ ir.actions.act_window
+ ir.sequence
+ form
+
+ {'active_test': False}
+
+
+
+
+
+ ir.sequence.type
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.sequence.type
+
+
+
+
+
+
+
+
+ ir.sequence.type
+
+
+
+
+
+
+
+ Sequence Codes
+ ir.actions.act_window
+ ir.sequence.type
+ form
+ tree,form
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_translation_view.xml b/openerp/addons/base/ir/ir_translation_view.xml
index 70ccb902cc9..5555b371c58 100644
--- a/openerp/addons/base/ir/ir_translation_view.xml
+++ b/openerp/addons/base/ir/ir_translation_view.xml
@@ -1,8 +1,8 @@
+
- Translations
ir.translation
@@ -21,7 +21,6 @@
- Translations
ir.translation
@@ -53,7 +52,6 @@
- Translations
ir.translation
@@ -76,4 +74,4 @@
-
\ No newline at end of file
+
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 213cff18cc6..5ab546cb554 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -316,9 +316,5 @@ class ir_ui_menu(osv.osv):
'sequence' : 10,
}
_order = "sequence,id"
-ir_ui_menu()
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/openerp/addons/base/ir/ir_ui_menu_view.xml b/openerp/addons/base/ir/ir_ui_menu_view.xml
new file mode 100644
index 00000000000..406f75b3d22
--- /dev/null
+++ b/openerp/addons/base/ir/ir_ui_menu_view.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 9208297cf84..868f634783c 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -44,7 +44,6 @@ class view_custom(osv.osv):
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'ir_ui_view_custom_user_id_ref_id\'')
if not cr.fetchone():
cr.execute('CREATE INDEX ir_ui_view_custom_user_id_ref_id ON ir_ui_view_custom (user_id, ref_id)')
-view_custom()
class view(osv.osv):
_name = 'ir.ui.view'
@@ -60,7 +59,7 @@ class view(osv.osv):
return result
_columns = {
- 'name': fields.char('View Name',size=64, required=True),
+ 'name': fields.char('View Name', required=True),
'model': fields.char('Object', size=64, required=True, select=True),
'priority': fields.integer('Sequence', required=True),
'type': fields.function(_type_field, type='selection', selection=[
@@ -88,11 +87,17 @@ class view(osv.osv):
_order = "priority,name"
# Holds the RNG schema
- _relaxng_validator = None
+ _relaxng_validator = None
def create(self, cr, uid, values, context=None):
if 'type' in values:
_logger.warning("Setting the `type` field is deprecated in the `ir.ui.view` model.")
+ if not values.get('name'):
+ if values.get('inherit_id'):
+ inferred_type = self.browse(cr, uid, values['inherit_id'], context).type
+ else:
+ inferred_type = etree.fromstring(values['arch'].encode('utf8')).tag
+ values['name'] = "%s %s" % (values['model'], inferred_type)
return super(osv.osv, self).create(cr, uid, values, context)
def _relaxng(self):
@@ -106,8 +111,7 @@ class view(osv.osv):
finally:
frng.close()
return self._relaxng_validator
-
-
+
def _check_render_view(self, cr, uid, view, context=None):
"""Verify that the given view's hierarchy is valid for rendering, along with all the changes applied by
its inherited views, by rendering it using ``fields_view_get()``.
@@ -267,7 +271,6 @@ class view(osv.osv):
'label' : labels,
'blank_nodes': blank_nodes,
'node_parent_field': _Model_Field,}
-view()
class view_sc(osv.osv):
_name = 'ir.ui.view_sc'
@@ -304,7 +307,5 @@ class view_sc(osv.osv):
('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'),
]
-view_sc()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_ui_view_view.xml b/openerp/addons/base/ir/ir_ui_view_view.xml
new file mode 100644
index 00000000000..59dfdd72b3f
--- /dev/null
+++ b/openerp/addons/base/ir/ir_ui_view_view.xml
@@ -0,0 +1,144 @@
+
+
+
+
+
+ ir.ui.view
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.ui.view
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.ui.view
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Views
+ ir.actions.act_window
+ ir.ui.view
+
+ Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need.
+
+
+
+
+
+ ir.ui.view.custom
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.ui.view.custom
+
+
+
+
+
+
+
+
+ ir.ui.view.custom
+
+
+
+
+
+
+
+
+ Customized Views
+ ir.actions.act_window
+ ir.ui.view.custom
+ Customized views are used when users reorganize the content of their dashboard views (via web client)
+
+
+
+
+
+ ir.ui.view_sc
+
+
+
+
+
+
+
+
+
+
+ ir.ui.view_sc
+
+
+
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_values_view.xml b/openerp/addons/base/ir/ir_values_view.xml
new file mode 100644
index 00000000000..57457e4e9a3
--- /dev/null
+++ b/openerp/addons/base/ir/ir_values_view.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+ ir.values.form.action
+ ir.values
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.values.form.defaults
+ ir.values
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ir.values.tree.action
+ ir.values
+
+
+
+
+
+
+
+
+
+
+ ir.values.search.action
+ ir.values
+
+
+
+
+
+
+
+
+
+
+
+
+ Action Bindings
+ ir.actions.act_window
+ ir.values
+ form
+ tree,form
+
+ [('key','=','action')]
+ {'default_key':'action'}
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
+ User-defined Defaults
+ ir.actions.act_window
+ ir.values
+ form
+ tree,form
+
+ [('key','=','default')]
+ {'default_key':'default','default_key2':''}
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/ir/osv_memory_autovacuum.xml b/openerp/addons/base/ir/osv_memory_autovacuum.xml
new file mode 100644
index 00000000000..079a33c3e5c
--- /dev/null
+++ b/openerp/addons/base/ir/osv_memory_autovacuum.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ AutoVacuum osv_memory objects
+ 30
+ minutes
+ -1
+ True
+
+ osv_memory.autovacuum
+ power_on
+ ()
+
+
+
+
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7545fd5f4b2..62d12ef20ee 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -41,6 +41,7 @@
"""
+import babel.dates
import calendar
import collections
import copy
@@ -66,7 +67,6 @@ import openerp.tools as tools
from openerp.tools.config import config
from openerp.tools.misc import CountingStream
from openerp.tools.safe_eval import safe_eval as eval
-from ast import literal_eval
from openerp.tools.translate import _
from openerp import SUPERUSER_ID
from query import Query
@@ -1812,13 +1812,7 @@ class BaseModel(object):
field = model_fields.get(node.get('name'))
if field:
transfer_field_to_modifiers(field, modifiers)
- #evaluate the options as python code, but send it as json to the client
- if node.get('options'):
- try:
- node.set('options', simplejson.dumps(literal_eval(node.get('options'))))
- except Exception, e:
- _logger.exception('Invalid `options´ attribute, should be a valid python expression: %r', node.get('options'))
- raise except_orm('Invalid options', 'Invalid options: %r %s' % (node.get('options'), e))
+
elif node.tag in ('form', 'tree'):
result = self.view_header_get(cr, user, False, node.tag, context)
@@ -2708,7 +2702,9 @@ class BaseModel(object):
dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7], '%Y-%m')
days = calendar.monthrange(dt.year, dt.month)[1]
- d[groupby] = datetime.datetime.strptime(d[groupby][:10], '%Y-%m-%d').strftime('%B %Y')
+ date_value = datetime.datetime.strptime(d[groupby][:10], '%Y-%m-%d')
+ d[groupby] = babel.dates.format_date(
+ date_value, format='MMMM yyyy', locale=context.get('lang', 'en_US'))
d['__domain'] = [(groupby, '>=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01', '%Y-%m-%d').strftime('%Y-%m-%d') or False),\
(groupby, '<=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days), '%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain
del alldata[d['id']][groupby]
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 130db6f0d4e..c9283a839d4 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -312,16 +312,8 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
html = ustr(html)
- from lxml.etree import tostring
- try:
- from lxml.html.soupparser import fromstring
- kwargs = {}
- except ImportError:
- _logger.debug('tools.misc.html2plaintext: cannot use BeautifulSoup, fallback to lxml.etree.HTMLParser')
- from lxml.etree import fromstring, HTMLParser
- kwargs = dict(parser=HTMLParser())
-
- tree = fromstring(html, **kwargs)
+ from lxml.etree import tostring, fromstring, HTMLParser
+ tree = fromstring(html, parser=HTMLParser())
if body_id is not None:
source = tree.xpath('//*[@id=%s]'%(body_id,))