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

[MERGE] trunk

Browse Source 
bzr revid: al@openerp.com-20120726130134-vu0vga82r4kmkz0h
bzr revid: al@openerp.com-20120801142759-5g65p3k2n628hq2i
This commit is contained in:
Antony Lesuisse
2012-08-01 16:27:59 +02:00
parent 28124a66f6 9559fcd398
commit f3938da91b
101 changed files with 2069 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/__openerp__.py
+1 -1
View File
@@ -96,6 +96,6 @@
'installable': True,
'auto_install': True,
'certificate': '0076807797149',
"css": [ 'static/src/css/modules.css' ],
'css': ['static/src/css/modules.css'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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-07-05 04:39+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:39+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:40+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:40+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:40+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:40+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:41+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:41+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:41+0000\n"
"X-Generator: Launchpad (build 15544)\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
+841 -82
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-07-05 04:42+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:47+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:46+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:47+0000\n"
"X-Generator: Launchpad (build 15544)\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
+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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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_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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:41+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:40+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:44+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:41+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:42+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:42+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:42+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:42+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:45+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:43+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:40+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:43+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:43+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:43+0000\n"
"X-Generator: Launchpad (build 15544)\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
+29 -29
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-07-08 22:23+0000\n"
"PO-Revision-Date: 2012-07-31 02:31+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-07-09 04:50+0000\n"
"X-Generator: Launchpad (build 15558)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
"X-Generator: Launchpad (build 15719)\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
@@ -1002,7 +1002,7 @@ msgstr "オマーン"
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp
msgid "MRP"
msgstr "MRP（資材所要量計画）"
msgstr "MRP"
#. module: base
#: report:ir.module.reference.graph:0
@@ -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
@@ -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
@@ -6423,7 +6423,7 @@ msgstr "多対1項目の属性削除"
#. module: base
#: model:ir.module.category,name:base.module_category_accounting_and_finance
msgid "Accounting & Finance"
msgstr "会計と金融"
msgstr "会計と財務"
#. module: base
#: field:ir.actions.server,write_id:0
@@ -6961,7 +6961,7 @@ msgstr ""
#: field:res.request,act_to:0
#: field:res.request.history,act_to:0
msgid "To"
msgstr ""
msgstr "宛先"
#. module: base
#: view:ir.sequence:0
@@ -7472,7 +7472,7 @@ msgstr "アクセスの作成"
#: field:res.partner.address,state_id:0
#: field:res.partner.bank,state_id:0
msgid "Fed. State"
msgstr ""
msgstr "都道府県"
#. module: base
#: field:ir.actions.server,copy_object:0
@@ -7703,7 +7703,7 @@ msgstr "販売員"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_accountant
msgid "Accounting and Finance"
msgstr "会計と金融"
msgstr "会計と財務"
#. module: base
#: code:addons/base/module/module.py:429
@@ -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
@@ -8215,7 +8215,7 @@ msgstr "中国語 / 简体中文"
#: field:res.partner.address,street:0
#: field:res.partner.bank,street:0
msgid "Street"
msgstr ""
msgstr "町名番地"
#. module: base
#: model:res.country,name:base.yu
@@ -11238,7 +11238,7 @@ msgid ""
"(default: 465)"
msgstr ""
"接続の暗号化方式を選択：\n"
"・ なし: SMTPセッションはクリアテキストで行われる。\n"
"・ なし: SMTPセッションはクリアテキストで行われます。\n"
"・ TLS（STARTTLS）：TLS暗号化はSMTPセッションの開始において要求されます（推奨）。\n"
"・ SSL/TLS：SMTPセッションは専用のポート（デフォルト：465）によってSSL/TLSで暗号化されます。"
@@ -12022,7 +12022,7 @@ msgstr "%m - 月[01,12]."
#: field:res.partner.address,city:0
#: field:res.partner.bank,city:0
msgid "City"
msgstr "市"
msgstr "市区町村"
#. module: base
#: model:res.country,name:base.qa
@@ -12068,7 +12068,7 @@ msgstr ""
"このモジュールはパートナのアドレスの中にGoogleマップ項目を追加します。\n"
"====================================================\n"
"\n"
"これを使うと、URLウィジットからGoogleマップを直接開くことができます。"
"これを使うと、URLウィジェットからGoogleマップを直接開くことができます。"
#. module: base
#: field:workflow.activity,action:0
@@ -12413,7 +12413,7 @@ msgstr "あなたが作成 / 書き込みたいオブジェクト。もし、そ
#: selection:ir.module.module,state:0
#: selection:ir.module.module.dependency,state:0
msgid "Not Installed"
msgstr "インストールされていません。"
msgstr "未インストール"
#. module: base
#: view:workflow.activity:0
@@ -12982,7 +12982,7 @@ msgstr "発注時の二重検証"
#: field:res.company,street2:0
#: field:res.partner.address,street2:0
msgid "Street2"
msgstr ""
msgstr "町名番地2"
#. module: base
#: model:ir.actions.act_window,name:base.action_view_base_module_update
@@ -14297,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
@@ -15305,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
@@ -15579,7 +15579,7 @@ msgstr "情報"
#. module: base
#: view:res.widget.user:0
msgid "User Widgets"
msgstr "ユーザウィジット"
msgstr "ユーザウィジェット"
#. module: base
#: view:base.module.update:0
@@ -17621,7 +17621,7 @@ 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
@@ -17742,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
@@ -17815,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-07-05 04:42+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:43+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:43+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:44+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:44+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:44+0000\n"
"X-Generator: Launchpad (build 15544)\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
+345 -23
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-07-05 04:44+0000\n"
"X-Generator: Launchpad (build 15544)\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
@@ -249,7 +249,7 @@ msgstr "Швецарь"
#: code:addons/orm.py:4206
#, python-format
msgid "created."
msgstr "үүсгэсэн."
msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -344,7 +344,7 @@ msgstr "Тайлан"
#: field:res.partner,subname:0
#: field:res.partner.address,name:0
msgid "Contact Name"
msgstr "Харьцах хүн"
msgstr "Харилцагчийн нэр"
#. module: base
#: code:addons/base/module/wizard/base_export_language.py:56
@@ -2940,7 +2940,7 @@ msgstr "Менежер"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
msgid "Customization"
msgstr "Өөрчлөн тохируулалт"
msgstr "Өөриймшүүлэлт"
#. module: base
#: model:res.country,name:base.py
@@ -3867,7 +3867,7 @@ msgstr "Баазын бүтэц"
#: model:ir.model,name:base.model_partner_massmail_wizard
#: view:partner.massmail.wizard:0
msgid "Mass Mailing"
msgstr "Э-мэйл илгээх"
msgstr "Масс Имэйл илгээх"
#. module: base
#: model:res.country,name:base.yt
@@ -7474,7 +7474,7 @@ msgstr "Цагийн Хуваарь"
#. module: base
#: field:res.partner,function:0
msgid "function"
msgstr "функц"
msgstr "үүрэг"
#. module: base
#: model:ir.ui.menu,name:base.menu_audit
@@ -7754,7 +7754,7 @@ msgstr "Хувилбар Ахиулах"
#: field:res.partner,address:0
#: view:res.partner.address:0
msgid "Contacts"
msgstr "Харьцах хүмүүс"
msgstr "Харилцагч"
#. module: base
#: model:res.country,name:base.fo
@@ -8982,7 +8982,7 @@ msgstr "Том бүхэл тоо"
#: selection:res.partner.address,type:0
#: selection:res.partner.title,domain:0
msgid "Contact"
msgstr "Харилцах хүн"
msgstr "Харилцагч"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_at
@@ -10831,6 +10831,44 @@ msgid ""
" * Graph of stock value variation\n"
" "
msgstr ""
"\n"
"Энэ модуль нь OpenERP-д үйлдвэрлэлийг менеж хийх үндсэн модуль юм.\n"
"=======================================================================\n"
"\n"
"Онцлог:\n"
"---------\n"
" * Хадгалуулах / Захиалуулах (мөр бүрээр)\n"
" * Олон түвшний жор, хязгааргүй\n"
" * Олон түвшний урсгал, хязгааргүй\n"
" * Шинжилгээний санхүүтэй уялдсан үйлдвэрлэлийн урсгал болон дамжлага\n"
" * Тогтол хугацааны тооцоолол / Яг Хугацаандааа модуль\n"
" * Олон-POS, Олон-Агуулах\n"
" * Эрэмбэлэх ялгаатай аргууд\n"
" * Өртөгийн арга бараагаар: Стандарт үнэ, Дундаж үнэ\n"
" * Бэрхшээл болон хэрэгцээний хялбар шинжилгээ\n"
" * Маш уян хатан\n"
" * Жоруудыг бүтцээр нь, завсрынхаар нь гэх мэт гүйцэд шинжилгээ, үзлэг\n"
"\n"
"Хадгалж болох бараа, үзүүлж болох үйлчилгээ зэрэгтэй бүрэн уялдаж дэмжиж "
"ажилладаг. Үйлчилгээ нь програм хангамжийн бусад хэсэгтэй бүрэн уялддаг. "
"Тухайлбал жор дотор дэд гэрээний үйлчилгээг оруулж тодорхойлж болох бөгөөд "
"үйлдвэрлэлийн угсаргааны явцад үйлчилгээг худалдан авах захиалгыг автоматаар "
"үүсгэдэг.\n"
"\n"
"Тайлангууд модулиар өгөгддөг:\n"
"--------------------------------\n"
" * Жорын бүтэц, бүртэл хэсгийн тайлан\n"
" * Дамжлагын ачааллын урьдчилсан таамаглал\n"
" * Үйлдврэлэлийн захиалгын баримт хэвлэх\n"
" * Барааны урьдчилсан таамаг\n"
"\n"
"Модулийн Хянах Самбар:\n"
"----------------------------------\n"
" * Дараагийн үйлдвэрлэлийн захиалгын жагсаалт\n"
" * Сондгой бэлтгэн нийлүүлэлтийн жагсаалт\n"
" * Дамжлагын ачааллыг график\n"
" * Барааны үнийн хазайлтын график\n"
" "
#. module: base
#: model:ir.module.module,description:base.module_google_base_account
@@ -11199,6 +11237,33 @@ msgid ""
"mail. \n"
" "
msgstr ""
"\n"
"Ирж байгаа имэйлийг POP / IMAP серверүүдээс хүлээж авдаг.\n"
"=============================================\n"
"\n"
"POP/IMAP имэйлийн параметрүүдийг тохируулаад энэ хаягт ирж байгаа "
"имэйлүүдийг OpenERP-руу татаж авдаг. Бүх POP3/IMAP серверүүд дэмжигддэг. "
"SSL/TLS серверүүд ч дэмжигдэнэ.\n"
"\n"
"Энэ нь имэйл оролцсон OpenERP-н маш олон ажлын урсгал дээр төрөл бүрийн "
"баримтыг үүсгэж болно. Тухайлбал:\n"
"\n"
" * CRM Сэжим/Боломж\n"
" * CRM Гомдол\n"
" * Төслийн асуудал\n"
" * Төслийн даалгавар\n"
" * Хүний Нөөц Бүрдүүлэлт (Өргөдөл гаргагч)\n"
" * гм.\n"
"\n"
"Өөрт хэрэг болох модулийг суулгаад баримтын төрлийг (Сэжим, Төслийн асуудал, "
"гм) имэйл хаягуудад оноож өгнө. Эдгээр хаягт ирсэн имэйлүүд нь харгалзах "
"баримтуудыг автоматаар үүсгэнэ. Эдгээрт шууд OpenERP дотроосоо хариулж болох "
"бөгөөд хариу нь эргээд энэ баримт дээрээ ирж бүх харилцаа нь ярилцлага "
"байдлаар бүгд нэг дор хөтлөгддөг.\n"
"\n"
"Бүр цаашилбал өөрийн тодорхойлсон үйдлийг (техник түвшинд бол: Серверийн "
"Үйлдлүүд) ирж байгаа имэйл дээр ажиллуулж болно. \n"
" "
#. module: base
#: help:ir.actions.server,email:0
@@ -11890,6 +11955,38 @@ msgid ""
" "
"fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
msgstr ""
"%s-н цагалбар харагдацыг үүсгэхэд өгөгдөл хангалтгүй байна, date_stop эсвэл "
"date_delay алга байна\" % (self._name)))\n"
"\n"
" return view\n"
"\n"
" def _get_default_search_view(self, cr, uid, context=None):\n"
" \"\n"
" :param cr: database cursor\n"
" :param int user: user id\n"
" :param dict context: connection context\n"
" :returns: an lxml document of the view\n"
" :rtype: etree._Element\n"
" \"\n"
" form_view = self.fields_view_get(cr, uid, False, 'form', "
"context=context)\n"
" tree_view = self.fields_view_get(cr, uid, False, 'tree', "
"context=context)\n"
"\n"
" # TODO it seems _all_columns could be used instead of fields_get (no "
"need for translated fields info)\n"
" fields = self.fields_get(cr, uid, context=context)\n"
" fields_to_search = set(\n"
" field for field, descriptor in fields.iteritems()\n"
" if descriptor.get('select'))\n"
"\n"
" for view in (form_view, tree_view):\n"
" view_root = etree.fromstring(view['arch'])\n"
" # Only care about select=1 in xpath below, because select=2 is "
"covered\n"
" # by the custom advanced search in clients\n"
" "
"fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
#. module: base
#: constraint:res.users:0
@@ -12472,6 +12569,8 @@ msgid ""
"Checked if this is an OpenERP Publisher's Warranty contract (versus older "
"contract types"
msgstr ""
"OpenERP-ийн нийтлэгчийн баталгааны гэрээ бол энэ нь тэмдэглэгдсэн байна "
"(хуучин гэрээний төрөлүүдээс ялгаатай"
#. module: base
#: field:ir.model.fields,model:0
@@ -13620,7 +13719,7 @@ msgstr ""
#. module: base
#: field:res.groups,trans_implied_ids:0
msgid "Transitively inherits"
msgstr ""
msgstr "Дамжиж давхар удамшдаг"
#. module: base
#: field:ir.default,ref_table:0
@@ -14090,6 +14189,38 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Энэ модуль нь state, date_start,date_stop буюу төлөв, эхлэх огноо, зогсох "
"огноо гэсэн талбаруудийг үйлдвэрлэлийн захиалгын үйлдлийн мөрүүдэд нэмдэг "
"(\"Ажлын төв\" хавтас дотор)\n"
"============================================================================="
"================================\n"
"\n"
"Төлөв: ноорог, батлагдсан, хийгдсэн, цуцалсан\n"
"Үйлдвэрлэлийн цахиалгыг дуусгах, батлахад мөрүүдийн төлөв нь дагаж "
"өөрчлөгддөг.\n"
"\n"
"Үүсгэгдэх меню:\n"
" Үйлдвэрлэл > Үйлдвэрлэл > Ажлын захиалгууд\n"
"\n"
"Үйлдвэрлэлийн захиалгын \"Ажлын төв\"-н мөрүүдийн харагдац.\n"
"\n"
"Үйлдвэрлэлийн захиалгын ажлын төв хавтаст дараах даруулуудыг нэмдэг:\n"
" * эхлэх (батлагдсан төлөвт оруулна), date_start буюу эхлэсэн огноог "
"тааруулна\n"
" * хийгдсэн (хийгдсэн төлөвт оруулна), date_stop буюу зогссон огноог "
"тааруулна\n"
" * ноороглох (ноорог төлөвт оруулна)\n"
" * цуцлах (төлөвийг цуцлагдсан төлөвтэй болгоно)\n"
"\n"
"Үйлдвэрлэлийн захиалга \"үйлдвэрлэхэд бэлэн\" болоход үйлдлүүд \n"
"'батлагдсан' төлөвтэй болох ёстой. Үйлдвэрлэлийн захиалга хийгдсэн төлөвтэй "
"болоход бүх үйлдлүүд хийгдсэн болох ёстой\n"
"\n"
"хугацаа талбар нь авсан хугацаа(stop date - start date).\n"
"Иймээс онолын хугацаа, бодит хугацааг жиших боломжтой болно.\n"
"\n"
" "
#. module: base
#: model:ir.module.module,description:base.module_auction
@@ -14113,6 +14244,24 @@ msgid ""
" * Objects By Day (graph)\n"
" "
msgstr ""
"\n"
"Энэ модуль нь зураач, дуудлага худалдааны бүтээл, худалдан авагч, худалдагч "
"нарыг бүртгэж менеж хийдэг.\n"
"============================================================================="
"====\n"
"\n"
"Энэ нь дуудлага худалдааны үнэ хаялцах, зарагдсан барааны төлсөн "
"төлөөгүйгээр ангилж хөтлөх, хүргэлтийн төлөв байдал гээд энэ бүгдийг бүгдийг "
"хөтлөж менеж хийдэг.\n"
"\n"
"Дуудлага худалдааны хянах самбар нь:\n"
" * Сүүлийн обьектууд (жагсаалт)\n"
" * Сүүлийн урьдчилгаа (жагсаалт)\n"
" * Обьектуудын статистик (жагсаалт)\n"
" * Нийт дутуу төлбөр (график)\n"
" * Хамгийн бага/Төлөгдөөгүй/Хамгийн их (график)\n"
" * Обьектууд өдөрөөр (график)\n"
" "
#. module: base
#: model:ir.module.module,description:base.module_base_crypt
@@ -14149,6 +14298,37 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Өгөгдлийн бааз дахь цэвэр текст нууц үгийг илүү нууцлаг hash бүхий нууц "
"үгээр сольдог\n"
"===============================================================\n"
"Байгаа хэрэглэгчдийн хувьд base_crypt модулийг суулгамагц цэвэр текст нууц "
"үгүүд илүү нууцлал сайтай шифрлэгдсэн нууц үгээр солигддог.\n"
"\n"
"Бүх нууц үгүүд шууд өгөгдлийн баазаас унших боломжгүй болж бүхд илүү "
"нууцлалтай, шифрлэгдсэн, давстай шифрлэгдсэн, cryptographic hash хийгдсэн "
"болж солигддог.\n"
"\n"
"Энэ модулийг суулгасан дараа мартсан нууц үгийг лавлаж, асуух сэргээх "
"боломжгүй болно. Зөвхөн шинэ нууц үгийг тохируулах боломжтой болно.\n"
"\n"
"Нууцлалын анхааруулга\n"
"++++++++++++++++\n"
"Энэ модулийг суулгаснаар нууцлалын бусад асуудлыг тоохгүй орхиж болохгүй. "
"Учир нь XML-RPCS, HTTPS зэрэг нууцлалтай протоколь ашиглаж байгаа биш л бол "
"нууц үгүүд нь сүлжээгээр цэвэр текст байдлаар дамжина. Мөн түүнчлэн нууц "
"үгээс бусад өгөгдлийн баазад байгаа өгөгдлийг нууцладаггүй. Иймээс нууцлалыг "
"сайжруулах асуудал нь системийн бүхэл хэсэгт систем админ өөрөө хийж хангах "
"ёстой. Тухайлбал: өгөгдлийн баазын нөөцлөлтүүдийг нууцалж хамгаалах, "
"системийн файлуудыг хамгаалах, алсын зайны shell хандалтыг хамгаалах, "
"серверийн физик хаяг порт зэрэгийг хамгаалах бүх л арга хэмжээг авах ёстой.\n"
"\n"
"LDAP эрхийн хяналттай холбох\n"
"+++++++++++++++++++++++++++++++++++\n"
"Энэ модуль нь одоогоор ``user_ldap`` модультай нийцтэй биш бөгөөд хэрэв "
"хоюуланг нь суулгавал ldap эрхийн хяналтыг тэр чигт нь идэвхгүй болгодог.\n"
"\n"
" "
#. module: base
#: field:ir.actions.act_window,view_id:0
@@ -14261,6 +14441,10 @@ msgid ""
"queries regarding your account, please contact us.\n"
"Thank you in advance.\n"
msgstr ""
"Бидний бүртгэлээс дараах төлбөрүүд нь хугацаа хэтэрсэн байдалтай байна. "
"Хэрэв төлөгдсөн бол энэ мэдэгдлийг тоохгүй байж болно. Гэхдээ өөрийн данс, "
"тооцоотой холбоотой аливаа асуулт байвал бидэнд хандана уу. Танд урьдчилан "
"баярлалаа.\n"
#. module: base
#: model:ir.module.module,shortdesc:base.module_users_ldap
@@ -14293,7 +14477,7 @@ msgstr ""
#. module: base
#: help:ir.values,value:0
msgid "Default value (pickled) or reference to an action"
msgstr ""
msgstr "Анхны утга (pickled - дарсан) эсвэл сурвалж үйлдэл"
#. module: base
#: sql_constraint:res.groups:0
@@ -14311,6 +14495,14 @@ msgid ""
"you can modify in OpenOffice. Once you have modified it you can\n"
"upload the report using the same wizard.\n"
msgstr ""
"\n"
"Энэ модуль нь OpenERP-н OpenOffice залгаастай хамт хэрэглэгддэг.\n"
"=========================================================\n"
"\n"
"Энэ модуль нь .sxw тайланг Импортлох/Экспортлох харилцах цонхыг нэмдэг "
"бөгөөд ингэснээр тайланг OpenOffice-р засварлах боломжтой болдог. Засварлаж "
"дуусаад адилхан харилцах цонхоор буцаагаад зассан хувилбарыг сервер ачаалж "
"болно.\n"
#. module: base
#: view:ir.sequence:0
@@ -14492,6 +14684,8 @@ msgid ""
"Here is what we got instead:\n"
" %s"
msgstr ""
"Бидэнд оронд байгаа зүйл бол:\n"
" %s"
#. module: base
#: model:ir.actions.act_window,name:base.action_model_data
@@ -15017,11 +15211,12 @@ msgid ""
"The Selection Options expression is must be in the [('key','Label'), ...] "
"format!"
msgstr ""
"Сонгох Сонголтын илэрхийлэл нь [('key','Label'), ...] форматтай байх ёстой!"
#. module: base
#: view:ir.filters:0
msgid "Current User"
msgstr ""
msgstr "Идэвхтэй Хэрэглэгч"
#. module: base
#: field:res.company,company_registry:0
@@ -15274,6 +15469,23 @@ msgid ""
"using it, otherwise it may crash.\n"
" "
msgstr ""
"\n"
"Энэ модулийн зорилго нь бусад модулийн чанарыг шалгах зориулалттай.\n"
"================================================================\n"
"\n"
"Энэ нь OpenERP дахь модулиудын модулийн жагсаалт дээр ажиллах харилцах "
"цонхыг үүсгэдэг.\n"
"Энэ харилцах цонхоор модулиудыг OpenERP кодчилолын стандарт, хурдын оновчтой "
"байдал зэрэг үзүүлэлтүүдээр үнэлэх боломжийг олгодог...\n"
"\n"
"Энэ модуль мөн та өөрийн чанарын шалгалтыг хийх framework-г өгдөг.\n"
"Программстуудын хувьд илүү дэлгэрэнгүй танилцахын тулд base_module_quality\\"
"README.txt файлыг унших хэрэгтэй.\n"
"\n"
"САНАМЖ: Энэ модуль нь модуль нь ZIP файл байдлаар ажиллаж чадахгүй учир "
"хэрэглэхийн өмнө задлаж байж хэрэглэх хэрэгтэй. Тэгэхгүй бол модуль нурж "
"гацдаг.\n"
" "
#. module: base
#: field:res.partner.bank,bank_name:0
@@ -15335,6 +15547,9 @@ msgid ""
"are available. To add a new language, you can use the 'Load an Official "
"Translation' wizard available from the 'Administration' menu."
msgstr ""
"Орчуулга байгаа бол хэрэглэгчийн график интерфейс хэрэглэгдэх анхны хэл. "
"Шинэ хэл нэмэхдээ 'Албан ёсны орчуулга ачаалах' харилцах цонхыг 'Удирдлага' "
"менюгээс сонгоно."
#. module: base
#: model:ir.module.module,description:base.module_l10n_es
@@ -15900,7 +16115,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_partner_wizard_ean_check
msgid "Ean Check"
msgstr ""
msgstr "Ean шалгалт"
#. module: base
#: view:res.partner:0
@@ -16701,7 +16916,7 @@ msgstr ""
#. module: base
#: view:res.partner.address:0
msgid "Search Contact"
msgstr "Хүн хайх"
msgstr "Харилцагч хайх"
#. module: base
#: view:ir.attachment:0
@@ -16775,7 +16990,7 @@ msgstr "Хязгаар"
#: help:workflow.transition,group_id:0
msgid ""
"The group that a user must have to be authorized to validate this transition."
msgstr ""
msgstr "Энэ шилжилтийг шалгах хэрэглэгчийн зөвшөөрөгдөх групп"
#. module: base
#: code:addons/orm.py:791
@@ -16890,6 +17105,40 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Имэйл үлгэрчлэл (Анхны байсан Power Email by Openlabs-ийн хялбаршуулсан "
"хувилбар)\n"
"============================================================================="
"\n"
"\n"
"OpenERP-н аль ч баримт (борлуулалт, нэхэмжлэл гэх мэт)-д хэрэглэж болох "
"имэйлийг зохиомжлох боломжийг олгодог. Зохиомжлохдоо илгээгч, хүлээн авагч, "
"гарчиг, бие(биеийг HTML болон Text байдлаар) гэх бүх хэсгийг зохиомжлох "
"боломжийг олгодог.Түүнчлэн имэйлдээ автоматаар хавсралт оруулах, хэвлэх, "
"тайлан хавсаргах зэрэг боломжуудыг оруулж өгч болдог.\n"
"\n"
"Шилдэг хэрэглээний хувьд үлгэрүүд нь үүсгэхдээ холбогдох баримтуудын динамик "
"аттрибутуудыг шууд авч үүсдэг байх явдал нь чухал. Жишээлбэл харилцагчийн "
"улсын нэрийг имэйлдээ оруулах болон аюулгүйн үүднээс заавал тусгагдах анхны "
"утгуудыг оруулах зэрэгээр хэрэглэж болно. Үлгэр болгон нь динамик утгуудыг "
"оруулах туслагчтай байдаг.\n"
"\n"
"Түүнчлэн хэрэв сонголтыг зөвшөөрсөн бол холбогдох баримтын баруун гар талд "
"имэйл үүсгэх туслагч гарч ирдэг. (ө.х. Нэхэмжлэлүүд).\n"
"Энэ нь имэйлийг хялбараар илгээх боломжийг олгодог. Өөрөөр хэлбэл шууд бэлэн "
"үлгэрээр динамик утгууд гүйцээгдсэн имэйлийг үүсгэж шаардлагатай бол "
"өөрчлөлт хийгээд шууд илгээдэг. Түүнчлэн энэ боломж олон баримт дээр "
"хэрэглэсэн тохиолдолд масс имэйл илгээх боломжтой байдаг.\n"
"\n"
"Эдгээр имэйл үлгэрүүд мөн нөгөөтэйгүүр маркетингийн компанит системийн гол "
"зүрх болж байдаг.\n"
"(``marketing_campaign`` модулийг харна уу), хэрэв томоохон компанит ажлыг "
"OpenERP-д хэрэглэхээр бол хэрэглэж болно.\n"
"\n"
"Техникийн тэмдэглэл: Анхны Power Email by Openlabs-н имэйл үлгэр хийдэг "
"хэсэг нь хэрэглэгдэж үлдсэн.\n"
"\n"
" "
#. module: base
#: selection:base.language.install,lang:0
@@ -17058,11 +17307,13 @@ msgid ""
"Helps you handle your accounting needs, if you are not an accountant, we "
"suggest you to install only the Invoicing."
msgstr ""
"Санхүүгийн боловсруулалтын хэрэгцээг хангахад тусалдаг, хэрэв та нягтлан бол "
"зөвхөн нэхэмжлэлийг суулгахыг зөвлөе."
#. module: base
#: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
msgid "Thunderbird Plug-In"
msgstr ""
msgstr "Thunderbird залгаас"
#. module: base
#: model:ir.model,name:base.model_res_country
@@ -17094,6 +17345,9 @@ msgid ""
" OpenERP Web test suite.\n"
" "
msgstr ""
"\n"
" OpenERP вебийн тестийн иж бүрдэл.\n"
" "
#. module: base
#: view:ir.values:0
@@ -17118,7 +17372,7 @@ msgstr "Өнгө Өөрчлөх"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_15
msgid "IT sector"
msgstr ""
msgstr "МТ салбар"
#. module: base
#: view:ir.actions.act_window:0
@@ -17143,11 +17397,16 @@ msgid ""
"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
"106,500. Provided ',' as the thousand separator in each case."
msgstr ""
"Тусгаарлагчийн формат нь [,n] гэсэн хэлбэртэй байх ёстой. Энд 0 < n :Нэгжийн "
"цифр нь.-1 -с эхлээд тусгаарлалтийг төгсгөнө. ө.х. [3,2,-1] нь 106500 гэсэн "
"тоог 1,06,500 байдлаар илэрхийлнэ;[1,2,-1] нь 106,50,0 гэсэн байдлаар "
"илэрхийлнэ;[3] нь 106,500 гэсэн байдлаар илэрхийлнэ. Өгөгдсөн ',' бүх "
"тохиолдолд мянгатын тусгаарлагч байна"
#. module: base
#: field:ir.module.module,auto_install:0
msgid "Automatic Installation"
msgstr ""
msgstr "Автомат Суулгалт"
#. module: base
#: model:res.country,name:base.jp
@@ -17158,7 +17417,7 @@ msgstr "Япон"
#: code:addons/base/ir/ir_model.py:357
#, python-format
msgid "Can only rename one column at a time!"
msgstr ""
msgstr "Нэг удаад зөвхөн нэг баганын нэрийг өөрчилж чадна!"
#. module: base
#: selection:ir.translation,type:0
@@ -17199,6 +17458,33 @@ msgid ""
"Leads.\n"
" "
msgstr ""
"\n"
"Энэ модуль нь маркетингийн компанит ажлаар сэжимийг автоматжуулдаг (компанит "
"ажил нь бүх төрлийн нөөц байж болно. Зөвхөн CRM сэжимээр хязгаарлагдахгүй).\n"
"============================================================================="
"============================================================\n"
"\n"
"Компанит ажил нь динамик бөгөөд олон суваг юм. Процесс нь дараах байдалтай:\n"
" * Маркетингийн компанит ажлыг ажлын ургсал шигээр зохиомжлох хэрэгтэй "
"бөгөөд үүнд имэйл үлгэр, хэвлэх илгээх тайлангууд, өөриймшүүлсэн үйлдлүүд "
"зэрэг зүйлс хамаарна.\n"
" * Компанит ажилд хэрэглэгдэх сегментүүдийг тодорхойлно. (ө.х зөвхөн "
"тодорхой хэдэн улсаас сэжмийг авна гэх мэт.)\n"
" * Тестийн горимд компанит ажлыг симулаци хийж туршиж болно. Ингээд өшөө "
"нарийвчлан тохируулж болно.\n"
" * Гар горимоор жинхэнэ компанит ажлыг эхлүүлж болно. Ингээд бүх үйлдэл "
"гар шалгалтыг шаардах болно.\n"
" * Эцэст нь компанит ажлыг эхлүүлж бүх зүйлс бүрэн автомат хийгдэж "
"байгааг статистикуудаар харж эхлэнэ.\n"
"\n"
"Компанит ажил явагдаж байх үед ч гэсэн сегментчлэл, ажлын урсгал зэрэгийг "
"нарийвчлан тохируулах ажлыг үргэлжлүүлэн хийх боломжтйо.\n"
"\n"
"Санамж: Хэрэв танд туршилтын үзүүлэн өгөгдөл хэрэгтэй бол "
"marketing_campaign_crm_demo модулийг суулгаж болно. Гэхдээ энэ нь мөн CRM "
"модулийн туршилтын өгөгдөлтэй суулгадаг тул илүүж туршилтын өгөгдөл сэжимүүд "
"үүсдэгийг анхаарах хэрэгтэй.\n"
" "
#. module: base
#: selection:ir.actions.act_window.view,view_mode:0
@@ -17277,7 +17563,7 @@ msgstr "Нөхцөл"
#. module: base
#: help:res.currency,rate:0
msgid "The rate of the currency to the currency of rate 1."
msgstr ""
msgstr "1-тэй тэнцэн ханштай валют руу хөрвөх тухайн валютын ханш."
#. module: base
#: field:ir.ui.view,name:0
@@ -17387,7 +17673,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
msgid "eMail Gateway for Project Issues"
msgstr ""
msgstr "Төслийн Асуудлуудын Имэйл үүд"
#. module: base
#: field:res.partner.bank,partner_id:0
@@ -17423,13 +17709,13 @@ msgstr "Дараагийн дугаарлалт нь энэ утгаар нэм
#: code:addons/orm.py:341
#, python-format
msgid "Wrong ID for the browse record, got %r, expected an integer."
msgstr ""
msgstr "Browse хийж байгаа бичлэгийн буруу ID, %r-г авлаа, бүхэл байх ёстой."
#. module: base
#: field:res.partner.address,function:0
#: selection:workflow.activity,kind:0
msgid "Function"
msgstr "Функц"
msgstr "Үүрэг"
#. module: base
#: view:res.widget:0
@@ -17442,6 +17728,8 @@ msgid ""
"Manage relations with prospects and customers using leads, opportunities, "
"requests or issues."
msgstr ""
"Сэжим, боломж, хүсэлт, асуудал зэрэгийг ашиглана захиалагч, ирээдүйн "
"захиалагчтай харилцааг менеж хийдэг."
#. module: base
#: selection:res.partner.address,type:0
@@ -17587,6 +17875,20 @@ msgid ""
" A + B + C -> D + E\n"
" "
msgstr ""
"\n"
"Энэ модуль нь нэг үйлдвэрлэлийн захиалгаас хэд хэдэн бараа үүсгэх боломжийг "
"олгодог.\n"
"============================================================================="
"\n"
"\n"
"Дэд бараануудыг жор дотор тохируулах боломжтой.\n"
"\n"
"Энэ модуль үгүйгээр:\n"
" A + B + C -> D\n"
"\n"
"Энэ модультайгаар:\n"
" A + B + C -> D + E\n"
" "
#. module: base
#: model:res.country,name:base.lk
@@ -17619,6 +17921,26 @@ msgid ""
"module.\n"
" "
msgstr ""
"\n"
"Энэ модуль нь ямар ч хөгжүүлэлтгүйгээр шинэ модуль үүсгэх боломжийг "
"олгодог.\n"
"======================================================================\n"
"\n"
"Энэ нь бүх үйлдлийг үйлдэл бичих үед бичиж аваад .ZIP модулийг үүсгэдэг. "
"Иймээс та өөрийн модулийг шууд клиент хандалтаас үүсгэнэ.\n"
"\n"
"Энэ хувилбар нь бичлэг үүсгэх, бичлэг засах байдлаар ажилладаг. Энэ нь бүх "
"виджетүүдийн хамаарлыг дахин тооцоолдог. (many2one, many2many, ...) Энэ нь "
"мөн ажлын урсгал болон жишээ өгөгдөл, өгөгдөл шинэчлэх зэрэгийг дэмждэг.\n"
"\n"
"Энэ боломж нь хялбараар өөриймшүүлсэн бөгөөд ашиглах, дахин ашиглах "
"боломжтой модулиудыг хялбараар үүсгэх боломжийг олгодог.\n"
"\n"
"Яаж хэрэглэх вэ:\n"
"Удирдлага/Өөриймшүүлэлт/Модуль үүсгэх/Өөриймшүүлэлтийг модуль болгох "
"экспортлох харилцах цонхыг хэрэглэнэ.\n"
"Огноо цагийн нөхцөл, бичлэг хийх обьектуудыг сонгоод бичлэгийг хийж эхлэнэ.\n"
" "
#. module: base
#: selection:base.language.install,lang:0
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-07-05 04:44+0000\n"
"X-Generator: Launchpad (build 15544)\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
+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-07-05 04:41+0000\n"
"X-Generator: Launchpad (build 15544)\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
@@ -6141,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
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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:44+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:45+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:47+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:45+0000\n"
"X-Generator: Launchpad (build 15544)\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
+6 -6
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-01-31 16:29+0000\n"
"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
"PO-Revision-Date: 2012-07-26 16:30+0000\n"
"Last-Translator: Rinat Karimov <Unknown>\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-07-05 04:45+0000\n"
"X-Generator: Launchpad (build 15544)\n"
"X-Launchpad-Export-Date: 2012-07-27 05:22+0000\n"
"X-Generator: Launchpad (build 15694)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -2732,7 +2732,7 @@ msgstr "Очистить ID"
#. module: base
#: view:res.groups:0
msgid "Inherited"
msgstr ""
msgstr "Унаследованный"
#. module: base
#: field:ir.model.fields,serialization_field_id:0
@@ -6614,7 +6614,7 @@ msgstr "Совет"
#. module: base
#: view:res.company:0
msgid "Header/Footer of Reports"
msgstr ""
msgstr "Заголовок/подвал отчетов"
#. module: base
#: code:addons/base/res/res_users.py:746
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-07-05 04:45+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:46+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:39+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:45+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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
+104 -37
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-07-05 04:46+0000\n"
"X-Generator: Launchpad (build 15544)\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
@@ -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
@@ -10863,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
@@ -11608,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
@@ -12359,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
@@ -12734,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
@@ -13066,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
@@ -14300,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
@@ -14411,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
@@ -14584,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
@@ -15090,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
@@ -15194,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
@@ -15626,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
@@ -15769,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-07-05 04:46+0000\n"
"X-Generator: Launchpad (build 15544)\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
+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-07-11 05:14+0000\n"
"X-Generator: Launchpad (build 15593)\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/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-07-05 04:46+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:47+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:47+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:47+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:47+0000\n"
"X-Generator: Launchpad (build 15544)\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-07-05 04:48+0000\n"
"X-Generator: Launchpad (build 15544)\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
+136 -176
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>
@@ -78,7 +71,6 @@
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
string="Client Action"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
@@ -210,7 +202,6 @@
<search string="Sequences">
<field name="name" string="Sequence"/>
<field name="code"/>
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company"/>
</search>
</field>
@@ -288,13 +279,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 +330,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 +366,6 @@
<field name="groups_id"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@@ -401,12 +390,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Report Xml">
<group col="10" colspan="4">
<field name="name"
filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
string="Report"/>
</group>
<newline/>
<field name="name"
filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
string="Report"/>
<group expand="0" string="Group By" colspan="4">
<filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'report_type'}"/>
</group>
@@ -445,14 +431,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 +485,6 @@
<field name="groups_id"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@@ -506,11 +494,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Open a Window">
<group col="10" colspan="4">
<field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
<field name="view_type"/>
</group>
<newline/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
<field name="view_type"/>
<group expand="0" string="Group By" colspan="4">
<filter string="View Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'view_type'}"/>
</group>
@@ -668,7 +653,6 @@
<field name="arch" type="xml">
<search string="Views">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_zoom"
string="Search"
domain="[('type', '=', 'search')]"/>
@@ -678,10 +662,8 @@
<filter icon="gtk-new"
string="Form"
domain="[('type', '=','form')]"/>
<separator orientation="vertical"/>
<field name="inherit_id"/>
<field name="type"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -809,31 +791,26 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Attachments">
<group colspan="4" col="10">
<field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
<field name="create_date"/>
<separator orientation="vertical"/>
<filter icon="terp-stage"
string="URL"
domain="[('type','=','url')]"/>
<filter icon="terp-stock_align_left_24"
string="Binary"
domain="[('type','=','binary')]"/>
<filter name="my_documents_filter"
string="My Document(s)"
icon="terp-personal"
domain="[('create_uid','=',uid)]"
help="Filter on my documents"/>
<separator orientation="vertical"/>
<field name="create_uid"/>
<field name="type"/>
</group>
<newline/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
<field name="create_date"/>
<filter icon="terp-stage"
string="URL"
domain="[('type','=','url')]"/>
<filter icon="terp-stock_align_left_24"
string="Binary"
domain="[('type','=','binary')]"/>
<separator/>
<filter name="my_documents_filter"
string="My Document(s)"
icon="terp-personal"
domain="[('create_uid','=',uid)]"
help="Filter on my documents"/>
<field name="create_uid"/>
<field name="type"/>
<group expand="0" string="Group By...">
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
<filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
</group>
</search>
@@ -858,12 +835,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">
@@ -958,10 +939,10 @@
<field name="arch" type="xml">
<search string="Model Description">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test"
string="In Memory"
domain="[('osv_memory', '=', True)]"/>
<separator/>
<filter icon="terp-stock_align_left_24"
string="Custom"
domain="[('state', '=', 'manual')]"/>
@@ -980,38 +961,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>
@@ -1039,22 +1019,21 @@
<field name="arch" type="xml">
<search string="Fields">
<field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
<separator orientation="vertical"/>
<filter icon="terp-gnome-cpu-frequency-applet+"
string="Required"
domain="[('required', '=', True)]"/>
<separator/>
<filter icon="terp-dialog-close"
string="Readonly"
domain="[('readonly', '=', True)]"/>
<separator/>
<filter icon="terp-translate"
string="Translate"
domain="[('translate', '=', True)]"/>
<newline/>
<field name="model_id"/>
<field name="ttype"/>
<field name="required"/>
<field name="readonly"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
@@ -1111,14 +1090,11 @@
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
string="External Identifier"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test"
string="Updatable"
domain="[('noupdate', '=', False)]"/>
<separator orientation="vertical"/>
<field name="res_id"/>
<field name="noupdate"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -1244,7 +1220,6 @@
<filter icon="terp-gdu-smart-failing"
string="Untranslated"
domain="['|',('value', '=', False),('value','=','')]"/>
<separator orientation="vertical"/>
<field name="lang"/>
<field name="src"/>
<field name="value"/>
@@ -1473,11 +1448,9 @@
<field name="arch" type="xml">
<search string="Scheduled Actions">
<field name="name" string="Scheduled Action"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection"/>
<field name="user_id"/>
<field name="nextcall"/>
<field name="active"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Execution" icon="terp-go-month"
@@ -1558,18 +1531,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Access Controls">
<group>
<field name="name" string="Access Control"/>
<separator orientation="vertical"/>
<filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
<separator orientation="vertical"/>
<field name="model_id"/>
<field name="group_id"/>
</group>
<newline/>
<field name="name" string="Access Control"/>
<filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
<separator/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
<field name="model_id"/>
<field name="group_id"/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
<filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
@@ -1655,17 +1624,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Record Rules">
<group>
<field name="name" string="Record Rule"/>
<separator orientation="vertical"/>
<filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
<separator orientation="vertical"/>
<field name="model_id"/>
<field name="groups"/>
</group>
<field name="name" string="Record Rule"/>
<filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
<separator/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
<field name="model_id"/>
<field name="groups"/>
</search>
</field>
</record>
@@ -1694,13 +1660,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 +1740,6 @@
</page>
</notebook>
<field name="type" readonly="1"/>
</sheet>
</form>
</field>
</record>
@@ -1796,13 +1764,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Server Actions">
<group col="10" colspan="4">
<field name="name" string="Server Action"/>
<separator orientation="vertical"/>
<field name="model_id"/>
<field name="state"/>
</group>
<newline/>
<field name="name" string="Server Action"/>
<field name="model_id"/>
<field name="state"/>
<group expand="0" string="Group By" colspan="4" col="4">
<filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
</group>
@@ -1849,6 +1813,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 +1833,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>
@@ -1880,14 +1844,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Actions">
<group>
<filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
<separator orientation="vertical"/>
<field name="action_id"/>
<field name="category_id"/>
<field name="state"/>
</group>
<newline/>
<filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
<field name="action_id"/>
<field name="category_id"/>
<field name="state"/>
<group expand="0" string="Group By...">
<filter string="Category" context="{'group_by': 'category_id'}" icon="terp-folder-orange"/>
</group>
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_filters.xml
+1 -2
View File
@@ -54,13 +54,12 @@
<field name="arch" type="xml">
<search string="Filters">
<field name="name" string="Filter Name"/>
<separator orientation="vertical"/>
<filter string="Personal" domain="[('user_id','!=',False)]" help="Filters visible only for one user"/>
<filter string="Shared" domain="[('user_id','=',False)]" help="Filters shared with all users"/>
<separator/>
<filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
name="my_filters"
string="My Filters"/>
<separator orientation="vertical"/>
<field name="model_id"/>
<field name="user_id"/>
</search>
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/workflow/workflow_view.xml
+14 -20
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>
@@ -166,16 +164,13 @@
<field name="arch" type="xml">
<search string="Workflow Activity">
<field name="name" string="Workflow Activity"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Flow Start"
domain="[('flow_start', '=',True)]" />
<filter icon="terp-gtk-stop" string="Flow Stop"
domain="[('flow_stop', '=',True)]" />
<separator orientation="vertical"/>
<field name="wkf_id"/>
<field name="action_id"/>
<field name="kind"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
</group>
@@ -206,14 +201,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>
@@ -240,7 +239,6 @@
<field name="arch" type="xml">
<search string="Transition">
<field name="signal" filter_domain="['|', ('signal','ilike',self), ('condition','ilike',self)]" string="Workflow Transition"/>
<separator orientation="vertical"/>
<field name="act_from"/>
<field name="act_to"/>
</search>
@@ -299,10 +297,8 @@
<field name="arch" type="xml">
<search string="Workflow Instances">
<field name="res_type" string="Resource Object"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
<separator orientation="vertical"/>
<field name="wkf_id" widget="selection"/>
<field name="wkf_id"/>
<field name="res_id"/>
<field name="state"/>
</search>
@@ -364,10 +360,8 @@
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="state" string="State"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
<separator orientation="vertical"/>
<field name="wkf_id" widget="selection"/>
<field name="wkf_id"/>
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
openerp/addons/base/module/module.py
+5 -26
View File
@@ -363,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',
@@ -456,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'})
@@ -481,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
@@ -649,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_data.xml
+5
View File
@@ -132,6 +132,11 @@
<record model="res.groups" id="group_multi_company">
<field name="category_id" ref="module_category_usability"/>
</record>
<record model="res.groups" id="group_multi_currency">
<field name="category_id" ref="module_category_usability"/>
</record>
<record model="res.groups" id="group_no_one">
<field name="category_id" ref="module_category_usability"/>
</record>
openerp/addons/base/module/module_view.xml
+14 -16
View File
@@ -41,21 +41,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<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"/>
<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)]"/>
<filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
<filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
<separator orientation="vertical"/>
<field name="category_id"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
</group>
<field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
<field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
<filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
<filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
<separator/>
<filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
<filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
<field name="category_id"/>
<group expand="0" string="Group By...">
<filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
</group>
</search>
</field>
@@ -70,6 +66,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 +75,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>
openerp/addons/base/module/wizard/base_export_language_view.xml
+6 -4
View File
@@ -21,10 +21,12 @@
<field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
<field height="80" name="advice" nolabel="1" colspan="4"/>
</group>
<footer>
<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" />
<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>
openerp/addons/base/module/wizard/base_import_language_view.xml
+4 -8
View File
@@ -9,14 +9,10 @@
<field name="arch" type="xml">
<form string="Import Translation" version="7.0">
<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>
<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"/>
openerp/addons/base/module/wizard/base_language_install_view.xml
+6 -5
View File
@@ -8,7 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Load a Translation" version="7.0">
<separator string="Load a Translation"/>
<field name="state" invisible="1"/>
<group states="init">
<field name="lang"/>
@@ -18,10 +17,12 @@
<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>
<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"/>
<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>
openerp/addons/base/module/wizard/base_module_update_view.xml
+15 -12
View File
@@ -9,24 +9,27 @@
<field name="arch" type="xml">
<form string="Update Module List" version="7.0">
<field name="state" invisible="1"/>
<separator string="Module Update Result" colspan="4"/>
<group states="init" colspan="4">
<label string="Click on Update below to start the process..." colspan="4"/>
<separator string="Module Update Result"/>
<group states="init">
<label string="Click on Update below to start the process..." />
</group>
<group states="done" colspan="4">
<field name="update" colspan="4"/>
<field name="add" colspan="4"/>
<group states="done" >
<field name="update"/>
<field name="add" />
</group>
<footer>
<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" />
<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
+2 -2
View File
@@ -22,7 +22,7 @@
</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,7 +44,7 @@
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Apply Scheduled Upgrades" version="7.0">
<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>
openerp/addons/base/module/wizard/base_update_translations_view.xml
+1 -3
View File
@@ -11,9 +11,7 @@
<field name="lang"/>
</group>
<footer>
<button name="act_update" string="Update" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
<button name="act_cancel" special="cancel" string="Cancel" type="object"/>
</footer>
</form>
</field>
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/ir_property_view.xml
-2
View File
@@ -9,12 +9,10 @@
<field name="arch" type="xml">
<search string="Parameters">
<field name="name" string="Name"/>
<separator orientation="vertical"/>
<filter icon="terp-project"
string="Generic"
help="Parameters that are used by all resources."
domain="[('res_id','=',False)]"/>
<separator orientation="vertical"/>
<field name="fields_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</search>
openerp/addons/base/res/res_bank_view.xml
-2
View File
@@ -146,9 +146,7 @@
<field name="arch" type="xml">
<search string="Bank Accounts">
<field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
<separator orientation="vertical"/>
<filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
<separator orientation="vertical"/>
<field name="company_id" invisible="context.get('company_hide', True)"/>
<field name="partner_id"/>
</search>
openerp/addons/base/res/res_company.py
+2 -2
View File
@@ -108,12 +108,12 @@ 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'),
openerp/addons/base/res/res_company_view.xml
+43 -39
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>
@@ -174,8 +178,8 @@
<field name="arch" type="xml">
<search string="Multi Company">
<field name="name" string="Name"/>
<field name="company_id" widget="selection"/>
<field name="company_dest_id" widget="selection"/>
<field name="company_id"/>
<field name="company_dest_id"/>
<field name="object_id"/>
</search>
</field>
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_country_view.xml
+1 -1
View File
@@ -41,7 +41,7 @@
<field name="help">Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained.</field>
</record>
<menuitem id="menu_localisation" name="Localisation" parent="menu_config_address_book" sequence="1"/>
<menuitem id="menu_localisation" name="Localisation" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>
<menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="0" groups="base.group_no_one"/>
openerp/addons/base/res/res_currency_view.xml
+1 -1
View File
@@ -78,7 +78,7 @@
<field name="search_view_id" ref="view_currency_search"/>
</record>
<menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3"/>
<menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3" groups="base.group_multi_currency"/>
<!--
Currency Rate Type
openerp/addons/base/res/res_lang_view.xml
+5 -9
View File
@@ -108,15 +108,11 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Languages">
<group>
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
string="Language"/>
<separator orientation="vertical"/>
<filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
<separator orientation="vertical"/>
<field name="direction"/>
</group>
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
string="Language"/>
<filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
<field name="direction"/>
</search>
</field>
</record>
openerp/addons/base/res/res_partner.py
+38 -3
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
@@ -103,12 +104,15 @@ class res_partner_category(osv.osv):
class res_partner_title(osv.osv):
_name = 'res.partner.title'
_order = 'name'
_columns = {
'name': fields.char('Title', required=True, size=46, translate=True),
'shortcut': fields.char('Abbreviation', required=True, size=16, translate=True),
'shortcut': fields.char('Abbreviation', size=16, translate=True),
'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
}
_order = 'name'
_defaults = {
'domain': 'contact',
}
def _lang_get(self, cr, uid, context=None):
lang_pool = self.pool.get('res.lang')
@@ -301,6 +305,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 = []
openerp/addons/base/res/res_partner_view.xml
+59 -62
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>
@@ -31,7 +33,6 @@
<group col="4">
<field name="name"/>
<field name="shortcut"/>
<field name="domain"/>
</group>
</form>
</field>
@@ -70,11 +71,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,27 +99,25 @@
<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"/>
<field name="name" default_focus="1"/>
</h1>
<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)"/>,
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"
@@ -152,12 +148,12 @@
<field name="fax"/>
<field name="email" widget="email"/>
<field name="title" domain="[('domain', '=', 'contact')]"
class="oe_no_button" attrs="{'invisible': [('is_company','=', True)]}"/>
options='{"no_open": true}' attrs="{'invisible': [('is_company','=', True)]}" />
</group>
</group>
<notebook colspan="4">
<page string="Contacts">
<page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}">
<field name="child_ids" context="{'default_parent_id': active_id}" mode="kanban">
<kanban>
<field name="color"/>
@@ -198,7 +194,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>
@@ -216,18 +212,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"/>
<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>
@@ -243,22 +245,20 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Partner">
<group col='10' colspan='4'>
<field name="name"
filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
string="Partner"/>
<separator orientation="vertical"/>
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
<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"/>
<separator orientation="vertical"/>
<field name="category_id"/>
<field name="user_id"/>
<field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
</group>
<newline />
<field name="name"
filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
string="Partner"/>
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
<separator/>
<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)]"/>
<separator/>
<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
<separator/>
<filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
<field name="category_id"/>
<field name="user_id"/>
<field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
<group expand="0" string="Group By...">
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
<filter string="Company" context="{'group_by': 'parent_id'}"/>
@@ -290,6 +290,7 @@
<field name="country_id"/>
<field name="mobile"/>
<field name="state_id"/>
<field name="category_id"/>
<templates>
<t t-name="kanban-box">
<div class="oe_kanban_vignette">
@@ -297,20 +298,20 @@
<img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_image"/>
</a>
<div class="oe_kanban_details">
<h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
</h4>
<ul>
<li t-if="record.parent_id.raw_value and !record.function.raw_value"><field name="parent_id"/></li>
<li t-if="!record.parent_id.raw_value and record.function.raw_value"><field name="function"/></li>
<li t-if="record.parent_id.raw_value and record.function.raw_value"><field name="function"/> at <field name="parent_id"/></li>
<li t-if="record.city.raw_value and !record.country.raw_value"><field name="city"/></li>
<li t-if="!record.city.raw_value and record.country.raw_value"><field name="country"/></li>
<li t-if="record.city.raw_value and record.country.raw_value"><field name="city"/>, <field name="country"/></li>
<li t-if="record.mobile.raw_value"><field name="mobile"/></li>
<li t-if="record.phone.raw_value">Tel: <field name="phone"/></li>
<li t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></li>
<li t-if="record.email.raw_value"><a t-attf-href="mailto:#{record.email.raw_value}"><field name="email"/></a></li>
</ul>
<h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a></h4>
<div class="oe_kanban_partner_categories"/>
<div class="oe_kanban_partner_links"/>
<ul>
<li t-if="record.parent_id.raw_value and !record.function.raw_value"><field name="parent_id"/></li>
<li t-if="!record.parent_id.raw_value and record.function.raw_value"><field name="function"/></li>
<li t-if="record.parent_id.raw_value and record.function.raw_value"><field name="function"/> at <field name="parent_id"/></li>
<li t-if="record.city.raw_value and !record.country.raw_value"><field name="city"/></li>
<li t-if="!record.city.raw_value and record.country.raw_value"><field name="country"/></li>
<li t-if="record.city.raw_value and record.country.raw_value"><field name="city"/>, <field name="country"/></li>
<li t-if="record.phone.raw_value">Tel: <field name="phone"/></li>
<li t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></li>
<li t-if="record.email.raw_value"><a t-attf-href="mailto:#{record.email.raw_value}"><field name="email"/></a></li>
</ul>
</div>
</div>
@@ -430,11 +431,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>
@@ -513,4 +511,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 -20
View File
@@ -58,7 +58,7 @@
<field name="comment"/>
</page>
</notebook>
</sheet>
</sheet>
</form>
</field>
</record>
@@ -85,13 +85,13 @@
<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"/>
@@ -104,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"/>
@@ -117,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>
@@ -192,18 +191,18 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<form string="Users" version="7.0">
<sheet>
<field name="avatar" widget='image' on_change="onchange_avatar(avatar)" class="oe_avatar oe_left"/>
<div class="oe_title">
<h1>
<field name="name" readonly="1"/>
</h1>
<h2>
<field name="login" readonly="1"/>
</h2>
<sheet>
<div class="oe_right oe_avatar">
<field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
</div>
<group col="4" name="preferences" 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)"/>
openerp/addons/base/security/base_security.xml
+4
View File
@@ -23,6 +23,10 @@
<record model="res.groups" id="group_multi_company">
<field name="name">Multi Companies</field>
</record>
<record model="res.groups" id="group_multi_currency">
<field name="name">Multi Currencies</field>
</record>
<record model="res.groups" id="group_no_one">
<field name="name">Technical Features</field>
openerp/import_xml.rng
+2 -4
View File
@@ -19,10 +19,8 @@
<rng:element name="value">
<rng:optional><rng:attribute name="model" /></rng:optional>
<rng:optional><rng:attribute name="search" /></rng:optional>
<rng:optional>
<rng:attribute name="eval"/>
</rng:optional>
<rng:empty />
<rng:optional><rng:attribute name="eval" /></rng:optional>
<rng:optional><rng:text/></rng:optional>
</rng:element>
</rng:define>
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

Some files were not shown because too many files have changed in this diff Show More