pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge] Merge with main server.

Browse Source 
bzr revid: mdi@tinyerp.com-20120705043324-rmnwkite6ejsmar1
bzr revid: mdi@tinyerp.com-20120706040829-oa1su3ggj25cf18e
bzr revid: mdi@tinyerp.com-20120709043205-gon87fab8hnj9kcq
bzr revid: mdi@tinyerp.com-20120710042001-ggfnud23ombj4g3z
bzr revid: mdi@tinyerp.com-20120712044150-8v4vaur1zjeskn6o
bzr revid: mdi@tinyerp.com-20120716050316-07qfsn3p7527koug
bzr revid: mdi@tinyerp.com-20120717042552-shvs815bu00puy0v
bzr revid: mdi@tinyerp.com-20120718043825-t6o2v8yp4eukjk7c
bzr revid: mdi@tinyerp.com-20120719043709-7lbhq4sro6gj3nb9
bzr revid: mdi@tinyerp.com-20120720040713-4pt63ve7ub4x8kkn
bzr revid: mdi@tinyerp.com-20120723044646-i6vlbzqw9yjudqss
bzr revid: mdi@tinyerp.com-20120725042109-umr0skq03y1jjc8h
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-07-25 09:51:09 +05:30
parent abd037c491 04c5130c8d
commit c905cff9ec
96 changed files with 3303 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/base.sql
+1
View File
@@ -286,6 +286,7 @@ CREATE TABLE ir_module_module (
write_date timestamp without time zone,
write_uid integer references res_users on delete set null,
website character varying(256),
summary character varying(256),
name character varying(128) NOT NULL,
author character varying(128),
url character varying(128),
openerp/addons/base/base_menu.xml
+13 -2
View File
@@ -1,10 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="menu_reporting" name="Reporting" sequence="90" groups="base.group_user"/>
<!-- Top menu item -->
<menuitem name="Reporting"
id="menu_reporting"
groups="base.group_user"
sequence="170"/>
<menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
<menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
<menuitem id="menu_administration" name="Settings" sequence="100"/>
<!-- Top menu item -->
<menuitem name="Settings"
id="menu_administration"
sequence="500"/>
<menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
<menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
<menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
@@ -12,11 +21,13 @@
<menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
<menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
<menuitem id="menu_translation_export" name="Import / Export" parent="menu_translation" sequence="3" groups="base.group_no_one"/>
<menuitem id="menu_custom" name="Technical" parent="menu_administration" sequence="110" groups="base.group_no_one"/>
<menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
<menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
<menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
<menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
<menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
</data>
</openerp>
openerp/addons/base/i18n/ab.po
+2 -2
View File
@@ -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-06-27 05:18+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/af.po
+2 -2
View File
@@ -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-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/am.po
+2 -2
View File
@@ -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-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ar.po
+5 -3
View File
@@ -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-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -4155,7 +4155,9 @@ msgstr ""
msgid ""
"Your OpenERP Publisher's Warranty Contract unique key, also called serial "
"number."
msgstr "شفرة ضمان الناشر لأوبنيرب."
msgstr ""
"رمز اتفاقية ضمان الناشر الخاص بك لنظام أوبن إي آر بي، يدعى أيضاً الرقم "
"التسلسلي."
#. module: base
#: model:ir.module.module,description:base.module_base_setup
openerp/addons/base/i18n/bg.po
+2 -2
View File
@@ -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-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/bs.po
+2 -2
View File
@@ -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-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ca.po
+2 -2
View File
@@ -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-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/cs.po
+2 -2
View File
@@ -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-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
"X-Generator: Launchpad (build 15637)\n"
"X-Poedit-Language: Czech\n"
#. module: base
openerp/addons/base/i18n/da.po
+2 -2
View File
@@ -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-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/de.po
+920 -124
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/el.po
+2 -2
View File
@@ -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-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
"X-Generator: Launchpad (build 15637)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
openerp/addons/base/i18n/en_GB.po
+2 -2
View File
@@ -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-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es.po
+2 -2
View File
@@ -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-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es_AR.po
+2 -2
View File
@@ -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-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es_CL.po
+3 -3
View File
@@ -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-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -3796,7 +3796,7 @@ msgstr "Verificación EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgstr "IVA"
msgstr "RUT"
#. module: base
#: field:res.users,new_password:0
openerp/addons/base/i18n/es_CR.po
+2 -2
View File
@@ -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-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
"X-Generator: Launchpad (build 15637)\n"
"Language: \n"
#. module: base
openerp/addons/base/i18n/es_EC.po
+2 -2
View File
@@ -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-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/et.po
+2 -2
View File
@@ -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-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/eu.po
+2 -2
View File
@@ -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-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fa.po
+2 -2
View File
@@ -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-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
"X-Generator: Launchpad (build 15637)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"
openerp/addons/base/i18n/fa_AF.po
+2 -2
View File
@@ -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-06-27 05:28+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fi.po
+2 -2
View File
@@ -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-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fr.po
+79 -2
View File
@@ -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-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -6490,6 +6490,83 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
" Module d'importation des états bancaires CODA.\n"
"\n"
" Les fichiers supportés sont les fichiers plats CODA en version v2 des "
"comptes bancaires Belges.\n"
" - CODA v1 supporté.\n"
" - CODA v2.2 supporté.\n"
" - Devises Étrangères supportées.\n"
" - Support pour tous les enregistrements de type (0, 1, 2, 3, 4, 8, 9).\n"
" - Parsing & logging pour tous les Types de Transactions et les Formats "
"Structurés de Communications.\n"
" - Imputation Automatique des Journaux Financiers via les paramètres de "
"configuration CODA.\n"
" - Support des Journaux multiples par numéro de compte bancaire.\n"
" - Support des états multiples de différents comptes bancaires sur un "
"fichier CODA unique.\n"
" - Support pour \"analyse seule\" ('parsing only') CODA des comptes "
"bancaires (définis comme type='info' dans les enregistrements de "
"configuration CODA du compte bancaire).\n"
" - Analyse CODA mulit-langues, données de configuration pour l'analyse "
"fournie en EN, NL, FR.\n"
"\n"
" Les fichiers CODA informatiquement lisibles sont analysés et enregistrés "
"en format texte dans des états bancaires CODA.\n"
" Also Bank Statements are generated containing a subset of the CODA "
"information (only those transaction lines\n"
" that are required for the creation of the Financial Accounting "
"records).\n"
" The CODA Bank Statement is a 'read-only' object, hence remaining a "
"reliable representation of the original CODA file\n"
" whereas the Bank Statement will get modified as required by accounting "
"business processes.\n"
"\n"
" CODA Bank Accounts configured as type 'Info' will only generate CODA "
"Bank Statements.\n"
"\n"
" A removal of one object in the CODA processing results in the removal of "
"the associated objects.\n"
" The removal of a CODA File containing multiple Bank Statements will also "
"remove those associated\n"
" statements.\n"
"\n"
" The following reconciliation logic has been implemented in the CODA "
"processing:\n"
" 1) The Company's Bank Account Number of the CODA statement is compared "
"against the Bank Account Number field\n"
" of the Company's CODA Bank Account configuration records (whereby "
"bank accounts defined in type='info' configuration records are ignored).\n"
" If this is the case an 'internal transfer' transaction is generated "
"using the 'Internal Transfer Account' field of the CODA File Import wizard.\n"
" 2) As a second step the 'Structured Communication' field of the CODA "
"transaction line is matched against\n"
" the reference field of in- and outgoing invoices (supported : Belgian "
"Structured Communication Type).\n"
" 3) When the previous step doesn't find a match, the transaction "
"counterparty is located via the\n"
" Bank Account Number configured on the OpenERP Customer and Supplier "
"records.\n"
" 4) In case the previous steps are not successful, the transaction is "
"generated by using the 'Default Account\n"
" for Unrecognized Movement' field of the CODA File Import wizard in "
"order to allow further manual processing.\n"
"\n"
" In stead of a manual adjustment of the generated Bank Statements, you "
"can also re-import the CODA\n"
" after updating the OpenERP database with the information that was "
"missing to allow automatic reconciliation.\n"
"\n"
" Remark on CODA V1 support:\n"
" In some cases a transaction code, transaction category or structured "
"communication code has been given a new or clearer description in CODA V2.\n"
" The description provided by the CODA configuration tables is based upon "
"the CODA V2.2 specifications.\n"
" If required, you can manually adjust the descriptions via the CODA "
"configuration menu.\n"
"\n"
" "
#. module: base
#: model:res.country,name:base.et
openerp/addons/base/i18n/gl.po
+2 -2
View File
@@ -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-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/gu.po
+2 -2
View File
@@ -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-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/he.po
+2 -2
View File
@@ -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-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/hr.po
+2 -2
View File
@@ -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-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
"X-Generator: Launchpad (build 15637)\n"
"Language: hr\n"
#. module: base
openerp/addons/base/i18n/hu.po
+2 -2
View File
@@ -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-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/hy.po
+2 -2
View File
@@ -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-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/id.po
+2 -2
View File
@@ -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-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/is.po
+2 -2
View File
@@ -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-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/it.po
+2 -2
View File
@@ -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-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ja.po
+48 -50
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-06-09 01:13+0000\n"
"PO-Revision-Date: 2012-07-19 05:44+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-20 04:37+0000\n"
"X-Generator: Launchpad (build 15644)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -459,7 +459,7 @@ msgstr "ir.ui.view_sc"
#: field:res.widget.user,widget_id:0
#: field:res.widget.wizard,widgets_list:0
msgid "Widget"
msgstr "ウィジット"
msgstr "ウィジェット"
#. module: base
#: view:ir.model.access:0
@@ -885,7 +885,7 @@ 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
@@ -2042,7 +2042,7 @@ msgstr "優先度"
#. module: base
#: field:workflow.transition,act_from:0
msgid "Source Activity"
msgstr "ソースアクティビティ"
msgstr "元の活動"
#. module: base
#: view:ir.sequence:0
@@ -2435,7 +2435,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
@@ -2514,7 +2514,7 @@ 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
@@ -2704,7 +2704,7 @@ msgstr "アイデア"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_crm
msgid "Opportunity to Quotation"
msgstr "オポチュニティから見積り"
msgstr "商談から見積り"
#. module: base
#: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2782,7 +2782,7 @@ 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
@@ -2895,7 +2895,7 @@ msgstr "マネジャ"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
msgid "Customization"
msgstr "カスタマイゼーション"
msgstr "カスタム化"
#. module: base
#: model:res.country,name:base.py
@@ -3080,7 +3080,7 @@ 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
@@ -4776,9 +4776,9 @@ msgstr ""
"============================================================================="
"=========================\n"
"\n"
"このモジュールを使うことで、あなたのオポチュニティを地理的ローカル化できます。\n"
"このモジュールを使うことで、あなたの商談を地理的ローカル化できます。\n"
"\n"
"オポチュニティをパートナに割り当てる場合に地理的ローカル化を使います。\n"
"商談をパートナに割り当てる場合に、地理的ローカル化を使います。\n"
"パートナの住所によるGPS座標を決定します。\n"
"最も適切なパートナの割り当てが可能です。\n"
"また、GPS座標なしでも地理的ローカル化はできます。\n"
@@ -5871,8 +5871,8 @@ msgid ""
"will automatically attach incoming emails to the right partner."
msgstr ""
"顧客は会社または組織といったビジネス対象の存在です。会社で働く人々のため顧客は複数のコンタクト者や住所を管理できます。顧客と関係する全てのトランザクション"
"をたどるために履歴タブが利用できます：受注、Eメール、オポチュニティ、クレームなど。もし、OutlookやThunderbirdプラグインのEメールゲート"
"ウェイを使う場合、ゲートウェイが自動的に入ってくるEメールを正しいパートナに結びつけるように各コンタクトにEメールを登録することを忘れないで下さい。"
"をたどるために履歴タブが利用できます：受注、Eメール、商談、クレームなど。もし、OutlookやThunderbirdプラグインのEメールゲートウェイを使"
"う場合、ゲートウェイが自動的に入ってくるEメールを正しいパートナに結びつけるように各コンタクトにEメールを登録することを忘れないで下さい。"
#. module: base
#: field:ir.actions.report.xml,name:0
@@ -6002,7 +6002,7 @@ msgstr "南極大陸"
msgid ""
"Source activity. When this activity is over, the condition is tested to "
"determine if we can start the ACT_TO activity."
msgstr "ソースアクティビティ。そのアクティビティを終えた時に、ACT_TO活動を始めるかどうか条件がテストされます。"
msgstr "元の活動。その活動を終えた時に、ACT_TO活動を始めるかどうか条件がテストされます。"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_3
@@ -7797,7 +7797,7 @@ msgstr ""
#. module: base
#: view:res.widget.wizard:0
msgid "Widget Wizard"
msgstr "ウィジットウィザード"
msgstr "ウィジェットウィザード"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -7933,7 +7933,7 @@ msgid ""
" "
msgstr ""
"\n"
"このモジュールはCRMに１つあるいは幾つかのオポチュニティに近道を加えます。\n"
"このモジュールはCRMに１つあるいは幾つかの商談に近道を加えます。\n"
"===========================================================================\n"
"\n"
"この方法は選択されたケースに基づき受注オーダーを作成します。\n"
@@ -8676,7 +8676,7 @@ msgstr ""
"===========================================================================\n"
"\n"
"所定のメールボックスに到着した新しいEメールを元にタスクの生成を許します。\n"
"CRMアプリケーションがリード / オポチュニティを持つものも同様です。\n"
"CRMアプリケーションがリード / 商談を持つものも同様です。\n"
"メールボックス統合の設定のために２つの共通の選択肢があります：\n"
"\n"
" ・ fetchmailモジュールをインストールし、新しいメールボックスを設定し、それから\n"
@@ -8874,7 +8874,7 @@ msgstr ""
#. module: base
#: field:workflow.transition,act_to:0
msgid "Destination Activity"
msgstr "行先のアクティビティ"
msgstr "宛先の活動"
#. module: base
#: help:res.currency,position:0
@@ -9068,7 +9068,7 @@ msgid ""
msgstr ""
"顧客（システムの他のエリアではパートナと呼ばれる）は、彼らが見込み客、顧客であるのか、仕入先であるのかどうか会社の住所録の管理するのを手助けします。パート"
"ナのフォームは、会社のアドレスから、価格リストなどの多くの情報、パートナの連絡先まで相互に必要なすべての情報を追跡し、記録することができます。\r\n"
"CRMをインストールした場合は、履歴タブでパートナと共にオポチュニティ、電子メール、発行された受注など全ての対話を追跡することができます。"
"CRMをインストールした場合は、履歴タブでパートナと共に商談、電子メール、発行された受注など全ての対話を追跡することができます。"
#. module: base
#: model:res.country,name:base.ph
@@ -10257,7 +10257,7 @@ msgstr ""
"\n"
"受注予測の解決のために製品の\"受注履歴\"を使うことができます。\n"
"あなたはこのテーブルの先頭と左のパラメータを入力しなければなりません。そして、システムはそれらのパラメータにより販売数量を計算します。\n"
"そして、所定の販売チームや期間のための結果を得ることができます。\n"
"そして、所定の営業チームや期間のための結果を得ることができます。\n"
"\n"
"MPSまたは調達計画\n"
"---------------------------\n"
@@ -11064,7 +11064,7 @@ msgstr ""
"以下のような多くの電子メール対応のOpenERPドキュメントのために、電子メールベースの\n"
"ワークフローを簡単に作成するために利用することができます：\n"
"\n"
"・ CRMのリード / オポチュニティ\n"
"・ CRMのリード / 商談\n"
"・ CRMのクレーム\n"
"・ プロジェクトの問題\n"
"・ プロジェクトのタスク\n"
@@ -11312,7 +11312,7 @@ msgid ""
" "
msgstr ""
"\n"
"CRMのリードとオポチュニティのためのToDoリスト\n"
"CRMのリードと商談のためのToDoリスト\n"
" "
#. module: base
@@ -11626,7 +11626,7 @@ msgstr "Googleインポート"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_12
msgid "Segmentation"
msgstr "分割"
msgstr "分類"
#. module: base
#: field:res.lang,thousands_sep:0
@@ -12068,7 +12068,7 @@ msgstr ""
"このモジュールはパートナのアドレスの中にGoogleマップ項目を追加します。\n"
"====================================================\n"
"\n"
"これを使うと、URLウィジットからGoogleマップを直接開くことができます。"
"これを使うと、URLウィジェットからGoogleマップを直接開くことができます。"
#. module: base
#: field:workflow.activity,action:0
@@ -12203,7 +12203,7 @@ msgstr "モジュール更新結果"
#: view:workflow.activity:0
#: field:workflow.workitem,act_id:0
msgid "Activity"
msgstr "アクティビティ"
msgstr "活動"
#. module: base
#: view:res.partner:0
@@ -12489,8 +12489,7 @@ msgstr ""
"さまざまな画面のアクションを自動的にトリガーする自動アクションの使用ができます。\n"
"\n"
"例：特定のユーザにより作成されたリードは自動的に特定のセールスチームにセットされたり、\n"
"あるいは14日以上保留状態であるオポチュニティは自動的にリマインダー電子メールの\n"
"トリガーになります。\n"
"あるいは14日以上保留状態である商談は自動的に通知電子メールのトリガーになります。\n"
" "
#. module: base
@@ -12748,9 +12747,8 @@ msgid ""
" \"Contacts\", \"Employees\", Meetings, Phonecalls, Emails, and "
"Project, Project Tasks Data into OpenERP Module."
msgstr ""
"このモジュールはSugarCRMの以下のデータをOpenERPモジュールにインポートします：\n"
"　　リード、オポチュニティ、ユーザ、会計、コンタクト、従業員、ミーティング、\n"
"　　電話、Eメール、プロジェクト、プロジェクトタスク"
"このモジュールはSugarCRMの以下のデータをOpenERPモジュールの中にインポートします：\n"
"　　リード、商談、ユーザ、会計、コンタクト、従業員、ミーティング、電話、Eメール、プロジェクト、プロジェクトタスク"
#. module: base
#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
@@ -14299,7 +14297,7 @@ msgstr "連絡先を隠すためにはアクティブな項目のチェックを
#. module: base
#: model:ir.model,name:base.model_res_widget_wizard
msgid "Add a widget for User"
msgstr "ユーザのウィジットを追加"
msgstr "ユーザのウィジェットを追加"
#. module: base
#: model:res.country,name:base.dk
@@ -15307,7 +15305,7 @@ msgstr "イラン"
#: model:ir.actions.act_window,name:base.res_widget_user_act_window
#: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
msgid "Widgets per User"
msgstr "ユーザ当りのウィジット"
msgstr "ユーザ当りのウィジェット"
#. module: base
#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
@@ -15581,7 +15579,7 @@ msgstr "情報"
#. module: base
#: view:res.widget.user:0
msgid "User Widgets"
msgstr "ユーザウィジット"
msgstr "ユーザウィジェット"
#. module: base
#: view:base.module.update:0
@@ -15655,7 +15653,7 @@ msgstr ""
#: view:workflow:0
#: field:workflow,activities:0
msgid "Activities"
msgstr "アクティビティ"
msgstr "活動"
#. module: base
#: model:ir.module.module,shortdesc:base.module_product
@@ -15867,7 +15865,7 @@ msgstr "DBパスワードの暗号化"
#. module: base
#: help:workflow.transition,act_to:0
msgid "The destination activity."
msgstr "行先のアクティビティ"
msgstr "宛先の活動"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_check_writing
@@ -16388,7 +16386,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_config_lead
msgid "Leads & Opportunities"
msgstr "リードとオポチュニティ"
msgstr "リードと商談"
#. module: base
#: selection:base.language.install,lang:0
@@ -17199,7 +17197,7 @@ msgstr ""
"一般的なOpenERPのCRM（Customer Relationship Management）\n"
"=====================================================\n"
"\n"
"このシステムは人々のグループがリード、オポチュニティ、ミーティング、電話他を知的に効果的に\n"
"このシステムは人々のグループがリード、商談、ミーティング、電話他を知的に効果的に\n"
"管理することを可能にします。これはコミュニケーション、身分証明、優先度付け、割り当て、\n"
"問題解決、通知といった主要なタスクを管理します。\n"
"\n"
@@ -17216,8 +17214,8 @@ msgstr ""
"Eメールゲートウェイを持ちます。\n"
"\n"
"CRMのために作成されるダッシュボードは次のものを含みます：\n"
"　・ 分類別のオポチュニティ（グラフ）\n"
"　・ 工程別のオポチュニティ（グラフ）\n"
"　・ 分類別の商談（グラフ）\n"
"　・ 工程別の商談（グラフ）\n"
"　・ 工程とユーザ別の計画収益（グラフ）\n"
#. module: base
@@ -17623,14 +17621,14 @@ msgstr "機能"
#. module: base
#: view:res.widget:0
msgid "Search Widget"
msgstr "ウィジットの検索"
msgstr "ウィジェットの検索"
#. module: base
#: model:ir.module.category,description:base.module_category_customer_relationship_management
msgid ""
"Manage relations with prospects and customers using leads, opportunities, "
"requests or issues."
msgstr "リード、オポチュニティ、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
msgstr "リード、商談、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
#. module: base
#: selection:res.partner.address,type:0
@@ -17744,7 +17742,7 @@ msgstr "受発注のドキュメントの内容に応じて、自動的に正し
#: model:ir.actions.act_window,name:base.res_widget_act_window
#: model:ir.ui.menu,name:base.menu_res_widget_act_window
msgid "Homepage Widgets"
msgstr "ホームページウィジット"
msgstr "ホームページウィジェット"
#. module: base
#: help:res.company,rml_footer2:0
@@ -17817,23 +17815,23 @@ msgid ""
" "
msgstr ""
"\n"
"このモジュールは何の開発もなしで新しいモジュールの作成ができます。\n"
"このモジュールは何の開発もなしに新しいモジュールの作成ができます。\n"
"======================================================================\n"
"\n"
"これは記録セッションの中でオブジェクトの全ての操作を記録します。そして、\n"
".ZIPモジュールを生成します。それによって、OpenERPクライアントから直接\n"
"独自モジュールを作成することができます。\n"
"\n"
"このバージョンは作成と既存のレコードの更新にために動作します。それは依存関係と、\n"
"全てのウィジットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
"このバージョンは作成と既存のレコードの更新のために動作します。それは依存関係と、\n"
"全てのウィジェットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
"また、ワークフローとデモ / 更新データもサポートします。\n"
"\n"
"カスタム設定とデモ / テストデータのために、簡単に再利用と公表可能なモジュールを\n"
"作成するために役立つはずです。\n"
"\n"
"利用方法：\n"
"モジュールウィザードの アドミニストレーション/カスタマイゼーション/モジュール \n"
"作成/エクスポート カスタマイゼーション を実行します。\n"
"モジュールウィザードの アドミニストレーション/カスタム化/モジュール \n"
"作成/エクスポート カスタム化 を実行します。\n"
"記録の日時の基準、記録されるオブジェクト、記録モジュールを選択します。\n"
" "
openerp/addons/base/i18n/ka.po
+2 -2
View File
@@ -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-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/kk.po
+2 -2
View File
@@ -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-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ko.po
+2 -2
View File
@@ -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-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/lt.po
+2 -2
View File
@@ -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-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/lv.po
+39 -33
View File
@@ -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-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -107,6 +107,8 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
"Palīdz pārvaldīt projektus un uzdevumus, tiem sekojot, ģenerējot plānojumus "
"utt."
#. module: base
#: field:ir.actions.act_window,display_menu_tip:0
@@ -220,7 +222,7 @@ msgstr "Svazilenda"
#: code:addons/orm.py:4206
#, python-format
msgid "created."
msgstr ""
msgstr "izveidots."
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -264,7 +266,7 @@ msgstr ""
#: model:ir.module.category,name:base.module_category_sales_management
#: model:ir.module.module,shortdesc:base.module_sale
msgid "Sales Management"
msgstr ""
msgstr "Tirdzniecības Vadība"
#. module: base
#: view:res.partner:0
@@ -365,7 +367,7 @@ msgstr ""
#. module: base
#: model:ir.module.category,name:base.module_category_customer_relationship_management
msgid "Customer Relationship Management"
msgstr ""
msgstr "Klientu Attiecību Vadība (CRM)"
#. module: base
#: view:ir.module.module:0
@@ -693,7 +695,7 @@ msgstr "Exports veikts"
#. module: base
#: model:ir.module.module,shortdesc:base.module_plugin_outlook
msgid "Outlook Plug-In"
msgstr ""
msgstr "Outlook spraudnis"
#. module: base
#: view:ir.model:0
@@ -1057,7 +1059,7 @@ msgstr "Tips"
#. module: base
#: field:ir.mail_server,smtp_user:0
msgid "Username"
msgstr ""
msgstr "Lietotājvārds"
#. module: base
#: code:addons/orm.py:398
@@ -1205,7 +1207,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_import_sugarcrm
msgid "SugarCRM Import"
msgstr ""
msgstr "SugarCRM Imports"
#. module: base
#: view:res.lang:0
@@ -1228,7 +1230,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_tests
msgid "Tests"
msgstr ""
msgstr "Pārbaudes"
#. module: base
#: field:ir.ui.view_sc,res_id:0
@@ -1355,7 +1357,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_sequence
msgid "Entries Sequence Numbering"
msgstr ""
msgstr "Ierakstu Kārtas Numerācija"
#. module: base
#: model:ir.model,name:base.model_ir_exports
@@ -1461,6 +1463,8 @@ msgid ""
"Helps you manage your purchase-related processes such as requests for "
"quotations, supplier invoices, etc..."
msgstr ""
"Palīdz pārvaldīt ar iepirkumiem saistītus procesus, kā pieprasījumus pēc "
"cenas piedāvājumiem, piegādātāju rēķinus utt."
#. module: base
#: help:base.language.install,overwrite:0
@@ -1556,7 +1560,7 @@ msgstr "Float"
#: model:ir.module.category,name:base.module_category_warehouse_management
#: model:ir.module.module,shortdesc:base.module_stock
msgid "Warehouse Management"
msgstr ""
msgstr "Noliktavas Vadība"
#. module: base
#: model:ir.model,name:base.model_res_request_link
@@ -1585,7 +1589,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_lu
msgid "Luxembourg - Accounting"
msgstr ""
msgstr "Luksemburga - Grāmatvedība"
#. module: base
#: model:res.country,name:base.tp
@@ -1987,12 +1991,12 @@ msgstr "Somija"
#: code:addons/base/res/res_company.py:156
#, python-format
msgid "Website: "
msgstr ""
msgstr "Vietne: "
#. module: base
#: model:ir.ui.menu,name:base.menu_administration
msgid "Settings"
msgstr ""
msgstr "Uzstādījumi"
#. module: base
#: selection:ir.actions.act_window,view_type:0
@@ -2093,7 +2097,7 @@ msgstr "Logotips"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_cr
msgid "Costa Rica - Accounting"
msgstr ""
msgstr "Kostarika - Grāmatvedība"
#. module: base
#: view:ir.module.module:0
@@ -2166,7 +2170,7 @@ msgstr "Jaunināto moduļu skaits"
#. module: base
#: field:ir.cron,function:0
msgid "Method"
msgstr ""
msgstr "Metode"
#. module: base
#: view:res.partner.event:0
@@ -2300,7 +2304,7 @@ msgstr ""
#. module: base
#: field:ir.mail_server,smtp_debug:0
msgid "Debugging"
msgstr ""
msgstr "Atkļūdošana"
#. module: base
#: model:ir.module.module,description:base.module_crm_helpdesk
@@ -2410,12 +2414,12 @@ msgstr "Esošā Likme"
#. module: base
#: model:ir.module.module,shortdesc:base.module_idea
msgid "Ideas"
msgstr ""
msgstr "Idejas"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_crm
msgid "Opportunity to Quotation"
msgstr ""
msgstr "Konvertēt Potenciālo darījumu uz Cenas Pieprasījumu"
#. module: base
#: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2452,7 +2456,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_invoiced
msgid "Invoicing"
msgstr ""
msgstr "Rēķinu izrakstīšana"
#. module: base
#: field:ir.ui.view_sc,name:0
@@ -2577,7 +2581,7 @@ msgstr ""
#: model:res.groups,name:base.group_sale_manager
#: model:res.groups,name:base.group_tool_manager
msgid "Manager"
msgstr ""
msgstr "Menedžeris"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -2627,6 +2631,8 @@ msgid ""
"Lets you install various tools to simplify and enhance OpenERP's report "
"creation."
msgstr ""
"Ļauj instalēt dažādus rīkus, lai vienkāršotu un uzlabotu OpenERP atskaišu "
"izveidi."
#. module: base
#: view:res.lang:0
@@ -2637,7 +2643,7 @@ msgstr "%y - Gads bez gadsimta [00,99]."
#: code:addons/base/res/res_company.py:155
#, python-format
msgid "Fax: "
msgstr ""
msgstr "Fakss: "
#. module: base
#: model:res.country,name:base.si
@@ -2647,7 +2653,7 @@ msgstr "Slovēnija"
#. module: base
#: help:res.currency,name:0
msgid "Currency Code (ISO 4217)"
msgstr ""
msgstr "Valūtas kods (ISO 4217)"
#. module: base
#: model:ir.actions.act_window,name:base.res_log_act_window
@@ -2769,7 +2775,7 @@ msgstr ""
#: field:ir.module.module,application:0
#: field:res.groups,category_id:0
msgid "Application"
msgstr ""
msgstr "Programma"
#. module: base
#: selection:publisher_warranty.contract,state:0
@@ -2963,7 +2969,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
msgid "Wiki: Quality Manual"
msgstr ""
msgstr "Wiki: Kvalitātes rokasgrāmata"
#. module: base
#: selection:ir.actions.act_window.view,view_mode:0
@@ -2991,7 +2997,7 @@ msgstr "HR Sektors"
#. module: base
#: model:ir.ui.menu,name:base.menu_dashboard_admin
msgid "Administration Dashboard"
msgstr ""
msgstr "Administrēšanas instrumentu panelis"
#. module: base
#: code:addons/orm.py:4408
@@ -3076,7 +3082,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_contract
msgid "Employee Contracts"
msgstr ""
msgstr "Darbinieku līgumi"
#. module: base
#: model:ir.module.module,description:base.module_wiki_faq
@@ -3140,7 +3146,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_survey
msgid "Survey"
msgstr ""
msgstr "Aptauja"
#. module: base
#: view:base.language.import:0
@@ -3432,7 +3438,7 @@ msgstr ""
#: model:ir.module.category,name:base.module_category_generic_modules_accounting
#: view:res.company:0
msgid "Accounting"
msgstr ""
msgstr "Grāmatvedība"
#. module: base
#: model:ir.module.module,description:base.module_account_payment
@@ -15131,7 +15137,7 @@ msgstr "Partneri: "
#. module: base
#: field:res.partner.bank,name:0
msgid "Bank Account"
msgstr ""
msgstr "Bankas Konts"
#. module: base
#: model:res.country,name:base.kp
@@ -15147,7 +15153,7 @@ msgstr "Izveidot Objektu"
#: view:ir.filters:0
#: field:res.log,context:0
msgid "Context"
msgstr ""
msgstr "Konteksts"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_mrp
@@ -15162,12 +15168,12 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_1
msgid "Prospect"
msgstr ""
msgstr "Nākotnes Plāni"
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
msgid "Invoice Picking Directly"
msgstr ""
msgstr "Rēķina Izrakstīšana, Piegādājot preci"
#. module: base
#: selection:base.language.install,lang:0
openerp/addons/base/i18n/mk.po
+2 -2
View File
@@ -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-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/mn.po
+1329 -148
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/nb.po
+2 -2
View File
@@ -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-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/nl.po
+94 -7
View File
@@ -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-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -71,6 +71,18 @@ msgid ""
" * Graph of My Remaining Hours by Project\n"
" "
msgstr ""
"\n"
"Projectmanagement module voor het beheren van muti-level projecten, taken, "
"gewerkte tijd op taken, etc.\n"
"\n"
"Het is mogelijk om planningen en taakopdrachten te genereren\n"
"\n"
"Dashboard voor projectmedewerkers, welke bevat:\n"
"* Lijst van open taken\n"
"* Lijst van gedeligeerde taken\n"
"* Grafiek van mijn projecten, geplande en totale uren\n"
"* Grafiek van mijn resterende uren per project\n"
" "
#. module: base
#: field:base.language.import,code:0
@@ -121,6 +133,7 @@ msgstr "Toon menu tips"
msgid ""
"Model name on which the method to be called is located, e.g. 'res.partner'."
msgstr ""
"Modelnaam van the methode welke wordt aangeroepen, bijv. 'res.partner'."
#. module: base
#: view:ir.module.module:0
@@ -146,6 +159,8 @@ msgid ""
"\n"
"This module allows you to create retro planning for managing your events.\n"
msgstr ""
"\n"
"Organisatie en beheer van evenementen.\n"
#. module: base
#: help:ir.model.fields,domain:0
@@ -220,7 +235,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 "Hiernoenen sparse field \"%s\" is niet toegestaan"
#. module: base
#: model:res.country,name:base.sz
@@ -362,6 +377,10 @@ msgid ""
" complex data from other software\n"
" "
msgstr ""
"\n"
" Deze module stelt een import klasse beschikbaar welke gebruikt\n"
" kan worden om complex data van andere software te importeren\n"
" "
#. module: base
#: field:ir.actions.wizard,wiz_name:0
@@ -820,6 +839,10 @@ msgid ""
"Launch Manually Once: after hacing been launched manually, it sets "
"automatically to Done."
msgstr ""
"Handmatig: Start handmatig.\n"
"Automatisch: Start wanneer het systeem is geconfigureerd.\n"
"Start eenmalig handmatig: Nadat handmatig gestart, wordt deze automatisch op "
"klaar gezet."
#. module: base
#: selection:base.language.install,lang:0
@@ -898,6 +921,8 @@ msgid ""
"The module adds google contact in partner address and add google calendar "
"events details in Meeting"
msgstr ""
"Deze module voegt Google contact[ersonen in relatie adressen en voegt Google "
"agenda items details in OpenERP agenda."
#. module: base
#: view:res.users:0
@@ -1177,6 +1202,20 @@ msgid ""
"At the end of the month, the planning manager can also check if the encoded "
"timesheets are respecting the planned time on each analytic account.\n"
msgstr ""
"Met deze module kunt u, uw planningen beheren.\n"
"========================================\n"
"\n"
"Deze module is gebaseerd op kostenplaatsen en is geheel geïntegreerd met:\n"
"* Urenstaten\n"
"* Vakantiedagen\n"
"* projectmanagement\n"
"\n"
"Op deze wijze kan iedere afdelingsmanager zien of iemand van zijn team nog "
"niet verwerkte uren heeft voor een bepaalde planning (rekening houdende met "
"geaccordeerde afwezigheid) of nog uren moet indienen.\n"
"\n"
"Aan het einde van de maand kan de planningsmanager de ingediende uren en de "
"geplande uren controleren op de kostenplaats.\n"
#. module: base
#: selection:ir.property,type:0
@@ -1373,6 +1412,11 @@ msgid ""
"use the accounting application of OpenERP, journals and accounts will be "
"created automatically based on these data."
msgstr ""
"Stel uw bankrekeningnummers van uw bedrijf in en selecteer degene welke op "
"uw rapportvoet moeten worden afgedrukt. U kunt de bankrekeningnummers "
"sorteren in de lijst. Indien u gebruik maakt van de boekhouding in OpenERP, "
"dan worden dagboeken en rekeningen automatisch aangemaakt op basis van deze "
"gegevens."
#. module: base
#: view:ir.module.module:0
@@ -1392,6 +1436,14 @@ msgid ""
" * Commitment Date\n"
" * Effective Date\n"
msgstr ""
"\n"
"deze module voegt extra informatie toe aan een verkooporder.\n"
"===================================================\n"
"\n"
"U kunt de navolgende extra data toevoegen aan een verkooporder:\n"
"* Aanvraagdatum\n"
"* Bevestigde datum\n"
"* Effectieve datum\n"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -1433,6 +1485,25 @@ msgid ""
"database,\n"
" but in the servers rootpad like /server/bin/filestore.\n"
msgstr ""
"\n"
"deze module voegt een compleet Document Management Systeem (DMS) toe.\n"
"================================================================\n"
"* Gebruikerstoegang\n"
"* Document indexeren. Opmerking: .pptx en docx bestanden worden niet "
"ondersteund\n"
"* Dashboard voor documenten, met:\n"
" * Nieuwe bestanden (lijst)\n"
" * Bestanden per resource type (grafiek)\n"
" * Bestanden per relatie (grafiek)\n"
" * Bestandgrootte per maand (grafiek)\n"
"\n"
"Opmerking:\n"
"* Wanneer u deze module installeert in een bedrijf wat al gebruik maakt van "
"OpenERP, zullen bestaande PDF bestanden, welke zijn opgeslagen in de "
"database verloren gaan.\n"
"* Na installatie van deze module worden PDF bestanden niet langer opgeslagen "
"in de database, maar in een map van de server, zoals bijv.: "
"server/bin/filestore.\n"
#. module: base
#: view:res.lang:0
@@ -1597,6 +1668,9 @@ msgid ""
" - You can define new types of events in\n"
" Association / Configuration / Types of Events\n"
msgstr ""
"\n"
"Organisatie en beheer van evenementen.\n"
"=================================\n"
#. module: base
#: model:ir.ui.menu,name:base.menu_tools
@@ -1715,6 +1789,10 @@ msgid ""
" Apply Different Category for the product.\n"
" "
msgstr ""
"\n"
" Met deze module kunt u lunches beheren.\n"
"==================================\n"
" "
#. module: base
#: model:res.country,name:base.kg
@@ -2078,7 +2156,7 @@ msgstr "Boomstructuur"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_multicurrency
msgid "Multi-Currency in Analytic"
msgstr ""
msgstr "Meerdere valuta in kostenplaatsen"
#. module: base
#: view:base.language.export:0
@@ -2197,6 +2275,10 @@ msgid ""
"re-invoice your customer's expenses if your work by project.\n"
" "
msgstr ""
"\n"
"Beheer van personeel declaraties.\n"
"============================\n"
" "
#. module: base
#: field:ir.values,action_id:0
@@ -6059,7 +6141,7 @@ msgstr "Officiële vertaling laden"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_cancel
msgid "Cancel Journal Entries"
msgstr "Annuleer journaalpsoten"
msgstr "Annuleer journaalposten"
#. module: base
#: view:ir.actions.server:0
@@ -7764,6 +7846,9 @@ msgid ""
" Module for the Check writing and check printing \n"
" "
msgstr ""
"\n"
" Module voor het aanmaken en afdrukken van cheques \n"
" "
#. module: base
#: model:res.partner.bank.type,name:base.bank_normal
@@ -8095,6 +8180,8 @@ msgid ""
"\n"
" * Share meeting with other calendar clients like sunbird\n"
msgstr ""
"\n"
"Deel uw CRM afspraken door gebruik te maken van CalDAV\n"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_iban
@@ -8373,7 +8460,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account
msgid "eInvoicing"
msgstr "eFactureren"
msgstr "Boekhouding"
#. module: base
#: model:ir.module.module,description:base.module_association
@@ -13964,7 +14051,7 @@ msgstr "De doel activiteit"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_check_writing
msgid "Check writing"
msgstr ""
msgstr "Cheques maken"
#. module: base
#: model:ir.module.module,description:base.module_sale_layout
openerp/addons/base/i18n/nl_BE.po
+2 -2
View File
@@ -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-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pl.po
+2 -2
View File
@@ -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-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pt.po
+2 -2
View File
@@ -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-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pt_BR.po
+2 -2
View File
@@ -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-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ro.po
+2 -2
View File
@@ -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-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ru.po
+2 -2
View File
@@ -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-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sk.po
+2 -2
View File
@@ -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-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sl.po
+2 -2
View File
@@ -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-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sq.po
+2 -2
View File
@@ -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-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sr.po
+2 -2
View File
@@ -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-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sr@latin.po
+2 -2
View File
@@ -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-06-27 05:28+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:46+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sv.po
+135 -39
View File
@@ -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-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -893,7 +893,7 @@ msgstr "Albanien / Shqip"
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
msgid "Opportunities"
msgstr "Opportunities"
msgstr "Affärsmöjligheter"
#. module: base
#: model:ir.model,name:base.model_base_language_export
@@ -923,6 +923,8 @@ msgid ""
"The module adds google contact in partner address and add google calendar "
"events details in Meeting"
msgstr ""
"Modulen lägger till google-kontakter i företagsadresser och lägger till "
"googlekalenderhändelser i möteskalendern"
#. module: base
#: view:res.users:0
@@ -1628,8 +1630,8 @@ msgid ""
"Access all the fields related to the current object using expressions, i.e. "
"object.partner_id.name "
msgstr ""
"represenrerar ett blanksteg. Skriver in ett blanksteg i motsvarande position "
"i översättningen "
"Tillgång till alla fält relaterade till aktuellt objekt via uttryck, "
"exempelvis object.partner_id.name "
#. module: base
#: model:ir.module.module,description:base.module_event
@@ -1989,7 +1991,7 @@ msgstr "7. %H:%M:%S ==> 18:25:20"
#: view:res.partner.category:0
#: field:res.partner.category,partner_ids:0
msgid "Partners"
msgstr "Partners"
msgstr "Företag"
#. module: base
#: field:res.partner.category,parent_left:0
@@ -2348,7 +2350,7 @@ msgstr "aktiv"
#, python-format
msgid ""
"Couldn't generate the next id because some partners have an alphabetic id !"
msgstr "Kan inte skapa nästa id eftersom partnern har ett alfanumeriskt id."
msgstr "Kan inte skapa nästa id eftersom företaget har ett alfanumeriskt id."
#. module: base
#: view:ir.attachment:0
@@ -2971,9 +2973,9 @@ msgid ""
"partner records. You can create or delete countries to make sure the ones "
"you are working on will be maintained."
msgstr ""
"Visa och hantera listan av alla länder som kan bli tilldelade dina partners "
"uppgifter. Du kan skapa eller ta bort länder så att du är säker på att de "
"som du jobbar på kommer att underhållas."
"Visa och hantera listan av alla länder som kan bli tilldelade dina "
"företagsuppgifter. Du kan skapa eller ta bort länder så att du är säker på "
"att de som du jobbar på kommer att underhållas."
#. module: base
#: model:res.partner.category,name:base.res_partner_category_7
@@ -3242,7 +3244,7 @@ msgstr "Kalender"
#. module: base
#: field:res.partner.address,partner_id:0
msgid "Partner Name"
msgstr "Partnernamn"
msgstr "Företagsnamn"
#. module: base
#: field:workflow.activity,signal_send:0
@@ -3484,7 +3486,7 @@ msgstr "Fältmappning"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_dashboard
msgid "web Dashboard"
msgstr ""
msgstr "Webbinfopanel"
#. module: base
#: model:ir.module.module,description:base.module_sale
@@ -3842,9 +3844,9 @@ msgid ""
"loading a new language it becomes available as default interface language "
"for users and partners."
msgstr ""
"Den har wizarden hjälper dig med att lägga till ett nytt språk i ditt "
"OpenERP system. Efter att språket laddats in blir det tillgängligt för "
"användare och partners."
"Den har guiden hjälper dig med att lägga till ett nytt språk i ditt OpenERP-"
"system. Efter att språket laddats in blir det tillgängligt för användare och "
"företag."
#. module: base
#: view:ir.model:0
@@ -3857,7 +3859,7 @@ msgid ""
"Value Added Tax number. Check the box if the partner is subjected to the "
"VAT. Used by the VAT legal statement."
msgstr ""
"Momsnummer. Markera denna om partnern skall ha moms. Används av "
"Momsnummer. Markera denna om företaget skall debiteras moms. Används av "
"momsrapporten."
#. module: base
@@ -4265,7 +4267,7 @@ msgstr "Åtgärdsbeskriivning"
#. module: base
#: help:res.partner,customer:0
msgid "Check this box if the partner is a customer."
msgstr "Markera denna om partnern är en kund."
msgstr "Markera denna om företaget är en kund."
#. module: base
#: help:ir.module.module,auto_install:0
@@ -4344,8 +4346,8 @@ msgid ""
"If the selected language is loaded in the system, all documents related to "
"this partner will be printed in this language. If not, it will be english."
msgstr ""
"Om det valda språket has installerats i systemet skriva alla dokumnet "
"relaterade till partnern i detta språk. Annars används engelska."
"Om det valda språket has installerats i systemet används detta språk för "
"alla dokument till företaget. Annars används engelska."
#. module: base
#: report:ir.module.reference.graph:0
@@ -4503,6 +4505,19 @@ msgid ""
"You can also use the geolocalization without using the GPS coordinates.\n"
" "
msgstr ""
"\n"
"Denna modul används av OpenERP SA för att omdirigera kunder till sina "
"företag, baserat på geolokalisering.\n"
"============================================================================="
"=======\n"
"\n"
"Du kan geolocalize dina affärsmöjligheter med hjälp av denna modul.\n"
"\n"
"Använd geolokalisering när du tilldelar affärsmöjligheter till företag.\n"
"Bestäm GPS-koordinater enligt företagsadress .\n"
"Det mest lämpliga företaget kan tilldelas.\n"
"Du kan också använda geolokalisering utan att använda GPS-koordinater.\n"
" "
#. module: base
#: help:ir.actions.act_window,help:0
@@ -5262,6 +5277,13 @@ msgid ""
"revenue\n"
"reports, etc."
msgstr ""
"Generera dina fakturor från Utgifter, Tidrapporter ...\n"
"Modul för att skapa fakturor baserade på kostnader (personal, utgifter, "
"...).\n"
"================================================== ========\n"
"\n"
"Du kan definiera prislistor i objektkonto, göra några teoretiska intäkts-\n"
"rapporter etc."
#. module: base
#: field:ir.ui.menu,parent_id:0
@@ -5456,13 +5478,13 @@ msgid ""
"The internal user that is in charge of communicating with this partner if "
"any."
msgstr ""
"Den interna användare som hanterar kommunikationen med denna partner, om "
"Den interna användare som hanterar kommunikationen med detta företag, om "
"sådan finns."
#. module: base
#: field:res.partner,parent_id:0
msgid "Parent Partner"
msgstr "Överliggande partner"
msgstr "Överliggande företag"
#. module: base
#: view:ir.module.module:0
@@ -5614,7 +5636,7 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_3
msgid "Starter Partner"
msgstr ""
msgstr "Startföretag"
#. module: base
#: help:ir.model.fields,relation_field:0
@@ -6296,6 +6318,25 @@ msgid ""
"an other object.\n"
" "
msgstr ""
"\n"
"Den här modulen låter dig hantera dina kontakter\n"
"=======================================\n"
"\n"
"Det låter dig definiera:\n"
"* Kontakter utan samband med ett företag,\n"
"* Kontaktuppgifter arbetar på flera adresser (eventuellt för olika "
"företag),\n"
"* Kontakter med eventuellt olika funktioner för varje jobbadress\n"
"\n"
"Det ger också nya menyalternativ i\n"
"Inköp / adressbok / kontakter\n"
"Försäljning / adressbok / kontakter\n"
"\n"
"Uppmärksamma att denna modul omvandlar de befintliga adresserna till "
"\"adresser + kontakter\". Det innebär att vissa områden adresserna kommer "
"att saknas (som kontaktens namn), eftersom dessa är tänkta att definieras i "
"ett annat objekt.\n"
" "
#. module: base
#: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -6687,7 +6728,7 @@ msgstr "Botswana"
#: model:ir.ui.menu,name:base.menu_partner_title_partner
#: view:res.partner.title:0
msgid "Partner Titles"
msgstr "Partnertitlar"
msgstr "Företagstitlar"
#. module: base
#: help:ir.actions.act_window,auto_refresh:0
@@ -6697,7 +6738,7 @@ msgstr "Lägg till autouppdatering till vyn."
#. module: base
#: help:res.partner,employee:0
msgid "Check this box if the partner is an Employee."
msgstr "Markera denna om partnern är en anställd."
msgstr "Markera denna om företaget också är en anställd."
#. module: base
#: model:ir.module.module,shortdesc:base.module_crm_profiling
@@ -7483,7 +7524,7 @@ msgstr ""
#. module: base
#: field:res.partner,title:0
msgid "Partner Firm"
msgstr ""
msgstr "Företagsform"
#. module: base
#: model:ir.actions.act_window,name:base.action_model_fields
@@ -7949,6 +7990,24 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Denna modul kan automatiskt skapa projektaktiviteter baserat på inkommande e-"
"post\n"
"===================================================================\n"
"\n"
"Tillåter dig att skapa uppgifter baserat på nya e-postmeddelanden som kommer "
"till en viss brevlåda,\n"
"likhet med vad CRM programmet har för kundämnen / affärsmöjligheter.\n"
"Det finns två vanliga alternativ för att konfigurera brevlådeintegrationen:\n"
"\n"
"* Installera `` fetchmail `` modul och konfigurera en ny brevlåda, välj "
"sedan\n"
"`` Projektaktiviteter `` som mål för inkommande e-post.\n"
"* Ställ in det manuellt på e-postservern baserat på \"post-gateway\" script\n"
"ges i `` mail `` modul - och anslut den till `project.task` modell.\n"
"\n"
"\n"
" "
#. module: base
#: model:ir.module.module,description:base.module_membership
@@ -9507,7 +9566,7 @@ msgstr "Användargränssnitt"
#: field:res.partner,child_ids:0
#: field:res.request,ref_partner_id:0
msgid "Partner Ref."
msgstr "Partnerref."
msgstr "Företagsreferense"
#. module: base
#: field:ir.attachment,create_date:0
@@ -9967,6 +10026,35 @@ msgid ""
"module named account_voucher.\n"
" "
msgstr ""
"\n"
"Redovisning och ekonomisk förvaltning.\n"
"===============================\n"
"\n"
"Ekonomi och redovisning modul som omfattar:\n"
"----------------------------------------------------------------\n"
"allmänna Redovisningen\n"
"Kostnad / Analytisk redovisning\n"
"Tredjepart redovisning\n"
"skattehantering\n"
"budgetar\n"
"Kund-och leverantörsfakturor\n"
"kontoutdrag\n"
"Avstämning av företag\n"
"\n"
"Skapar en instrumentpanel för revisorer som innehåller:\n"
"-----------------------------------------------------------------------------"
"\n"
"* Lista över kundfakturor att godkänna\n"
"* Företagsanalys\n"
"* Graf över kassaflödet\n"
"* Graf över finanserna\n"
"\n"
"De processer som upprätthåller huvudboken sker genom de definierade "
"finansiella journal (bokföringsregler eller\n"
"gruppering upprätthålls genom journalen) för ett visst budgetår och för "
"beredning av bokföringsorder finns \n"
"modulen account_voucher.\n"
" "
#. module: base
#: help:ir.actions.act_window,view_type:0
@@ -10834,8 +10922,8 @@ msgid ""
"Manage the partner titles you want to have available in your system. The "
"partner titles is the legal status of the company: Private Limited, SA, etc."
msgstr ""
"Hantera titlarna på systemets partner, som avspeglar deras legala status: "
"AB, kommun, stiftelse etc."
"Hantera systemets företagsformer, som avspeglar deras legala status: AB, "
"kommun, stiftelse etc."
#. module: base
#: view:base.language.export:0
@@ -11579,7 +11667,7 @@ msgstr ""
#. module: base
#: model:res.partner.category,name:base.res_partner_category_2
msgid "OpenERP Partners"
msgstr "OpenERP Partners"
msgstr "OpenERP-partner"
#. module: base
#: code:addons/base/module/module.py:293
@@ -12330,7 +12418,7 @@ msgstr "Guldpartner"
#: selection:res.partner.title,domain:0
#: model:res.request.link,name:base.req_link_partner
msgid "Partner"
msgstr "Partner"
msgstr "Företag"
#. module: base
#: field:ir.model.fields,complete_name:0
@@ -12705,7 +12793,7 @@ msgstr "Villkor"
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_other_form
msgid "Other Partners"
msgstr "Övriga partners"
msgstr "Övriga företag"
#. module: base
#: model:ir.actions.act_window,name:base.action_currency_form
@@ -12825,7 +12913,7 @@ msgstr "Estland"
#: model:ir.module.module,shortdesc:base.module_board
#: model:ir.ui.menu,name:base.menu_dashboard
msgid "Dashboards"
msgstr "Startsidor"
msgstr "Infopaneler"
#. module: base
#: model:ir.module.module,shortdesc:base.module_procurement
@@ -13037,7 +13125,7 @@ msgstr ""
#. module: base
#: view:res.partner.category:0
msgid "Partner Category"
msgstr "Partnerkategori"
msgstr "Företagskategori"
#. module: base
#: view:ir.actions.server:0
@@ -14271,7 +14359,7 @@ msgstr "Källa"
#: help:res.partner.address,partner_id:0
msgid "Keep empty for a private address, not related to partner."
msgstr ""
"Lämna blank om det är en privat adress som inte ska kopplas till en partner."
"Lämna blank om det är en privatadress som inte ska kopplas till ett företag."
#. module: base
#: model:res.country,name:base.vu
@@ -14382,8 +14470,8 @@ msgid ""
"Check this box if the partner is a supplier. If it's not checked, purchase "
"people will not see it when encoding a purchase order."
msgstr ""
"Markera den här rutan om partnern är en leverantör. Om den inte är markerar "
"så kommer partnern inte visas när man väljer leverantör på en inköpsorder."
"Markera den här rutan om företaget är en leverantör. Om den inte är markerar "
"så kommer företaget inte visas när man väljer leverantör på en inköpsorder."
#. module: base
#: field:ir.actions.server,trigger_obj_id:0
@@ -14555,7 +14643,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_config_lead
msgid "Leads & Opportunities"
msgstr "Leads & Opportunities"
msgstr "Kundämnen och affärsmöjligheter"
#. module: base
#: selection:base.language.install,lang:0
@@ -15061,6 +15149,10 @@ msgid ""
"categories have a hierarchy structure: a partner belonging to a category "
"also belong to his parent category."
msgstr ""
"Hantera företagskategorier för att bättre klassificera dem för spårning och "
"analyssyften. Ett företag kan tillhöra flera kategorier och kategorier har "
"en hierarkisk struktur: en företag som tillhör en kategori hör också till "
"överordnade kategorin."
#. module: base
#: model:res.country,name:base.az
@@ -15165,6 +15257,10 @@ msgid ""
"uncheck the 'Suppliers' filter button in order to search in all your "
"partners, including customers and prospects."
msgstr ""
"Du kan komma åt all information om dina leverantörer från "
"leverantörsformuläret: redovisningsdata, historik av e-post, möten, inköp "
"etc. Du kan avmarkera leverantörsfilterknappen för att söka i alla dina "
"företag, däribland kunder och kundämnen."
#. module: base
#: model:res.country,name:base.rw
@@ -15597,7 +15693,7 @@ msgstr "Mobilnr"
#: model:ir.ui.menu,name:base.menu_partner_category_form
#: view:res.partner.category:0
msgid "Partner Categories"
msgstr "Partnerkategorier"
msgstr "Företagskategorier"
#. module: base
#: view:base.module.upgrade:0
@@ -15740,7 +15836,7 @@ msgstr "Arbetsflödeinstanser"
#: code:addons/base/res/res_partner.py:284
#, python-format
msgid "Partners: "
msgstr "Partners "
msgstr "Företag: "
#. module: base
#: field:res.partner.bank,name:0
openerp/addons/base/i18n/th.po
+2 -2
View File
@@ -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-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/tlh.po
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2009-11-30 07:48+0000\n"
"Last-Translator: <>\n"
"PO-Revision-Date: 2012-07-10 17:36+0000\n"
"Last-Translator: Felix Malmenbeck <felixm@kth.se>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -24,7 +24,7 @@ msgstr ""
#. module: base
#: view:ir.actions.report.xml:0
msgid "Other Configuration"
msgstr ""
msgstr "latlh Qur"
#. module: base
#: selection:ir.property,type:0
openerp/addons/base/i18n/tr.po
+2 -2
View File
@@ -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-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/uk.po
+2 -2
View File
@@ -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-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ur.po
+2 -2
View File
@@ -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-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/vi.po
+2 -2
View File
@@ -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-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/zh_CN.po
+2 -2
View File
@@ -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-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/zh_HK.po
+2 -2
View File
@@ -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-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/zh_TW.po
+2 -2
View File
@@ -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-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
"X-Generator: Launchpad (build 15637)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/ir/ir.xml
+115 -117
View File
@@ -9,21 +9,19 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action Bindings" version="7.0">
<sheet>
<group>
<group string="Action Binding">
<group>
<field name="name"/>
<field name="model_id" on_change="onchange_object_id(model_id)"/>
<field name="model"/>
<field name="res_id"/>
<field name="key2"/>
</group>
<group string="Action">
<group>
<field name="action_id" on_change="onchange_action_id(action_id)"/>
<field name="value_unpickle" colspan="4" string="Action Reference"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
@@ -34,24 +32,19 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User-defined Defaults" version="7.0">
<sheet>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group>
<group string="Model">
<field name="model_id" on_change="onchange_object_id(model_id)"/>
<group>
<field name="name"/>
<field name="model"/>
<field name="key2" string="Condition"/>
</group>
<group string="Default Value">
<field name="model_id" on_change="onchange_object_id(model_id)"/>
<field name="value_unpickle" nolabel="1"/>
</group>
<group string="Default Value Scope">
<group>
<field name="key2" string="Condition"/>
<field name="user_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
@@ -288,13 +281,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action" version="7.0">
<sheet>
<group>
<field name="name"/>
<field name="type"/>
<field name="usage"/>
</group>
</sheet>
</form>
</field>
</record>
@@ -341,17 +332,18 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Report" version="7.0">
<sheet>
<group col="6">
<field name="name"/>
<field name="model"/>
<field name="usage"/>
<field name="report_name"/>
<field name="report_type"/>
<field name="report_file"/>
<group>
<group>
<field name="name"/>
<field name="report_name"/>
<field name="model"/>
</group>
<group>
<field name="usage"/>
<field name="report_type"/>
<field name="report_file"/>
</group>
</group>
<notebook>
<page string="Other Configuration">
<group>
@@ -376,7 +368,6 @@
<field name="groups_id"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@@ -445,14 +436,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Open a Window" version="7.0">
<sheet>
<group col="6">
<field name="name"/>
<field name="res_model"/>
<field name="type" readonly="1"/>
<field name="src_model"/>
<field name="usage"/>
<field name="target"/>
<group>
<group>
<field name="name"/>
<field name="res_model" string="Object"/>
<field name="src_model" string="Source Object"/>
</group>
<group>
<field name="usage"/>
<field name="type" readonly="1"/>
<field name="target"/>
</group>
</group>
<notebook>
<page string="General Settings">
@@ -496,7 +490,6 @@
<field name="groups_id"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@@ -756,34 +749,34 @@
<field name="arch" type="xml">
<form string="Attachments" version="7.0">
<sheet>
<group col="4">
<field name="name" />
<field name="type"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook>
<page string="Attachment">
<group>
<group attrs="{'invisible':[('type','=','url')]}" string="Data">
<field name="datas" filename="datas_fname"/>
<field name="datas_fname"/>
<field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
</group>
<group string="Attached To">
<field name="res_model"/>
<field name="res_id"/>
<field name="res_name"/>
</group>
<group groups="base.group_no_one" string="Created">
<field name="create_uid"/>
<field name="create_date"/>
</group>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
<group>
<group string="Data">
<field name="type"/>
<field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
<field name="datas_fname" invisible="1" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
<field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
</group>
</page>
<page string="Notes">
<field name="description"/>
</page>
</notebook>
<group string="Attached To">
<field name="res_model"/>
<field name="res_id"/>
<field name="res_name"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group groups="base.group_no_one" string="History">
<label for="create_uid" string="Creation"/>
<div name="creation_div">
<field name="create_uid" readonly="1" class="oe_inline"/> on
<field name="create_date" readonly="1" class="oe_inline"/>
</div>
</group>
<group name="description_group" string="Description" colspan="4">
<field name="description" nolabel="1"/>
</group>
</group>
</sheet>
</form>
</field>
@@ -858,12 +851,16 @@
<field name="arch" type="xml">
<form string="Model Description" version="7.0">
<sheet>
<group col="6">
<field name="name"/>
<field name="model"/>
<field name="osv_memory"/>
<field name="state"/>
<field name="modules" colspan="4"/>
<group>
<group>
<field name="name"/>
<field name="model"/>
<field name="osv_memory"/>
</group>
<group>
<field name="state"/>
<field name="modules"/>
</group>
</group>
<notebook>
<page string="Fields">
@@ -980,38 +977,37 @@
<field name="arch" type="xml">
<form string="Fields" version="7.0">
<sheet>
<group colspan="4" col="6">
<field name="name" />
<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
<field name="field_description"/>
<field name="state"/>
<group>
<group>
<field name="name" string="Field Name"/>
<field name="field_description"/>
</group>
<group>
<field name="state"/>
<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
<field name="modules"/>
</group>
</group>
<notebook colspan="4">
<page string="Properties">
<group>
<field name="ttype"/>
<field name="relation" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
<group>
<group>
<field name="ttype"/>
<field name="relation" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
'readonly': [('ttype','not in', ['many2one','one2many','many2many'])]}"/>
<field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
<field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
<field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
<field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
<field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
</group>
<group>
<field name="required"/>
<field name="readonly"/>
<field name="select_level"/>
<field name="translate"/>
<field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
<field name="modules"/>
</group>
</page>
<page string="Security">
<field name="groups"/>
</page>
</notebook>
<field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
<field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
<field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
<field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
<field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
<field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
</group>
<group>
<field name="required"/>
<field name="readonly"/>
<field name="select_level"/>
<field name="translate"/>
</group>
</group>
<field name="groups" invisible="1"/>
</sheet>
</form>
</field>
@@ -1694,13 +1690,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Server Action" version="7.0">
<sheet>
<group col="6" colspan="4">
<field name="name"/>
<field name="model_id"/>
<field name="state"/>
<field name="sequence"/>
<field name="condition"/>
<group>
<group>
<field name="name"/>
<field name="model_id"/>
<field name="state"/>
</group>
<group>
<field name="condition"/>
<field name="sequence"/>
</group>
</group>
<notebook colspan="4">
<page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
@@ -1771,7 +1770,6 @@
</page>
</notebook>
<field name="type" readonly="1"/>
</sheet>
</form>
</field>
</record>
@@ -1849,6 +1847,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Config Wizard Steps" version="7.0">
<header>
<button name="action_launch"
states="open" string="Launch"
type="object" icon="gtk-execute" class="oe_highlight"
help="Launch Configuration Wizard"/>
<button name="action_open" states="done"
string="Set as Todo" type="object"
icon="gtk-convert" class="oe_highlight"/>
<field name="state" widget="statusbar" statusbar_visible="open,done" nolabel="1" readonly="1" statusbar_colors='{"open":"red","done":"blue"}'/>
</header>
<sheet>
<group col="4">
<field name="action_id"/>
@@ -1859,16 +1867,6 @@
<group string="Groups">
<field name="groups_id" nolabel="1" colspan="4"/>
</group>
<group col="4">
<field name="state" readonly="1"/>
<button name="action_launch"
states="open" string="Launch"
type="object" icon="gtk-execute"
help="Launch Configuration Wizard"/>
<button name="action_open" states="done"
string="Set as Todo" type="object"
icon="gtk-convert"/>
</group>
</sheet>
</form>
</field>
openerp/addons/base/ir/ir_actions.py
-6
View File
@@ -210,10 +210,6 @@ class act_window(osv.osv):
res[act.id] = str(field_get)
return res
def _get_help_status(self, cr, uid, ids, name, arg, context=None):
activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips
return dict([(id, activate_tips) for id in ids])
_columns = {
'name': fields.char('Action Name', size=64, translate=True),
'type': fields.char('Action Type', size=32, required=True),
@@ -251,8 +247,6 @@ class act_window(osv.osv):
'help': fields.text('Action description',
help='Optional help text for the users with a description of the target view, such as its usage and purpose.',
translate=True),
'display_menu_tip':fields.function(_get_help_status, type='boolean', string='Display Menu Tips',
help='It gives the status if the tip has to be displayed or not when a user executes an action'),
'multi': fields.boolean('Action on Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view"),
}
openerp/addons/base/ir/ir_model.py
+3 -3
View File
@@ -96,9 +96,9 @@ class ir_model(osv.osv):
'field_id': fields.one2many('ir.model.fields', 'model_id', 'Fields', required=True),
'state': fields.selection([('manual','Custom Object'),('base','Base Object')],'Type',readonly=True),
'access_ids': fields.one2many('ir.model.access', 'model_id', 'Access'),
'osv_memory': fields.function(_is_osv_memory, string='In-Memory Model', type='boolean',
'osv_memory': fields.function(_is_osv_memory, string='Transient Model', type='boolean',
fnct_search=_search_osv_memory,
help="Indicates whether this object model lives in memory only, i.e. is not persisted (osv.osv_memory)"),
help="This field specifies whether the model is transient or not (i.e. if records are automatically deleted from the database or not)"),
'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the object is defined or inherited'),
'view_ids': fields.function(_view_ids, type='one2many', obj='ir.ui.view', string='Views'),
}
@@ -225,7 +225,7 @@ class ir_model_fields(osv.osv):
'required': fields.boolean('Required'),
'readonly': fields.boolean('Readonly'),
'select_level': fields.selection([('0','Not Searchable'),('1','Always Searchable'),('2','Advanced Search (deprecated)')],'Searchable', required=True),
'translate': fields.boolean('Translate', help="Whether values for this field can be translated (enables the translation mechanism for that field)"),
'translate': fields.boolean('Translatable', help="Whether values for this field can be translated (enables the translation mechanism for that field)"),
'size': fields.integer('Size'),
'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Type', required=True, readonly=True, select=1),
'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On Delete', help='On delete property for many2one fields'),
openerp/addons/base/ir/wizard/wizard_menu_view.xml
+5 -5
View File
@@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Menu" version="7.0">
<header>
<button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="name"/>
<field name="menu_id" domain="[('parent_id','&lt;&gt;',False)]"/>
</group>
<footer>
<button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
openerp/addons/base/ir/workflow/workflow_view.xml
+12 -10
View File
@@ -15,14 +15,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="osv"/>
<field name="on_create"/>
</group>
<field name="activities"/>
</sheet>
</form>
</field>
</record>
@@ -206,14 +204,18 @@
<field name="arch" type="xml">
<form string="Transition" version="7.0">
<sheet>
<group col="6">
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
<field name="group_id"/>
<group>
<group>
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</group>
<group>
<field name="group_id"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</group>
</group>
</sheet>
</form>
openerp/addons/base/module/module.py
+7 -26
View File
@@ -80,6 +80,7 @@ class module_category(osv.osv):
class module(osv.osv):
_name = "ir.module.module"
_rec_name = "shortdesc"
_description = "Module"
@classmethod
@@ -177,6 +178,7 @@ class module(osv.osv):
'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
'shortdesc': fields.char('Module Name', size=256, readonly=True, translate=True),
'summary': fields.char('Summary', size=256, readonly=True, translate=True),
'description': fields.text("Description", readonly=True, translate=True),
'author': fields.char("Author", size=128, readonly=True),
'maintainer': fields.char('Maintainer', size=128, readonly=True),
@@ -361,8 +363,9 @@ class module(osv.osv):
if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'):
return config
# reload the client
menu_ids = self.root_menus(cr,uid,ids,context)
# reload the client; open the first available root menu
menu_obj = self.pool.get('ir.ui.menu')
menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
return {
'type': 'ir.actions.client',
'tag': 'reload',
@@ -454,7 +457,7 @@ class module(osv.osv):
to_install.extend(ids2)
self.button_install(cr, uid, to_install, context=context)
return dict(ACTION_DICT, name=_('Upgrade'))
return dict(ACTION_DICT, name=_('Apply Schedule Upgrade'))
def button_upgrade_cancel(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state': 'installed'})
@@ -479,6 +482,7 @@ class module(osv.osv):
'application': terp.get('application', False),
'auto_install': terp.get('auto_install', False),
'icon': terp.get('icon', False),
'summary': terp.get('summary', ''),
}
# update the list of available packages
@@ -647,29 +651,6 @@ class module(osv.osv):
_logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
def root_menus(self, cr, uid, ids, context=None):
""" Return root menu ids the menus created by the modules whose ids are
provided.
:param list[int] ids: modules to get menus from
"""
values = self.read(cr, uid, ids, ['name'], context=context)
module_names = [i['name'] for i in values]
ids = self.pool.get('ir.model.data').search(cr, uid, [ ('model', '=', 'ir.ui.menu'), ('module', 'in', module_names) ], context=context)
values = self.pool.get('ir.model.data').read(cr, uid, ids, ['res_id'], context=context)
all_menu_ids = [i['res_id'] for i in values]
root_menu_ids = []
for menu in self.pool.get('ir.ui.menu').browse(cr, uid, all_menu_ids, context=context):
while menu.parent_id:
menu = menu.parent_id
if not menu.id in root_menu_ids:
root_menu_ids.append((menu.sequence,menu.id))
root_menu_ids.sort()
root_menu_ids = [i[1] for i in root_menu_ids]
return root_menu_ids
class module_dependency(osv.osv):
_name = "ir.module.module.dependency"
_description = "Module dependency"
openerp/addons/base/module/module_view.xml
+21 -23
View File
@@ -43,7 +43,7 @@
<search string="Search modules">
<group col='10' colspan='4'>
<field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
<field name="description" string="Keywords"/>
<field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
<separator orientation="vertical"/>
<filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
<filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
@@ -70,6 +70,7 @@
<field name="icon"/>
<field name="name"/>
<field name="state"/>
<field name="summary"/>
<templates>
<t t-name="kanban-box">
<div class="oe_module_vignette oe_kanban_auto_height">
@@ -78,7 +79,8 @@
<div class="oe_module_desc">
<h4><a type="edit"><field name="shortdesc"/></a></h4>
<p class="oe_module_name">
<field name="name"/><br/>
<t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
<i><field name="name" groups="base.group_no_one"/></i>
</p>
<button type="object" name="button_immediate_install" states="uninstalled">Install</button>
<button t-if="installed" disabled="disabled">Installed</button>
@@ -113,38 +115,32 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module" version="7.0">
<header>
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight"/>
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight"/>
<button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
<button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
<button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
<button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="uninstalled"/>
</header>
<sheet>
<div class="oe_right oe_button_box">
<field name="icon_image" widget="image"/>
</div>
<field name="icon_image" widget="image" class="oe_avatar oe_left"/>
<div class="oe_title">
<label for="shortdesc" class="oe_edit_only"/>
<h1><field name="shortdesc"/></h1>
<label for="category_id" class="oe_edit_only"/>
<h2><field name="category_id" class="oe_inline"/></h2>
<h2 class="oe_fade"><field name="summary"/></h2>
<button name="button_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
<button name="button_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
<button name="button_uninstall" states="installed" string="Uninstall" type="object"
confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
<button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
<button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
<button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
</div>
<group>
<group>
<field name="author"/>
<field name="website" widget="url"/>
<field name="category_id" widget="selection"/>
</group>
<group>
<field name="name"/>
<field name="license"/>
<field name="installed_version"/>
</group>
<group>
<field name="author"/>
<field name="website" widget="url"/>
</group>
</group>
<notebook colspan="4">
<notebook>
<page string="Description">
<field name="description"/>
</page>
@@ -152,7 +148,9 @@
<group col="4">
<field name="demo"/>
<field name="application"/>
<field name="state"/>
</group>
<label for="dependencies_id"/>
<field name="dependencies_id">
<tree string="Dependencies">
<field name="name"/>
openerp/addons/base/module/wizard/base_export_language_view.xml
+19 -32
View File
@@ -8,39 +8,26 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Export Translations" version="7.0">
<header>
<button name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight"/>
<label string="or" states="choose"/>
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="8">
<group colspan="3">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="OpenERP translations (core, modules, clients) are managed through Launchpad.net, our open source project management facility. We use their online interface to synchronize all translations efforts."/>
<label colspan="4" width="220" string="To improve or expand the official translations, you should use directly Lauchpad's web interface (Rosetta). If you need to perform mass translation, Launchpad also allows uploading full .po files at once"/>
<label colspan="4" width="220"/>
<label colspan="4" width="220" string="To browse official translations, you can start with these links:"/>
<label colspan="4" width="220" string="https://help.launchpad.net/Translations"/>
<label colspan="4" width="220" string="https://translations.launchpad.net/openobject"/>
</group>
<separator orientation="vertical" rowspan="15"/>
<group colspan="4">
<group colspan="4" states="choose">
<separator colspan="4" string="Export Translation"/>
<field name="lang"/>
<field name="format" required="1"/>
<field height="200" name="modules" nolabel="1" colspan="4"/>
<field invisible="1" name="state"/>
</group>
<group colspan="4" states="get">
<separator string="Export done" colspan="4"/>
<field name="name" invisible="1" colspan="4"/>
<field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
<field height="80" name="advice" nolabel="1" colspan="4"/>
</group>
</group>
<group colspan="4" states="choose">
<separator colspan="4" string="Export Translation"/>
<field name="lang"/>
<field name="format" required="1"/>
<field name="modules" nolabel="1"/>
<field invisible="1" name="state"/>
</group>
<group colspan="4" states="get">
<separator string="Export done" colspan="4"/>
<field name="name" invisible="1" colspan="4"/>
<field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
<field height="80" name="advice" nolabel="1" colspan="4"/>
</group>
<footer states="choose">
<button name="act_getfile" string="_Export" type="object" class="oe_highlight"/> or
<button name="act_cancel" special="cancel" string="_Cancel" type="object" class="oe_link"/>
</footer>
<footer states="get">
<button name="act_cancel" special="cancel" string="_Close" type="object"/>
</footer>
</form>
</field>
</record>
openerp/addons/base/module/wizard/base_import_language_view.xml
+8 -12
View File
@@ -8,21 +8,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Translation" version="7.0">
<header>
<group>
<field name="name"/>
<field name="code" string="Code" placeholder="en_US"/>
<field name="data"/>
<field name="overwrite"/>
</group>
<footer>
<button name="import_lang" string="_Import" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator string="Import Translation" colspan="2"/>
<label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
<group col="4">
<field name="name"/>
<field name="code"/>
<field name="data"/>
<field name="overwrite"/>
</group>
</group>
</footer>
</form>
</field>
</record>
openerp/addons/base/module/wizard/base_language_install_view.xml
+19 -30
View File
@@ -8,33 +8,22 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Load a Translation" version="7.0">
<header>
<button name="lang_install" string="Load" type="object" states="init" class="oe_highlight"/>
<label string="or" states="init"/>
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4" col="8">
<group colspan="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard helps you add a new language to your OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
<label colspan="4" width="220"/>
<label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
<field name="state" invisible="1"/>
</group>
<separator orientation="vertical" colspan="1" rowspan="12"/>
<group colspan="6">
<separator string="Load a Translation" colspan="4"/>
<group states="init" colspan="4">
<field name="lang" colspan="4"/>
<field name="overwrite" colspan="4" groups="base.group_no_one"/>
</group>
<group states="done" colspan="4">
<label string="The selected language has been successfully installed.
You must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
</group>
</group>
<field name="state" invisible="1"/>
<group states="init">
<field name="lang"/>
<field name="overwrite" groups="base.group_no_one"/>
</group>
<group states="done" colspan="4">
<label string="The selected language has been successfully installed.
You must change the preferences of the user and open a new menu to view the changes."/>
</group>
<footer states="init">
<button name="lang_install" string="Load" type="object" class="oe_highlight"/> or
<button special="cancel" string="Cancel" class="oe_link"/>
</footer>
<footer states="done">
<button special="cancel" string="Close"/>
</footer>
</form>
</field>
</record>
@@ -49,10 +38,10 @@ You must change the preferences of the user and open a new menu to view the chan
</record>
<menuitem
name="Load a Translation"
action="action_view_base_language_install"
id="menu_view_base_language_install"
parent="menu_translation" sequence="2"/>
name="Load a Translation"
action="action_view_base_language_install"
id="menu_view_base_language_install"
parent="menu_translation" sequence="2"/>
</data>
</openerp>
openerp/addons/base/module/wizard/base_module_configuration_view.xml
+3 -3
View File
@@ -8,10 +8,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Configuration Done" version="7.0">
<header>
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
<footer>
<button string="Close" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
openerp/addons/base/module/wizard/base_module_import_view.xml
+11 -24
View File
@@ -8,35 +8,22 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import module" version="7.0">
<header>
<field name="state" invisible="1"/>
<separator string="Module Import" colspan="4"/>
<group states="init" col="4">
<label string="Select module package to import (.zip file):" colspan="4"/>
<field name="module_file" colspan="4"/>
</group>
<group states="done" col="4">
<label string="Module file successfully imported!" colspan="4"/>
</group>
<footer>
<button name="importzip" string="Import module" type="object" states="init" class="oe_highlight"/>
<label string="or" states="init"/>
<button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
<label string="or" states="done"/>
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="8">
<group colspan="3" col="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label width="220" string='This wizard helps you to import a new module to your OpenERP system.
After importing a new module you can install it by clicking on the button "Install" from the form view.'/>
<label width="220"/>
<label width="220" string="Please be patient, this operation may take a few minutes..."/>
<field name="state" invisible="1"/>
</group>
<separator orientation="vertical" rowspan="5"/>
<group colspan="4">
<separator string="Module Import" colspan="4"/>
<group states="init" col="4">
<label string="Select module package to import (.zip file):" colspan="4"/>
<field name="module_file" colspan="4"/>
</group>
<group states="done" col="4">
<label string="Module file successfully imported!" colspan="4"/>
</group>
</group>
</group>
</footer>
</form>
</field>
</record>
openerp/addons/base/module/wizard/base_module_scan_view.xml
+3 -3
View File
@@ -8,12 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scan for new modules" version="7.0">
<header>
<label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
<footer>
<button name="watch_dir" string="Check new modules" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
</footer>
</form>
</field>
</record>
openerp/addons/base/module/wizard/base_module_update_view.xml
+19 -28
View File
@@ -8,37 +8,28 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Update Module List" version="7.0">
<header>
<button name="update_module" string="Update" type="object" states="init" class="oe_highlight"/>
<label string="or" states="init"/>
<button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
<label string="or" states="done"/>
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="8">
<group colspan="3">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard will scan all module repositories on the server side to detect newly added modules as well as any change to existing modules."/>
<label colspan="4" width="220"/>
<label colspan="4" width="220" string="Please be patient, as this operation may take a few seconds..."/>
<field name="state" invisible="1"/>
</group>
<separator orientation="vertical" rowspan="15"/>
<group colspan="4">
<separator string="Module Update Result" colspan="4"/>
<group states="init" colspan="4">
<label string="Click on Update below to start the process..." colspan="4"/>
</group>
<group states="done" colspan="4">
<field name="update" colspan="4"/>
<field name="add" colspan="4"/>
</group>
</group>
<field name="state" invisible="1"/>
<separator string="Module Update Result"/>
<group states="init">
<label string="Click on Update below to start the process..." />
</group>
<group states="done" >
<field name="update"/>
<field name="add" />
</group>
<footer>
<div states="init">
<button name="update_module" string="Update" type="object" class="oe_highlight"/> or
<button special="cancel" string="Cancel" class="oe_link"/>
</div>
<div states="done">
<button name="action_module_open" string="Open Modules" type="object" class="oe_highlight"/> or
<button special="cancel" string="Close" class="oe_link"/>
</div>
</footer>
</form>
</field>
</record>
</record>
<record id="action_view_base_module_update" model="ir.actions.act_window">
<field name="name">Module Update</field>
openerp/addons/base/module/wizard/base_module_upgrade.py
+8 -13
View File
@@ -46,19 +46,14 @@ class base_module_upgrade(osv.osv_memory):
ids = self.get_module_list(cr, uid, context=context)
if not ids:
res['arch'] = """
<form string="Apply Scheduled Upgrades" version="7.0">
<header>
<button name="config" string="Start configuration" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="System update completed"/>
<label string="The selected modules have been updated / installed !"/>
<newline/>
<label string="We suggest to reload the page to see the new menus."/>
</form>
"""
res['arch'] = '''<form string="Apply Schedule Upgrade" version="7.0">
<header>
<button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
<button special="cancel" string="Close" icon="gtk-cancel"/>
</header>
<separator string="Apply Schedule Upgrade" colspan="4"/>
</form>'''
return res
def get_module_list(self, cr, uid, context=None):
openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+11 -11
View File
@@ -8,21 +8,21 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Update" version="7.0">
<header>
<button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<div><label string="Your system will be updated."/></div>
<div><label string="Note that this operation might take a few minutes."/></div>
<separator string="Modules to Update"/>
<field name="module_info"/>
<footer>
<button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
<record id="action_view_base_module_upgrade" model="ir.actions.act_window">
<field name="name">Module Upgrade</field>
<field name="name">Apply Schedule Upgrade</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base.module.upgrade</field>
<field name="view_type">form</field>
@@ -44,14 +44,14 @@
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Apply Scheduled Upgrades" version="7.0">
<header>
<form string="Apply Schedule Upgrade" version="7.0">
<div><label string="The selected modules have been updated / installed !"/></div>
<div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
<footer>
<button name="config" string="Start configuration" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<div><label string="The selected modules have been updated / installed !"/></div>
<div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
</footer>
</form>
</field>
</record>
openerp/addons/base/module/wizard/base_update_translations_view.xml
+5 -16
View File
@@ -7,23 +7,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Synchronize Terms" version="7.0">
<header>
<button name="act_update" string="Update" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="8">
<group colspan="3">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard will detect new terms to translate in the application, so that you can then add translations manually or perform a complete export (as a template for a new language example)."/>
</group>
<separator orientation="vertical" rowspan="15"/>
<group colspan="4">
<separator string="Synchronize Translation" colspan="4"/>
<field name="lang" colspan="4"/>
</group>
<group string="Synchronize Translation">
<field name="lang"/>
</group>
<footer>
<button name="act_cancel" special="cancel" string="Cancel" type="object"/>
</footer>
</form>
</field>
</record>
openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+13 -25
View File
@@ -94,32 +94,20 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Register a Contract" version="7.0">
<header>
<button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight" />
<label string="or" states="draft"/>
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4" col="8">
<group colspan="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard helps you register a publisher warranty contract in your OpenERP system. After the contract has been registered, you will be able to send issues directly to OpenERP."/>
<label colspan="4" width="220"/>
<label colspan="4" width="220" string=""/>
<field name="state" invisible="1"/>
</group>
<separator orientation="vertical" rowspan="12" colspan="1"/>
<group colspan="6">
<separator string="Register a Contract" colspan="4"/>
<group states="draft" colspan="4">
<label string="Please enter the serial key provided in your contract document:" colspan="4"/>
<field name="name" colspan="4"/>
</group>
<group states="finished" colspan="4">
<label string="Publisher warranty contract successfully registered!" colspan="4"/>
</group>
</group>
<field name="state" invisible="1"/>
<separator string="Register a Contract"/>
<group states="draft">
<label string="Please enter the serial key provided in your contract document:" colspan="2"/>
<field name="name"/>
</group>
<group states="finished">
<label string="Publisher warranty contract successfully registered!" colspan="4"/>
</group>
<footer>
<button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight"/>
<label string="or" states="draft"/>
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
openerp/addons/base/res/res_bank.py
+12 -1
View File
@@ -172,6 +172,17 @@ class res_partner_bank(osv.osv):
('required', field.required)]
return res
def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
"""
Format the name of a res.partner.bank.
This function is designed to be inherited to add replacement fields.
:param browse_record bank_type_obj: res.partner.bank.type object
:param browse_record bank_obj: res.partner.bank object
:rtype: str
:return: formatted name of a res.partner.bank record
"""
return bank_type_obj.format_layout % bank_obj._data[bank_obj.id]
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
return []
@@ -187,7 +198,7 @@ class res_partner_bank(osv.osv):
# avoid the default format_layout to result in "False: ..."
if not val._data[val.id]['bank_name']:
val._data[val.id]['bank_name'] = _('BANK')
result = t.format_layout % val._data[val.id]
result = self._prepare_name_get(cr, uid, t, val, context=context)
except:
result += ' [Formatting Error]'
raise
openerp/addons/base/res/res_company.py
+16 -15
View File
@@ -23,6 +23,7 @@ from osv import osv
from osv import fields
import os
import tools
import openerp
from tools.translate import _
from tools.safe_eval import safe_eval as eval
@@ -80,9 +81,9 @@ class res_company(osv.osv):
for company in self.browse(cr, uid, ids, context=context):
result[company.id] = {}.fromkeys(field_names, False)
if company.partner_id:
address_data = part_obj.address_get(cr, uid, [company.partner_id.id], adr_pref=['default'])
address_data = part_obj.address_get(cr, openerp.SUPERUSER_ID, [company.partner_id.id], adr_pref=['default'])
if address_data['default']:
address = part_obj.read(cr, uid, address_data['default'], field_names, context=context)
address = part_obj.read(cr, openerp.SUPERUSER_ID, address_data['default'], field_names, context=context)
for field in field_names:
result[company.id][field] = address[field] or False
return result
@@ -107,29 +108,29 @@ class res_company(osv.osv):
'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
'partner_id': fields.many2one('res.partner', 'Partner', required=True),
'rml_header1': fields.char('Report Header / Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents."),
'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
'rml_footer1': fields.char('General Information Footer', size=200),
'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."),
'rml_header': fields.text('RML Header', required=True),
'rml_header2': fields.text('RML Internal Header', required=True),
'rml_header3': fields.text('RML Internal Header', required=True),
'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
'logo': fields.related('partner_id', 'photo', string="Logo", type="binary"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users'),
'account_no':fields.char('Account No.', size=64),
'street': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street", multi='address'),
'street2': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street2", multi='address'),
'zip': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="Zip", multi='address'),
'city': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="City", multi='address'),
'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="Fed. State", multi='address'),
'street': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street", multi='address'),
'street2': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street2", multi='address'),
'zip': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="Zip", multi='address'),
'city': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="City", multi='address'),
'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="Fed. State", multi='address'),
'bank_ids': fields.one2many('res.partner.bank','company_id', 'Bank Accounts', help='Bank accounts related to this company'),
'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'),
'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'),
'phone': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Phone", multi='address'),
'fax': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Fax", multi='address'),
'website': fields.related('partner_id', 'website', string="Website", type="char", size=64),
'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32),
'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'),
'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'),
'phone': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Phone", multi='address'),
'fax': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Fax", multi='address'),
'website': fields.related('partner_id', 'website', string="Website", type="char", size=64),
'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32),
'company_registry': fields.char('Company Registry', size=64),
'paper_format': fields.selection([('a4', 'A4'), ('us_letter', 'US Letter')], "Paper Format", required=True),
}
openerp/addons/base/res/res_company_view.xml
+41 -37
View File
@@ -24,17 +24,23 @@
<div class="oe_right oe_avatar">
<field name="logo" nolabel="1" widget="image"/>
</div>
<div class="oe_right oe_button_box">
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
<div class="oe_right oe_button_box" name="button_box">
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline oe_right"/>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group col="4">
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
<field name="parent_id" groups="base.group_multi_company"/>
</group>
<h1>
<field name="name" class="oe_inline"/>
</h1>
<label for="rml_header1" class="oe_edit_only"/>
<div>
<field name="rml_header1" placeholder="Global Business Solutions"/>
</div>
</div>
<group col="4">
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
<field name="parent_id" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="General Information">
<group>
@@ -44,40 +50,38 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
<field name="city" placeholder="City" style="width: 40%%"/>
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
<field name="country_id" placeholder="Country" class="oe_no_button"/>
</div>
<field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
</group>
<group>
<field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
</group>
</group>
<separator string="Header/Footer of Reports"/>
<group>
<field name="rml_header1" placeholder="Global Business Solutions"/>
<field name="rml_footer1" groups="base.group_no_one"/>
<group string="Bank Accounts">
<field name="bank_ids" colspan="4" nolabel="1"/>
<label for="rml_footer2"/>
<div>
<div name="bank_acc">
<field name="rml_footer2"/>
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
<!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
</div>
</group>
</page>
<page string="Header/Footer" groups="base.group_no_one">
<group>
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
<field name="rml_header"/>
<field name="rml_footer1"/>
</group>
</page>
<page string="Internal Header/Footer" groups="base.group_no_one">
<label for="rml_header"/>
<field name="rml_header"/>
<label for="rml_header2"/>
<field name="rml_header2"/>
<label for="rml_header3"/>
@@ -85,12 +89,11 @@
</page>
<page string="Configuration">
<group>
<field name="currency_id"/>
<group name="account_grp" string="Accounting">
<field name="currency_id"/>
</group>
</group>
</page>
<page string="Bank Accounts">
<field name="bank_ids"/>
</page>
</notebook>
</sheet>
</form>
@@ -150,17 +153,18 @@
<field name="arch" type="xml">
<form string="Multi Company" version="7.0">
<sheet>
<group col="6" colspan="4">
<field name="name" colspan="6"/>
<separator string="Matching" colspan="6"/>
<field name="company_id"/>
<field name="object_id"/>
<field name="field_id" domain="[('model_id','=',object_id)]"/>
<separator string="Condition" colspan="6"/>
<field name="expression" colspan="4"/>
<field name="sequence"/>
<separator string="Returning" colspan="6"/>
<field name="company_dest_id"/>
<group>
<group>
<field name="name"/>
<field name="company_id"/>
<field name="company_dest_id"/>
</group>
<group>
<field name="object_id"/>
<field name="field_id" domain="[('model_id','=',object_id)]"/>
<field name="expression"/>
<field name="sequence"/>
</group>
</group>
</sheet>
</form>
openerp/addons/base/res/res_config.py
+8 -4
View File
@@ -70,10 +70,14 @@ class res_config_configurable(osv.osv_memory):
res = next.action_launch(context=context)
res['nodestroy'] = False
return res
#if there is no next action and if html is in the context: reload instead of closing
if context and 'html' in context:
return {'type' : 'ir.actions.reload'}
return {'type' : 'ir.actions.act_window_close'}
# reload the client; open the first available root menu
menu_obj = self.pool.get('ir.ui.menu')
menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
return {
'type': 'ir.actions.client',
'tag': 'reload',
'params': {'menu_id': menu_ids and menu_ids[0] or False},
}
def start(self, cr, uid, ids, context=None):
return self.next(cr, uid, ids, context)
openerp/addons/base/res/res_config.xml
+43 -43
View File
@@ -1,54 +1,54 @@
<openerp>
<data>
<data>
<record id="res_config_view_base" model="ir.ui.view">
<field name="name">res.config.view.base</field>
<field name="model">res.config</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="action_next" type="object" string="Apply" class="oe_highlight"/>
or
<button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
</header>
<group string="res_config_contents"/>
</form>
</field>
<field name="name">res.config.view.base</field>
<field name="model">res.config</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
<group string="res_config_contents"/>
<footer>
<button name="action_next" type="object" string="Apply" class="oe_highlight"/>
or
<button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
</footer>
</form>
</field>
</record>
<record id="view_config_wizard_form" model="ir.ui.view">
<field name="name">Compabitiliby configuration wizard</field>
<field name="model">ir.actions.configuration.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Next Configuration Step" version="7.0">
<header>
<button name="action_next" type="object" string="Continue" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="note"/>
</group>
</form>
</field>
<field name="name">Compabitiliby configuration wizard</field>
<field name="model">ir.actions.configuration.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Next Configuration Step" version="7.0">
<group>
<field name="note"/>
</group>
<footer>
<button name="action_next" type="object" string="Continue" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
<record id="res_config_installer" model="ir.ui.view">
<field name="name">Inheritable view for installer objects</field>
<field name="model">res.config.installer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="action_next" type="object" string="Install Modules" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="title" colspan="4"/>
</form>
</field>
<field name="name">Inheritable view for installer objects</field>
<field name="model">res.config.installer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
<separator string="title" colspan="4"/>
<footer>
<button name="action_next" type="object" string="Install Modules" class="oe_highlight"/>
or
<button string="Skip" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
</data>
</data>
</openerp>
openerp/addons/base/res/res_partner.py
+34 -2
View File
@@ -19,9 +19,10 @@
#
##############################################################################
import os
import math
import os
from osv import osv, fields
import re
import tools
from tools.translate import _
import logging
@@ -301,6 +302,37 @@ class res_partner(osv.osv):
res.append((record.id, name))
return res
def name_create(self, cr, uid, name, context=None):
""" Override of orm's name_create method for partners. The purpose is
to handle some basic formats to create partners using the
name_create.
Supported syntax:
- 'raoul@grosbedon.fr': create a partner with name raoul@grosbedon.fr
and sets its email to raoul@grosbedon.fr
- 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
Raoul Grosbedon, and set its email to raoul@grosbedon.fr
- anything else: fall back on the default name_create
Regex :
- ([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8}): raoul@grosbedon.fr
- ([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]:
Raoul Grosbedon, raoul@grosbedon.fr
"""
contact_regex = re.compile('([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]')
email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})')
contact_regex_res = contact_regex.findall(name)
email_regex_res = email_regex.findall(name)
if contact_regex_res:
name = contact_regex_res[0][0].rstrip(' ') # remove extra spaces on the right
email = contact_regex_res[0][1]
rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
return self.name_get(cr, uid, [rec_id], context)[0]
elif email_regex:
email = '%s' % (email_regex_res[0])
rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
return self.name_get(cr, uid, [rec_id], context)[0]
else:
return super(res_partner, self).create(cr, uid, name, context)
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args = []
@@ -311,7 +343,7 @@ class res_partner(osv.osv):
query_args = [name2]
if limit:
limit_str = ' limit %s'
query_args += [limit]
query_args += [limit]
cr.execute('''SELECT partner.id FROM res_partner partner
LEFT JOIN res_partner company ON partner.parent_id = company.id
WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'
openerp/addons/base/res/res_partner_view.xml
+60 -51
View File
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman"/>
<!-- Top menu item -->
<menuitem name="Sales"
id="menu_base_partner"
groups="base.group_sale_salesman"
sequence="30"/>
<menuitem id="base.menu_sales" parent="base.menu_base_partner" name="Sales" sequence="1" />
<menuitem id="menu_base_config" parent="menu_base_partner" name="Configuration" sequence="30" groups="group_system"/>
<menuitem id="menu_config_address_book" parent="menu_base_config" name="Address Book" sequence="40" groups="group_system"/>
<!--
=======================
Partner Titles
=======================
-->
<!-- Partner Titles -->
<record id="view_partner_title_tree" model="ir.ui.view">
<field name="name">res.partner.title.tree</field>
<field name="model">res.partner.title</field>
@@ -70,11 +72,8 @@
</record>
<menuitem action="action_partner_title_contact" id="menu_partner_title_contact" name="Contact Titles" parent="menu_config_address_book" sequence="3" groups="base.group_no_one"/>
<!--
=======================
Partner
=======================
-->
<!-- Partner -->
<record id="view_partner_tree" model="ir.ui.view">
<field name="name">res.partner.tree</field>
<field name="model">res.partner</field>
@@ -101,40 +100,31 @@
<field name="arch" type="xml">
<form string="Partners" version="7.0">
<sheet>
<field name="photo" widget='image' class="oe_avatar oe_right" height="70"/>
<div class="oe_right oe_button_box" name="buttons">
</div>
<field name="photo" widget='image' class="oe_avatar oe_left"/>
<div class="oe_title">
<div class="oe_edit_only">
<label for="name" string="Customer Name"/>
<label for="name" string="Customer Name"/>
(<field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
</div>
<h1>
<field name="name"/>
</h1>
<div attrs="{'invisible': [('is_company','=', True)]}">
<label for="parent_id" class="oe_edit_only"/>
</div>
<h2 attrs="{'invisible': [('is_company','=', True)]}">
<field name="parent_id"
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
class="oe_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>,
<field name="function" class="oe_inline" placeholder="Job Position"/>
</h2>
<field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
<field name="category_id" widget="many2many_tags" placeholder="Select Tags"/>
</div>
<div class="oe_right oe_button_box" name="buttons"> </div>
<group>
<group>
<field name="parent_id"
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
attrs="{'invisible': [('is_company','=', True)]}"
on_change="onchange_address(use_parent_address, parent_id)"/>,
<label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
<div attrs="{'invisible': [('parent_id','=', False)]}">
<field class="oe_inline"
name="type"/>
<label for="use_parent_address"/>
<field name="use_parent_address"
class="oe_inline"
<label for="use_parent_address" class="oe_edit_only"/>
<field name="use_parent_address" class="oe_edit_only oe_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>
</div>
@@ -142,21 +132,24 @@
<div>
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
<div class="address_format">
<field name="city" placeholder="City" style="width: 40%%"/>
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
<field name="country_id" placeholder="Country" class="oe_no_button"/>
</div>
<field name="website" widget="url" placeholder="www.openerp.com"/>
<field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
</group>
<group>
<field name="phone" placeholder="+32.81.81.37.00"/>
<field name="function" placeholder="e.g. Sales Director"
attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="phone" placeholder="e.g. +32.81.81.37.00"/>
<field name="mobile"/>
<field name="fax"/>
<field name="email" widget="email"/>
<field name="title" domain="[('domain', '=', 'contact')]" attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="title" domain="[('domain', '=', 'contact')]"
class="oe_no_button" attrs="{'invisible': [('is_company','=', True)]}"/>
</group>
</group>
@@ -202,7 +195,7 @@
<a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
<img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
</a>
</td>
</tr>
</table>
@@ -220,18 +213,24 @@
<group>
<field name="user_id" />
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group>
<field name="customer"/>
<field name="supplier" invisible="1"/>
</group>
<group>
<field name="ref"/>
<field name="lang"/>
<field name="date"/>
</group>
<group>
<field name="customer"/>
<field name="supplier" invisible="1"/>
<field name="active"/>
</group>
</group>
</page>
<page string="History" invisible="True"></page>
<!-- The History page becomes visible as soon as there is something to display inside -->
<page string="History" name="page_history" invisible="True">
</page>
<page string="Internal Notes">
<field name="comment" placeholder="Internal notes about this customer..."/>
</page>
@@ -248,7 +247,7 @@
<field name="arch" type="xml">
<search string="Search Partner">
<group col='10' colspan='4'>
<field name="name"
<field name="name"
filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
string="Partner"/>
<separator orientation="vertical"/>
@@ -256,7 +255,7 @@
<filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
<filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
<filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
<filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
<separator orientation="vertical"/>
<field name="category_id"/>
<field name="user_id"/>
@@ -364,9 +363,17 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner</field>
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
<field name="domain">[('customer','=',1)]</field>
<field name="context">{'default_customer':1, 'search_default_customer':1}</field>
<field name="filter" eval="True"/>
<field name="help">
Click on "Create" to add a new customer in your address book.
&lt;p&gt;
A contact is either a person or a company; a person can be linked to a company as a contact of that company.
&lt;p&gt;
You will be able to follow documents and history of your contacts (invoices, meetings, projects, etc.)
</field>
</record>
<record id="action_partner_supplier_form" model="ir.actions.act_window">
@@ -378,7 +385,13 @@
<field name="view_mode">kanban,tree,form</field>
<field name="context">{'search_default_supplier': 1,'default_customer': 0,'default_supplier': 1}</field>
<field name="filter" eval="True"/>
<field name="help">You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects.</field>
<field name="help">
Click on "Create" to add a new supplier in your address book.
&lt;p&gt;
A supplier is either a person or a company; a person can be linked to a company as a contact of that company.
&lt;p&gt;
You will be able to follow documents and history of your contacts (invoices, meetings, projects, etc.)
</field>
</record>
<record id="action_partner_employee_form" model="ir.actions.act_window">
@@ -419,11 +432,8 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_payterm_form"/>
</record>
<!--
======================
Categories
======================
-->
<!-- Categories -->
<record id="view_partner_category_form" model="ir.ui.view">
<field name="name">Partner Categories</field>
<field name="model">res.partner.category</field>
@@ -502,4 +512,3 @@
</data>
</openerp>
openerp/addons/base/res/res_users.py
+1 -3
View File
@@ -231,7 +231,6 @@ class users(osv.osv):
help="The user's timezone, used to output proper date and time values inside printed reports. "
"It is important to set a value for this field. You should use the same timezone "
"that is otherwise used to pick and render date and time values: your computer's timezone."),
'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
'date': fields.datetime('Latest Connection', readonly=True),
}
@@ -336,11 +335,10 @@ class users(osv.osv):
'company_id': _get_company,
'company_ids': _get_companies,
'groups_id': _get_group,
'menu_tips': False
}
# User can write to a few of her own fields (but not her groups for example)
SELF_WRITEABLE_FIELDS = ['menu_tips','password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
def write(self, cr, uid, ids, values, context=None):
if not hasattr(ids, '__iter__'):
openerp/addons/base/res/res_users_view.xml
+19 -25
View File
@@ -58,7 +58,7 @@
<field name="comment"/>
</page>
</notebook>
</sheet>
</sheet>
</form>
</field>
</record>
@@ -81,19 +81,17 @@
<form string="Users" version="7.0">
<field name="id" invisible="1"/>
<sheet>
<div class="oe_right">
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_avatar"/>
</div>
<field name="avatar" widget='image' on_change="onchange_avatar(avatar)" class="oe_avatar oe_left"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="company_id" class="oe_edit_only"/>
<h2><field name="company_id" context="{'user_preference': 0}"/></h2>
<label for="login" class="oe_edit_only"/>
<h2><field name="login"/></h2>
</div>
<group>
<group>
<field name="login"/>
<field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
<field name="company_id" context="{'user_preference': 0}"/>
</group>
<group>
<field name="active"/>
@@ -106,7 +104,6 @@
<group name="preferences">
<field name="context_lang"/>
<field name="context_tz"/>
<field name="menu_tips"/>
</group>
<group groups="base.group_no_one">
<field name="action_id"/>
@@ -119,12 +116,12 @@
</group>
</page>
<page string="Access Rights">
<group col="4">
<field name="groups_id"/>
<group string="Allowed Companies" groups="base.group_multi_company">
<field name="company_ids" nolabel="1" widget="many2many_tags"/>
</group>
<group col="4">
<field name="groups_id"/>
</group>
</page>
<page string="Allowed Companies" groups="base.group_multi_company">
<field name="company_ids"/>
</page>
</notebook>
</sheet>
@@ -198,20 +195,17 @@
<div class="oe_right oe_avatar">
<field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
</div>
<div class="oe_title">
<h1>
<field name="name" readonly="1" class="oe_edit_only"/>
(<field name="login" readonly="1" class="oe_edit_only"/>)
</h1>
<label for="company_id" class="oe_edit_only"/>
<h2>
<field name="company_id" widget="selection" readonly="0"
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
</h2>
</div>
<group col="4" string="Preferences">
<h1>
<field name="name" readonly="1" class="oe_inline"/>
(<field name="login" readonly="1" class="oe_inline"/>)
</h1>
<group name="preferences" col="4">
<field name="context_lang" readonly="0"/>
<field name="company_id" readonly="0"
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
<field name="context_tz" readonly="0"/>
<field name="company_id" widget="selection" readonly="0"
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
</group>
<group string="Email Preferences">
<field name="user_email" widget="email" readonly="0"/>
openerp/modules/db.py
+3 -3
View File
@@ -77,8 +77,8 @@ def initialize(cr):
cr.execute('INSERT INTO ir_module_module \
(author, website, name, shortdesc, description, \
category_id, auto_install, state, certificate, web, license, application, icon, sequence) \
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
category_id, auto_install, state, certificate, web, license, application, icon, sequence, summary) \
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
info['author'],
info['website'], i, info['name'],
info['description'], category_id,
@@ -86,7 +86,7 @@ def initialize(cr):
info['web'],
info['license'],
info['application'], info['icon'],
info['sequence']))
info['sequence'], info['summary']))
id = cr.fetchone()[0]
cr.execute('INSERT INTO ir_model_data \
(name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', (
openerp/modules/module.py
+1
View File
@@ -341,6 +341,7 @@ def load_information_from_description_file(module):
'web': False,
'website': '',
'sequence': 100,
'summary': '',
}
info.update(itertools.izip(
'depends data demo test init_xml update_xml demo_xml'.split(),
openerp/osv/fields.py
+4 -4
View File
@@ -49,7 +49,7 @@ import simplejson
_logger = logging.getLogger(__name__)
def _symbol_set(symb):
if symb == None or symb == False:
if symb is None or symb == False:
return None
elif isinstance(symb, unicode):
return symb.encode('utf-8')
@@ -181,8 +181,8 @@ class reference(_column):
class char(_column):
_type = 'char'
def __init__(self, string, size, **args):
_column.__init__(self, string=string, size=size, **args)
def __init__(self, string="unknown", size=None, **args):
_column.__init__(self, string=string, size=size or None, **args)
self._symbol_set = (self._symbol_c, self._symbol_set_char)
# takes a string (encoded in utf8) and returns a string (encoded in utf8)
@@ -191,7 +191,7 @@ class char(_column):
# * we need to remove the "symb==False" from the next line BUT
# for now too many things rely on this broken behavior
# * the symb==None test should be common to all data types
if symb == None or symb == False:
if symb is None or symb == False:
return None
# we need to convert the string to a unicode object to be able
openerp/osv/orm.py
+2 -2
View File
@@ -758,7 +758,7 @@ class BaseModel(object):
'model_id': model_id,
'model': self._name,
'name': k,
'field_description': f.string.replace("'", " "),
'field_description': f.string,
'ttype': f._type,
'relation': f._obj or '',
'view_load': (f.view_load and 1) or 0,
@@ -767,7 +767,7 @@ class BaseModel(object):
'required': (f.required and 1) or 0,
'selectable': (f.selectable and 1) or 0,
'translate': (f.translate and 1) or 0,
'relation_field': (f._type=='one2many' and isinstance(f, fields.one2many)) and f._fields_id or '',
'relation_field': f._fields_id if isinstance(f, fields.one2many) else '',
'serialization_field_id': None,
}
if getattr(f, 'serialization_field', None):