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

[MERGE] merged trunk. 

bzr revid: vmt@openerp.com-20120619132718-ag1j3itm69u8h419
This commit is contained in:
Vo Minh Thu 2012-06-19 15:27:18 +02:00
parent 83d799559c 34b298f52d
commit 877ec2d7a8
114 changed files with 6698 additions and 4109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openerp/addons/base/__openerp__.py
View File

@ -65,12 +65,7 @@
'res/res_bank_view.xml',
'res/res_country_view.xml',
'res/res_currency_view.xml',
'res/res_partner_event_view.xml',
'res/res_users_view.xml',
'res/wizard/partner_sms_send_view.xml',
'res/wizard/partner_wizard_massmail_view.xml',
'res/wizard/partner_clear_ids_view.xml',
'res/wizard/partner_wizard_ean_check_view.xml',
'res/res_partner_data.xml',
'res/ir_property_view.xml',
'security/base_security.xml',

4
openerp/addons/base/i18n/ab.po
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-05-12 05:32+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/af.po
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-05-12 05:32+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/am.po
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-05-12 05:32+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

10
openerp/addons/base/i18n/ar.po
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-05-12 05:33+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -184,7 +184,7 @@ msgstr "عمليّة"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
msgid "Billing Rates on Contracts"
msgstr ""
msgstr "عدل الفواتير علي العقود"
#. module: base
#: code:addons/base/res/res_users.py:558
@ -217,7 +217,7 @@ msgstr "ir.ui.view.custom"
#: code:addons/base/ir/ir_model.py:313
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
msgstr ""
msgstr "إعادة تسمية الحقل \"%s\" غير مسموحة"
#. module: base
#: model:res.country,name:base.sz
@ -465,7 +465,7 @@ msgstr "أحد السجلات التي تحاول تعديلها قد تمّ ح
#. module: base
#: model:ir.module.module,shortdesc:base.module_pad_project
msgid "Specifications on PADs"
msgstr ""
msgstr "مواصفات الباد (PADs)"
#. module: base
#: help:ir.filters,user_id:0

4
openerp/addons/base/i18n/bg.po
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-05-12 05:33+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/bs.po
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-05-12 05:33+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/ca.po
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-05-12 05:33+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/cs.po
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-05-12 05:33+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Poedit-Language: Czech\n"
#. module: base

4
openerp/addons/base/i18n/da.po
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-05-12 05:34+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/de.po
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-05-12 05:35+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/el.po
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-05-12 05:35+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"

4
openerp/addons/base/i18n/en_GB.po
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-05-12 05:40+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/es.po
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-05-12 05:38+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/es_AR.po
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-05-12 05:40+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

28
openerp/addons/base/i18n/es_CL.po
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-05-12 05:40+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -1054,6 +1054,12 @@ msgid ""
"If Value type is selected, the value will be used directly without "
"evaluation."
msgstr ""
"Expresión que contiene una especificación de valor.\n"
"Cuando se selecciona el tipo fórmula, este campo puede ser una expresión "
"Python que puede utilizar los mismos valores para el campo de condición de "
"la acción del servidor.\n"
"Si se selecciona el tipo valor, el valor se puede utilizar directamente sin "
"evaluación."
#. module: base
#: model:res.country,name:base.ad
@ -3696,8 +3702,8 @@ msgid ""
"Value Added Tax number. Check the box if the partner is subjected to the "
"VAT. Used by the VAT legal statement."
msgstr ""
"Número CIF/NIF. Marque esta caja si la empresa está sujeta al IVA. Se "
"utiliza para la declaración legal del IVA."
"Marque esta casilla si la empresa está sujeta al IVA. Se utiliza para la "
"declaración legal del IVA."
#. module: base
#: selection:ir.sequence,implementation:0
@ -3790,7 +3796,7 @@ msgstr "Verificación EAN"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgstr "CIF/NIF"
msgstr "IVA"
#. module: base
#: field:res.users,new_password:0
@ -12419,6 +12425,12 @@ msgid ""
"queries regarding your account, please contact us.\n"
"Thank you in advance.\n"
msgstr ""
"Nuestros registros indican que los siguientes pagos se encuentran "
"pendientes. Si la cantidad\n"
"ya ha sido pagada, por favor ignore este aviso. Sin embargo, si usted tiene "
"alguna consulta\n"
"sobre su cuenta, póngase en contacto con nosotros.\n"
"De antemano gracias.\n"
#. module: base
#: model:ir.module.module,shortdesc:base.module_users_ldap
@ -13141,7 +13153,7 @@ msgstr ""
#. module: base
#: field:res.company,company_registry:0
msgid "Company Registry"
msgstr ""
msgstr "Registro empresa"
#. module: base
#: view:ir.actions.report.xml:0
@ -13468,7 +13480,7 @@ msgstr "Archivo CSV"
#: code:addons/base/res/res_company.py:154
#, python-format
msgid "Phone: "
msgstr ""
msgstr "Teléfono: "
#. module: base
#: field:res.company,account_no:0
@ -13507,7 +13519,7 @@ msgstr ""
#. module: base
#: field:res.company,vat:0
msgid "Tax ID"
msgstr ""
msgstr "RUT"
#. module: base
#: field:ir.model.fields,field_description:0

4
openerp/addons/base/i18n/es_CR.po
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-05-12 05:41+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"Language: \n"
#. module: base

4
openerp/addons/base/i18n/es_EC.po
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-05-12 05:41+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/et.po
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-05-12 05:34+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/eu.po
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-05-12 05:33+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/fa.po
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-05-12 05:37+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"

4
openerp/addons/base/i18n/fa_AF.po
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-05-12 05:41+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/fi.po
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-05-12 05:34+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

80
openerp/addons/base/i18n/fr.po
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-05-12 05:34+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -7179,6 +7179,8 @@ msgid ""
"- Action: an action attached to one slot of the given model\n"
"- Default: a default value for a model field"
msgstr ""
"- Action : une action attachée à une instance du modèle donné\n"
"- Défaut : une valeur par défaut pour le champ modèle"
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_addess_tree
@ -7287,6 +7289,9 @@ msgid ""
"An arbitrary string, interpreted by the client according to its own needs "
"and wishes. There is no central tag repository across clients."
msgstr ""
"Une chaîne de caractères arbitraire, interprétée par le client en fonction "
"de ses besoins et de ses souhaits. Il n'y a pas de répertoire central "
"d'étiquettes partagé par les clients."
#. module: base
#: sql_constraint:ir.rule:0
@ -7437,6 +7442,12 @@ msgid ""
"Mexican accounting chart and localization.\n"
" "
msgstr ""
"\n"
"Ceci est le module pour gérer le plan de comptes mexicain dans OpenERP\n"
"========================================================================\n"
"\n"
"Plan de comptes et localisation mexicaine.\n"
" "
#. module: base
#: field:res.lang,time_format:0
@ -8422,6 +8433,17 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Vous permet d'ajouter des méthodes de livraison dans les commandes de ventes "
"et les envois de marchandises.\n"
"==============================================================\n"
"\n"
"Vous pouvez définir vos propres transporteurs et vos propres grilles de "
"tarifs de livraison.\n"
"Quand vous créérez des factures depuis les envois de marchandises, OpenERP "
"sera capable d'ajouter et de calculer une ligne pour la livraison.\n"
"\n"
" "
#. module: base
#: view:workflow.workitem:0
@ -9572,7 +9594,7 @@ msgstr ""
#: model:ir.ui.menu,name:base.menu_values_form_action
#: view:ir.values:0
msgid "Action Bindings"
msgstr ""
msgstr "Correspondances de l'action"
#. module: base
#: view:ir.sequence:0
@ -9812,6 +9834,13 @@ msgid ""
"la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also "
"includes taxes and the Quetzal currency"
msgstr ""
"\n"
"This is the base module to manage the accounting chart for Guatemala.\n"
"=====================================================================\n"
"\n"
"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y "
"la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also "
"includes taxes and the Quetzal currency"
#. module: base
#: view:res.lang:0
@ -9894,6 +9923,28 @@ msgid ""
"created\n"
" CALENDAR_NAME: Name of calendar to access\n"
msgstr ""
"\n"
"Ce module contient les fonctionnalités basiques pour le système caldav.\n"
"===========================================================\n"
"\n"
" - Webdav server that provides remote access to calendar\n"
" - Synchronisation of calendar using WebDAV\n"
" - Customize calendar event and todo attribute with any of OpenERP model\n"
" - Provides iCal Import/Export functionality\n"
"\n"
"To access Calendars using CalDAV clients, point them to:\n"
" http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
"\n"
"To access OpenERP Calendar using WebCal to remote site use the URL like:\n"
" http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
"\n"
" Ou,\n"
" HOSTNAME: Machine sur lequel OpenERP Server est lancé\n"
" PORT : Port sur lequel OpenERP serveur est lancé (par défaut : "
"8069)\n"
" DATABASE_NAME: Nom de la base de données sur lequel le calendrier "
"OpenERP est créé\n"
" CALENDAR_NAME: Nom du calendrier à accéder\n"
#. module: base
#: field:ir.model.fields,selectable:0
@ -10053,6 +10104,12 @@ msgid ""
"Greek accounting chart and localization.\n"
" "
msgstr ""
"\n"
"Ceci est le module de base pour la gestion du plan comptable Grec.\n"
"==================================================================\n"
"\n"
"Greek accounting chart and localization.\n"
" "
#. module: base
#: view:ir.values:0
@ -10500,7 +10557,7 @@ msgstr "Guide de référence"
#. module: base
#: view:ir.values:0
msgid "Default Value Scope"
msgstr ""
msgstr "Valeur par défaut de la plage"
#. module: base
#: view:ir.ui.view:0
@ -10951,7 +11008,7 @@ msgstr "Islande"
#: model:ir.actions.act_window,name:base.ir_action_window
#: model:ir.ui.menu,name:base.menu_ir_action_window
msgid "Window Actions"
msgstr "Actions de la fênetre"
msgstr "Actions de fênetres"
#. module: base
#: view:res.lang:0
@ -13385,7 +13442,7 @@ msgstr "Gestion des courriels"
#. module: base
#: field:ir.actions.server,trigger_name:0
msgid "Trigger Signal"
msgstr ""
msgstr "Signal de déclenchement"
#. module: base
#: code:addons/base/res/res_users.py:119
@ -13830,6 +13887,8 @@ msgid ""
"External Key/Identifier that can be used for data integration with third-"
"party systems"
msgstr ""
"Clé/Identifiant externe qui peut être utiliser pour l'intégration de données "
"avec des systèmes tiers"
#. module: base
#: model:ir.module.module,description:base.module_mrp_operations
@ -14760,7 +14819,7 @@ msgstr "Paramétrer les comptes bancaires"
#. module: base
#: field:ir.actions.client,tag:0
msgid "Client action tag"
msgstr ""
msgstr "Étiquette de l'action client"
#. module: base
#: code:addons/base/res/res_lang.py:189
@ -17294,6 +17353,13 @@ msgid ""
"are accessible if installed.\n"
" "
msgstr ""
"\n"
"Base Commune pour les modules utilitaires.\n"
"===================================\n"
"\n"
"Crée un lien ce menu pour rendre accessibles les outils comme \"survey\", "
"\"lunch\", \"idea\", etc. lorsqu'ils sont installés.\n"
" "
#. module: base
#: field:ir.exports,name:0

4
openerp/addons/base/i18n/gl.po
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-05-12 05:35+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

6
openerp/addons/base/i18n/gu.po
View File

@ -14,13 +14,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-05-12 05:35+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
msgid "Saint Helena"
msgstr "સંત હેલેના"
msgstr ""
#. module: base
#: view:ir.actions.report.xml:0

4
openerp/addons/base/i18n/he.po
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-05-12 05:35+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/hr.po
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-05-12 05:38+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"Language: hr\n"
#. module: base

4
openerp/addons/base/i18n/hu.po
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-05-12 05:35+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/hy.po
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-05-12 05:33+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/id.po
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-05-12 05:36+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

492
openerp/addons/base/i18n/is.po
View File

File diff suppressed because it is too large Load Diff

4
openerp/addons/base/i18n/it.po
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-05-12 05:36+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

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

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:44+0000\n"
"PO-Revision-Date: 2012-05-28 23:36+0000\n"
"PO-Revision-Date: 2012-06-09 01:13+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-05-30 05:20+0000\n"
"X-Generator: Launchpad (build 15316)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -721,7 +721,7 @@ msgstr "メキシコ - 会計"
#. module: base
#: help:ir.actions.server,action_id:0
msgid "Select the Action Window, Report, Wizard to be executed."
msgstr "アクションウィンドウ、レポート、ウィザードから選択して下さい。"
msgstr "アクションウィンドウ、レポート、実行するウィザードを選択して下さい。"
#. module: base
#: model:res.country,name:base.ai
@ -1120,7 +1120,7 @@ msgid ""
"Define it through the Administration menu."
msgstr ""
"コード %s に対する言語がシステムに定義されていません。\n"
"アドミニストレーションメニューを使ってそれを定義してください。"
"アドミニストレーションメニューを使ってそれを定義して下さい。"
#. module: base
#: model:res.country,name:base.gu
@ -1198,7 +1198,7 @@ msgid ""
"At the end of the month, the planning manager can also check if the encoded "
"timesheets are respecting the planned time on each analytic account.\n"
msgstr ""
"あなたの計画を追跡し続けて下さい\n"
"あなたの計画を追跡し続けます。\n"
"このモジュールはあなたの計画の管理を補助します。\n"
"==============================================\n"
"\n"
@ -1422,10 +1422,10 @@ msgid ""
" * Effective Date\n"
msgstr ""
"\n"
"受注オーダーのための追加の日付情報を追加してください。\n"
"受注オーダーのための追加の日付情報を追加します。\n"
"===================================================\n"
"\n"
"受注オーダーのために以下のような日付情報を加えることができます：\n"
"受注オーダーのために次のような日付情報を加えることができます：\n"
" ・ 要求日\n"
" ・ 確認日\n"
" ・ 有効日\n"
@ -1629,7 +1629,7 @@ msgstr "用語の同期"
msgid ""
"Access all the fields related to the current object using expressions, i.e. "
"object.partner_id.name "
msgstr "現在のオブジェクトと関連する全ての項目は式、すなわち、object.partner_id.name を使って、アクセスして下さい。 "
msgstr "現在のオブジェクトと関連する全ての項目は式、すなわち object.partner_id.name を使って、アクセスします。 "
#. module: base
#: model:ir.module.module,description:base.module_event
@ -1949,7 +1949,7 @@ msgstr "記号の位置"
#. module: base
#: model:ir.module.module,shortdesc:base.module_process
msgid "Enterprise Process"
msgstr "事業プロセス"
msgstr "企業の処理"
#. module: base
#: help:ir.cron,function:0
@ -2248,7 +2248,7 @@ msgstr "表示モード"
msgid ""
"Display this bank account on the footer of printed documents like invoices "
"and sales orders."
msgstr "請求書や受注オーダーのような印刷されるドキュメントのフッターに現れる銀行口座を示して下さい。"
msgstr "請求書や受注オーダーのような印刷されるドキュメントのフッターに現れる銀行口座が表示されます。"
#. module: base
#: view:base.language.import:0
@ -2590,7 +2590,7 @@ msgstr ""
"\n"
"ライクレコード、クレーム処理、ヘルプデスク、サポートは仲裁の追跡のために良いツールです。\n"
"このメニューは口頭コミュニケーションよりも適しており、必ずしもクレームとは関係がありません。\n"
"顧客を選択し、注記を加えそしてチャンネルと優先度レベルとともに仲裁を分類して下さい。\n"
"顧客を選択し、注記を加えそしてチャンネルと優先度レベルとともに仲裁を分類します。\n"
" "
#. module: base
@ -2616,7 +2616,7 @@ msgstr ""
"リソース管理のためのモジュール\n"
"===============================\n"
"\n"
"リソースはスケジュールすることのできるものを意味します（タスクの開発者や製造オーダーのワークセンタ）。\n"
"リソースはスケジュールすることのできるものを意味します（タスクの開発者や製造オーダーの作業センタ）。\n"
"このモジュールは全てのリソースのためにカレンダーに関連するリソースを管理します。\n"
"また、全てのリソースに対する許可も管理します。\n"
"\n"
@ -2662,10 +2662,10 @@ msgid ""
"Configure servers and trigger synchronization with its database objects.\n"
msgstr ""
"\n"
"全てのオブジェクトとの同期\n"
"全てのオブジェクトとの同期をします。\n"
"=================================\n"
"\n"
"サーバを構成し、データベースオブジェクトとの同期を開始して下さい。\n"
"サーバを構成し、データベースオブジェクトとの同期を開始します。\n"
#. module: base
#: model:res.country,name:base.mg
@ -3039,8 +3039,7 @@ msgid ""
"partner records. You can create or delete countries to make sure the ones "
"you are working on will be maintained."
msgstr ""
"あなたのパートナのレコードに割り当てることができる全ての国のリストを表示、管理して下さい。あなたは維持を行うためにこれらの国の作成や削除をすることができま"
"す。"
"あなたのパートナのレコードに割り当てることができる全ての国のリストを表示、管理します。あなたは維持を行うためにこれらの国の作成や削除をすることができます。"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_7
@ -3107,7 +3106,7 @@ msgid ""
"The decimal precision is configured per company.\n"
msgstr ""
"\n"
"あなたが必要とする異なった用途の価格を正確に設定してください：会計、受注、発注など\n"
"あなたが必要とする異なった用途の価格を正確に設定します：会計、受注、発注など\n"
"============================================================================="
"=========================\n"
"\n"
@ -3179,8 +3178,8 @@ msgstr ""
"このモジュールはユーザにパートナの中での分割を許可します。\n"
"=================================================================\n"
"\n"
"これは初期の分割モジュールからプロファイル基準を使います。そして、新しい質問表のコンセプトによって改良して下さい。あなたは質問表の質問を再度グループ化し、"
"直接パートナの上で使うことができます。\n"
"これは初期の分割モジュールからプロファイル基準を使います。そして、新しい質問表のコンセプトによって改良します。あなたは質問表の質問を再度グループ化し、直接"
"パートナの上で使うことができます。\n"
"\n"
"また、このモジュールは機能が重複していた初期のCRMとSRM分割ツールが統合されたものです。\n"
"\n"
@ -3197,7 +3196,7 @@ msgstr "定義されていないレポートタイプです： %s"
#: code:addons/base/ir/ir_model.py:282
#, python-format
msgid "For selection fields, the Selection Options must be given!"
msgstr "項目選択のために選択オプションを指定して下さい。"
msgstr "選択項目の場合は、選択オプションは指定されねばなりません。"
#. module: base
#: model:res.widget,title:base.facebook_widget
@ -3235,7 +3234,7 @@ msgstr "ガント"
#. module: base
#: view:ir.property:0
msgid "Property"
msgstr "プロパティ"
msgstr "属性"
#. module: base
#: model:ir.model,name:base.model_res_partner_bank_type
@ -3389,7 +3388,7 @@ msgid ""
"Manage the contact titles you want to have available in your system and the "
"way you want to print them in letters and other documents. Some example: "
"Mr., Mrs. "
msgstr "手紙や他のドキュメントの印刷において利用する際の適切な役職を管理して下さい。 "
msgstr "手紙や他のドキュメントの印刷において利用する際の適切な連絡先のタイトルを管理します。 幾つかの例：男子や夫人の敬称 "
#. module: base
#: view:ir.model.access:0
@ -4153,7 +4152,7 @@ msgstr "エラーです。再帰的な関係となる分類を作ることはで
#. module: base
#: view:res.lang:0
msgid "%x - Appropriate date representation."
msgstr "%x - 日付表示の割り当て"
msgstr "%x - 日付表示の割当"
#. module: base
#: model:ir.module.module,description:base.module_web_mobile
@ -4773,14 +4772,14 @@ msgid ""
" "
msgstr ""
"\n"
"このモジュールは、顧客を地理的ローカル化に基づくパートナに再配置するために、OpenERP SAによって使わます。\n"
"このモジュールは、顧客を地理的ローカル化に基づくパートナに再配置するために、OpenERP SAによって使われます。\n"
"============================================================================="
"=========================\n"
"\n"
"このモジュールを使うことで、あなたのオポチュニティを地理的ローカル化できます。\n"
"\n"
"オポチュニティをパートナに割り当てる場合に地理的ローカル化を使って下さい。\n"
"パートナの住所によるGPS座標を決定して下さい。\n"
"オポチュニティをパートナに割り当てる場合に地理的ローカル化を使います。\n"
"パートナの住所によるGPS座標を決定します。\n"
"最も適切なパートナの割り当てが可能です。\n"
"また、GPS座標なしでも地理的ローカル化はできます。\n"
" "
@ -4914,7 +4913,7 @@ msgstr ""
#: view:base.module.upgrade:0
msgid ""
"We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
msgstr "新しいメニューを見るためにはメニュータブをリロードして下さい。（Ctrl+T の後 Ctrl+R）。"
msgstr "新しいメニューを見るためにはメニュータブをリロードすることを推奨します（Ctrl+T の後 Ctrl+R）。"
#. module: base
#: model:ir.module.module,description:base.module_subscription
@ -4939,7 +4938,7 @@ msgstr ""
"このモジュールは新しいドキュメントを作成し、それを定期的にすることを可能にします。\n"
"\n"
"例えば、定期的に自動で請求書を生成するためには以下の手順です:\n"
" ・ 請求書オブジェクトに基づきドキュメントタイプを定義して下さい。\n"
" ・ 請求書オブジェクトに基づきドキュメントタイプを定義します。\n"
" ・ 情報元ドキュメントを定義してそれに定期性を定義します。請求書のための間隔情報とパートナを指定します。\n"
" "
@ -5016,7 +5015,7 @@ msgstr "ToDoとしてセット"
#. module: base
#: view:res.lang:0
msgid "%c - Appropriate date and time representation."
msgstr "%c - 日付と時間の表現を割り当てて下さい。"
msgstr "%c - 日付と時間表示の割当"
#. module: base
#: code:addons/base/res/res_config.py:386
@ -6419,7 +6418,7 @@ msgstr "取得"
#. module: base
#: help:ir.model.fields,on_delete:0
msgid "On delete property for many2one fields"
msgstr "多対1項目のプロパティ削除"
msgstr "多対1項目の属性削除"
#. module: base
#: model:ir.module.category,name:base.module_category_accounting_and_finance
@ -6835,7 +6834,7 @@ msgstr ""
" ・ 発注 / アドレスブック / コンタクト\n"
" ・ 受注 / アドレスブック / コンタクト\n"
"\n"
"このモジュールが既存の住所を”住所＋連絡先”の中に変換することに注意してください。この意味は、これらは\n"
"このモジュールが既存の住所を”住所＋連絡先”の中に変換することに注意して下さい。この意味は、これらは\n"
"他のオブジェクトの中で定義することになっているため、住所の中の幾つかの項目は失われます（連絡先名など）。\n"
" "
@ -7900,7 +7899,7 @@ msgid ""
" "
msgstr ""
"\n"
"契約を管理するために従業員の全ての情報を加えて下さい。\n"
"契約を管理するために従業員の全ての情報を追加します。\n"
"=============================================================\n"
"\n"
" ・ 婚姻\n"
@ -8162,10 +8161,10 @@ msgid ""
" "
msgstr ""
"\n"
"ヘッダーの中にフィードバックボタンを加えて下さい。\n"
"ヘッダーの中にフィードバックボタンを追加します。\n"
"==============================\n"
"\n"
"ユーザの声によるOpenERPのユーザフィードバックを求めて下さい。\n"
"ユーザの声によるOpenERPのユーザフィードバックを招待します。\n"
" "
#. module: base
@ -9849,7 +9848,7 @@ msgstr "アラブ首長国連邦"
#, python-format
msgid ""
"Unable to delete this document because it is used as a default property"
msgstr "このドキュメントはデフォルトプロパティとして使用されているため削除できません。"
msgstr "このドキュメントはデフォルト属性として使用されているため削除できません。"
#. module: base
#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
@ -10662,23 +10661,23 @@ msgstr ""
"　・ 在庫の作成 / オーダーの作成（行単位）\n"
"　・ 複数レベルのBoMs（Mill of Materials：部品表）、制限なし\n"
"　・ 複数レベルの経路、制限なし\n"
"　・ 経路とワークセンターが分析的な会計とともに統合されます。\n"
"　・ 経路と作業センターが分析的な会計とともに統合されます。\n"
"　・ 周期的に計算するスケジューラ / ジャストインタイムモジュール\n"
"　・ 複数のPOS、複数の倉庫\n"
"　・ 異なったリオーダリングポリシー\n"
"　・ 製品別の原価法：標準価格、平均価格\n"
"　・ トラブルやニーズの簡単な分析\n"
"　・ 非常に柔軟です。\n"
"　・ 子やファントムBoMsを含む完全な構造での部品表の参照ができます。\n"
"　・ 子や模型部品表を含む完全な構造での部品表の参照ができます。\n"
"\n"
"完全な統合と在庫可能商品の計画化、サービスの消耗品をサポートします。\n"
"サービスは完全にソフトウェアの残り部分と統合されています。\n"
"例えば、製品の組み立てオーダーの上で自動発注するためにBoMの中にサブ契約サービスを設定できます。\n"
"例えば、製品の組み立てオーダーの上で自動発注するために部品表の中にサブ契約サービスを設定できます。\n"
"\n"
"このモジュールで提供されるレポート：\n"
"--------------------------------\n"
"　・ 部品表構造と構成品\n"
"　・ ワークセンターでの負荷予測\n"
"　・ 作業センタでの負荷予測\n"
"　・ 製造オーダーの印刷\n"
"　・ 在庫の予測\n"
"\n"
@ -10686,7 +10685,7 @@ msgstr ""
"----------------------------------\n"
"　・ 次の製造オーダーのリスト\n"
"　・ 例外的な調達のリスト\n"
"　・ ワークセンターの負荷グラフ\n"
"　・ 作業センタの負荷グラフ\n"
"　・ 在庫価値の変動グラフ\n"
" "
@ -11162,7 +11161,7 @@ msgstr ""
"銀行取引明細書\n"
"パートナによる消し込み処理\n"
"\n"
"会計士のための次のものを含むダッシュボードを作成して下さい：\n"
"会計士のための次のものを含むダッシュボードを作成します：\n"
"--------------------------------------------------\n"
"・承認すべき顧客請求書のリスト\n"
"・ 会社分析\n"
@ -11178,7 +11177,7 @@ msgstr ""
msgid ""
"View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
"views"
msgstr "ビュータイプ：階層的なツリービューの場合は\"ツリー\"、他のビューの場合は\"フォーム\"とセットして下さい。"
msgstr "ビュータイプ：階層的なツリービューの場合は\"ツリー\"、他のビューの場合は\"フォーム\"とセットします。"
#. module: base
#: code:addons/base/res/res_config.py:385
@ -11216,7 +11215,7 @@ msgstr "購読申し込み"
#: help:ir.actions.server,model_id:0
msgid ""
"Select the object on which the action will work (read, write, create)."
msgstr "アクションが動作する（読み込み、書き込み、作成）オブジェクトを選択して下さい。"
msgstr "アクションが動作する（読み込み、書き込み、作成）オブジェクトを選択します。"
#. module: base
#: field:base.language.import,name:0
@ -11238,7 +11237,7 @@ msgid ""
"- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
"(default: 465)"
msgstr ""
"接続の暗号化方式を選択して下さい：\n"
"接続の暗号化方式を選択：\n"
"・ なし: SMTPセッションはクリアテキストで行われる。\n"
"・ TLS（STARTTLS）：TLS暗号化はSMTPセッションの開始において要求されます（推奨）。\n"
"・ SSL/TLS：SMTPセッションは専用のポート（デフォルト：465）によってSSL/TLSで暗号化されます。"
@ -11897,7 +11896,7 @@ msgstr ""
#: view:ir.model.fields:0
#: view:workflow.activity:0
msgid "Properties"
msgstr "プロパティ"
msgstr "属性"
#. module: base
#: help:ir.sequence,padding:0
@ -12966,8 +12965,8 @@ msgid ""
"not connect to the system. You can assign them groups in order to give them "
"specific access to the applications they need to use in the system."
msgstr ""
"システムに接続するユーザを作成し、そして管理して下さい。ユーザは非活性化され、彼らがシステムに接続すべきでない一定の期間が置かれます。あなたは彼らがシステ"
"ムで使うことを必要とするアプリケーションに特定のアクセスを与えるためにグループを割り当てることができます。"
"システムに接続するユーザを作成し、そして管理します。ユーザは非活性化され、彼らがシステムに接続すべきでない一定の期間が置かれます。あなたは彼らがシステムで"
"使うことを必要とするアプリケーションに特定のアクセスを与えるためにグループを割り当てることができます。"
#. module: base
#: selection:ir.module.module,complexity:0
@ -13317,7 +13316,7 @@ msgstr "番号の埋め文字"
#. module: base
#: help:multi_company.default,field_id:0
msgid "Select field property"
msgstr "項目のプロパティを選択"
msgstr "項目の属性を選択"
#. module: base
#: field:res.request.history,date_sent:0
@ -13983,19 +13982,19 @@ msgid ""
" "
msgstr ""
"\n"
"このモジュールは製造オーダー行（\"ワークセンタ\"のタブ内）の中に状態、開始日付、中止日付を追加します。\n"
"このモジュールは製造オーダー行（\"作業センタ\"のタブ内）の中に状態、開始日付、中止日付を追加します。\n"
"============================================================================="
"================================\n"
"\n"
"状態：ドラフト、確認、完了、キャンセル\n"
"完了する、確認する、キャンセルする時に、製造オーダーは全ての状態行を状態に応じて設定する。\n"
"完了、確認、キャンセル時に、製造オーダーは全ての状態行を状態に応じて設定します。\n"
"\n"
"メニューの作成：\n"
"　　製造 > 製造 > ワークオーダー\n"
"　　製造 > 製造 > 作業オーダー\n"
"\n"
"これは、製造オーダーのワークセンタ行のビューです。\n"
"これは、製造オーダーの作業センタ行のビューです。\n"
"\n"
"ワークセンタタブの下に製造オーダーのフォームビューにボタンを追加して下さい：\n"
"作業センタタブの下に製造オーダーのフォームビューにボタンを追加します：\n"
"　・ 開始（確認状態に設定）、開始日付の設定\n"
"　・ 完了（完了状態に設定）、中止日付の設定\n"
"　・ ドラフトに設定（ドラフト状態に設定）\n"
@ -14295,7 +14294,7 @@ msgstr "時 00->12: %(h12)s"
#. module: base
#: help:res.partner.address,active:0
msgid "Uncheck the active field to hide the contact."
msgstr "連絡先を隠すためにはアクティブな項目のチェックを外して下さい。"
msgstr "連絡先を隠すためにはアクティブな項目のチェックを外します。"
#. module: base
#: model:ir.model,name:base.model_res_widget_wizard
@ -15123,7 +15122,7 @@ msgstr "請求と支払"
msgid ""
"Create and manage the companies that will be managed by OpenERP from here. "
"Shops or subsidiaries can be created and maintained from here."
msgstr "ここから、OpenERPにより管理される会社の作成と管理をして下さい。店や子会社はここから作成され、維持管理されます。"
msgstr "ここからOpenERPにより管理される会社の作成と管理をします。店や子会社はここから作成され、維持管理されます。"
#. module: base
#: model:res.country,name:base.id
@ -15236,7 +15235,7 @@ msgid ""
"use context.get or user (browse)"
msgstr ""
"式は一致する場合はTrueでなければなりません。\n"
"context.getまたはユーザ（ブラウズ）を使って下さい。"
"context.getまたはユーザ（ブラウズ）を使います。"
#. module: base
#: model:res.country,name:base.bg
@ -16102,7 +16101,7 @@ msgid ""
"Save this document to a .tgz file. This archive containt UTF-8 %s files and "
"may be uploaded to launchpad."
msgstr ""
"このドキュメントを .tgz ファイルとして保存して下さい。このアーカイブには UTF-8 の %s "
"このドキュメントを .tgz ファイルとして保存します。このアーカイブには UTF-8 の %s "
"ファイルが含まれており、launchpadにアップロードできます。"
#. module: base
@ -16949,8 +16948,8 @@ msgid ""
"categories have a hierarchy structure: a partner belonging to a category "
"also belong to his parent category."
msgstr ""
"追跡のためのより良い分類を行うためや分析目的のためにパートナの分類を管理して下さい。パートナは幾つかの分類に属している可能性もあり、分類は階層的な構造を持"
"つかも知れません：パートナの属する分類はその親の分類にも属しています。"
"追跡のためのより良い分類を行うためや分析目的のためにパートナの分類を管理します。パートナは幾つかの分類に属している可能性もあり、分類は階層的な構造を持つか"
"も知れません：パートナの属する分類はその親の分類にも属しています。"
#. module: base
#: model:res.country,name:base.az
@ -17087,7 +17086,7 @@ msgid ""
"partners, including customers and prospects."
msgstr ""
"仕入先フォームから仕入先に関する全ての情報にアクセスできます：会計データ、Eメールの履歴、ミーティング、発注など。顧客や見込み客を含む全てのパートナを検索"
"するためには仕入先のフィルタボタンのチェックを外して下さい。"
"するためには仕入先のフィルタボタンのチェックを外します。"
#. module: base
#: model:res.country,name:base.rw
@ -17218,8 +17217,8 @@ msgstr ""
"\n"
"CRMのために作成されるダッシュボードは次のものを含みます：\n"
"　・ 分類別のオポチュニティ（グラフ）\n"
"　・ ステージ別のオポチュニティ（グラフ）\n"
"　・ ステージとユーザ別の計画収益（グラフ）\n"
"　・ 工程別のオポチュニティ（グラフ）\n"
"　・ 工程とユーザ別の計画収益（グラフ）\n"
#. module: base
#: model:ir.module.category,description:base.module_category_accounting_and_finance
@ -17298,7 +17297,7 @@ msgstr "グループを選択"
#. module: base
#: view:res.lang:0
msgid "%X - Appropriate time representation."
msgstr "%X - 適切な時刻の表現"
msgstr "%X - 時間表示の割当"
#. module: base
#: selection:base.language.install,lang:0
@ -17380,14 +17379,14 @@ msgstr ""
"\n"
"キャンペーンは動的でマルチチャンネルです。そのプロセスは次のとおりです：\n"
"　・ "
"マーケティングキャンペーンはワークフローのようにデザインして下さい。これには送信用のEメールテンプレート、プリントしてEメールで送信するレポート、カスタム"
"アクションなどが含まれます。\n"
"　・ キャンペーンで入力すべき項目（例えば、確かな国からのリードなど）を選択した入力セグメントの定義をして下さい。\n"
"マーケティングキャンペーンはワークフローのようにデザインします。これには送信用のEメールテンプレート、プリントしてEメールで送信するレポート、カスタムアク"
"ションなどが含まれます。\n"
"　・ キャンペーンで入力すべき項目（例えば、確かな国からのリードなど）を選択した入力セグメントの定義をします。\n"
"　・ キャンペーンをテストのためにリアルタイムあるいは加速状態でシミュレーションモードで実行して下さい。その後、微調整します。\n"
"　・ 各アクションが手動の検証を必要とする場合は、手動で実際のキャンペーンを開始することもできます。\n"
"　・ 最後にキャンペーンを実際に起動し、キャンペーンの全てが完全に自動的に行われるよう統計値を監視します。\n"
"\n"
"キャンペーンの実行中にも、ちろんパラメータ、入力背具面tp、ワークフローなどの微調整を続ける事ができます。\n"
"キャンペーンの実行中にも、ちろんパラメータ、入力セグメント、ワークフローなどの微調整を続ける事ができます。\n"
"\n"
"注記：デモデータが必要なら、marketing_campaign_crm_demoモジュールをインストールできます。それはCRMリードに依存するため、CR"
"Mアプリケーションもインストールすることになります。\n"
@ -17835,7 +17834,7 @@ msgstr ""
"利用方法：\n"
"モジュールウィザードの アドミニストレーション/カスタマイゼーション/モジュール \n"
"作成/エクスポート カスタマイゼーション を実行します。\n"
"記録の日時の基準、記録されるオブジェクト、記録モジュールを選択して下さい。\n"
"記録の日時の基準、記録されるオブジェクト、記録モジュールを選択します。\n"
" "
#. module: base

26
openerp/addons/base/i18n/ka.po
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-05-12 05:34+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -238,7 +238,7 @@ msgstr "შეზღუდვის შეცდომა"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_custom
msgid "ir.ui.view.custom"
msgstr ""
msgstr "ir.ui.view.custom"
#. module: base
#: code:addons/base/ir/ir_model.py:313
@ -472,7 +472,7 @@ msgstr "კონფიგურაციის ვიზარდის სა
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_sc
msgid "ir.ui.view_sc"
msgstr ""
msgstr "ir.ui.view_sc"
#. module: base
#: field:res.widget.user,widget_id:0
@ -532,6 +532,10 @@ msgid ""
"and reference view. The result is returned as an ordered list of pairs "
"(view_id,view_mode)."
msgstr ""
"ეს ფუნქციური ველი გათვლის რიგის მიხედვით დაწყობილი ხედების სიას, რომლებიც "
"უნდა ამუშავდნენ გარკვეული ქმედების შედეგის საჩვენებლად, აერთიანებენ რა ხედის "
"რეჟიმს, ხედებს და მიმთითებელ ხედს. შედეგი ბრუნდება, როგორც წყვილების "
"დაწყობილი სია (view_id,view_mode)."
#. module: base
#: model:res.country,name:base.tv
@ -929,7 +933,7 @@ msgstr "შესაძლებლობები"
#. module: base
#: model:ir.model,name:base.model_base_language_export
msgid "base.language.export"
msgstr ""
msgstr "base.language.export"
#. module: base
#: help:ir.actions.server,write_id:0
@ -1124,7 +1128,7 @@ msgstr "შვილობილი კატეგორიები"
#. module: base
#: model:ir.model,name:base.model_ir_config_parameter
msgid "ir.config_parameter"
msgstr ""
msgstr "ir.config_parameter"
#. module: base
#: selection:base.language.export,format:0
@ -1506,7 +1510,7 @@ msgstr "ჩანაწერების თანმიმდევრობ
#. module: base
#: model:ir.model,name:base.model_ir_exports
msgid "ir.exports"
msgstr ""
msgstr "ir.exports"
#. module: base
#: code:addons/base/module/wizard/base_update_translations.py:38
@ -1611,7 +1615,7 @@ msgstr "ბანკი"
#. module: base
#: model:ir.model,name:base.model_ir_exports_line
msgid "ir.exports.line"
msgstr ""
msgstr "ir.exports.line"
#. module: base
#: model:ir.module.module,description:base.module_html_view
@ -1762,7 +1766,7 @@ msgstr "საწყობის მართვა"
#. module: base
#: model:ir.model,name:base.model_res_request_link
msgid "res.request.link"
msgstr ""
msgstr "res.request.link"
#. module: base
#: field:ir.actions.wizard,name:0
@ -1897,7 +1901,7 @@ msgstr "ყირგიზეთი"
#. module: base
#: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
msgid "wizard.ir.model.menu.create.line"
msgstr ""
msgstr "wizard.ir.model.menu.create.line"
#. module: base
#: field:ir.attachment,res_id:0
@ -2039,7 +2043,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_ir_rule
msgid "ir.rule"
msgstr ""
msgstr "ir.rule"
#. module: base
#: selection:ir.cron,interval_type:0

4
openerp/addons/base/i18n/kk.po
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-05-12 05:36+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/ko.po
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-05-12 05:36+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/lt.po
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-05-12 05:37+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/lv.po
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-05-12 05:36+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/mk.po
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-05-12 05:37+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

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

File diff suppressed because it is too large Load Diff

4
openerp/addons/base/i18n/nb.po
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-05-12 05:37+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

40
openerp/addons/base/i18n/nl.po
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-05-12 05:34+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -1606,7 +1606,7 @@ msgstr "Hulpmiddelen"
#. module: base
#: selection:ir.property,type:0
msgid "Float"
msgstr "Drijvende comma"
msgstr "Drijvende komma"
#. module: base
#: model:ir.module.category,name:base.module_category_warehouse_management
@ -2344,7 +2344,7 @@ msgid ""
"Comma-separated list of allowed view modes, such as 'form', 'tree', "
"'calendar', etc. (Default: tree,form)"
msgstr ""
"Comma-gescheiden lijst van toegestane weergavestanden zoals 'form', 'tree', "
"Komma-gescheiden lijst van toegestane weergavestanden zoals 'form', 'tree', "
"'calendar', etc. (Standaard: tree,form)"
#. module: base
@ -3091,7 +3091,7 @@ msgid ""
"direction)"
msgstr ""
"Ongeldige \"order\" opgegeven. Een geldige \"order\" specificatie is een "
"comma-gescheiden lijst van geldige veldnamen (optioneel gevolgd door "
"komma-gescheiden lijst van geldige veldnamen (optioneel gevolgd door "
"asc/desc voor de richting)"
#. module: base
@ -4382,7 +4382,7 @@ msgstr "`code`moet uniek zijn."
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_expense
msgid "Expenses Management"
msgstr "Uitgave beheer"
msgstr "Declaratiebeheer"
#. module: base
#: view:workflow.activity:0
@ -4676,7 +4676,7 @@ msgstr ""
#: model:ir.ui.menu,name:base.menu_workflow
#: model:ir.ui.menu,name:base.menu_workflow_root
msgid "Workflows"
msgstr "Werkschema's"
msgstr "Workflows"
#. module: base
#: model:ir.module.module,description:base.module_profile_tools
@ -6733,7 +6733,7 @@ msgstr "Urenstaten"
#. module: base
#: field:res.partner,function:0
msgid "function"
msgstr "functie"
msgstr "Functie"
#. module: base
#: model:ir.ui.menu,name:base.menu_audit
@ -7356,7 +7356,7 @@ msgstr ""
#. module: base
#: field:res.partner,title:0
msgid "Partner Firm"
msgstr "Relatie titel"
msgstr "Juridische entiteit"
#. module: base
#: model:ir.actions.act_window,name:base.action_model_fields
@ -7847,7 +7847,7 @@ msgstr "Macau"
#. module: base
#: model:ir.actions.report.xml,name:base.res_partner_address_report
msgid "Labels"
msgstr "Etiketten"
msgstr "Labels"
#. module: base
#: field:partner.massmail.wizard,email_from:0
@ -10123,7 +10123,7 @@ msgstr "Rapport voorbeeldweergave"
#. module: base
#: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
msgid "Purchase Analytic Plans"
msgstr "Inkooporder kostenplaatsen"
msgstr "Inkooporderregel kostenplaatsen"
#. module: base
#: model:ir.module.module,description:base.module_analytic_journal_billing_rate
@ -12324,7 +12324,7 @@ msgid ""
"External Key/Identifier that can be used for data integration with third-"
"party systems"
msgstr ""
"Externe id wat kan worden gebruikt voor het intgereren van gegevens van "
"Externe id wat kan worden gebruikt voor het integreren van gegevens van "
"andere systemen."
#. module: base
@ -13016,7 +13016,7 @@ msgstr "Inhoud"
#: code:addons/base/ir/ir_mail_server.py:199
#, python-format
msgid "Connection test succeeded!"
msgstr "Connectietest succesfol!"
msgstr "Connectietest geslaagd!"
#. module: base
#: view:partner.massmail.wizard:0
@ -13629,6 +13629,14 @@ msgid ""
"plans.\n"
" "
msgstr ""
"\n"
"Basis module om kostenplaatsen te verdelen over inkooporderregels.\n"
"========================================================\n"
"\n"
"Deze module geeft de gebruiker de mogelijkheid om meerdere\n"
"kostenplaatsen te onderhouden. Het is mogelijk om inkooporder-\n"
"regels op te delen in meerdere kostenplaatsen.\n"
" "
#. module: base
#: field:res.company,vat:0
@ -13638,7 +13646,7 @@ msgstr "BTW Nr."
#. module: base
#: field:ir.model.fields,field_description:0
msgid "Field Label"
msgstr "Etiket veld"
msgstr "Veldlabel"
#. module: base
#: help:ir.actions.report.xml,report_rml:0
@ -14166,7 +14174,7 @@ msgstr "_Export"
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_followup
msgid "Followup Management"
msgstr "Aanmaningenbeheer"
msgstr "Betalingsherinneringen"
#. module: base
#: model:ir.module.module,description:base.module_l10n_fr
@ -14657,7 +14665,7 @@ msgid ""
"Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
"Portable Objects)"
msgstr ""
"Ondersteunde bestandsformaten: *.csv (comma gescheiden waarden) of *.po "
"Ondersteunde bestandsformaten: *.csv (komma gescheiden waarden) of *.po "
"(GetText Portable Objecten)"
#. module: base

4
openerp/addons/base/i18n/nl_BE.po
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-05-12 05:40+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/pl.po
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-05-12 05:37+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

494
openerp/addons/base/i18n/pt.po
View File

File diff suppressed because it is too large Load Diff

135
openerp/addons/base/i18n/pt_BR.po
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-05-12 05:40+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -4417,6 +4417,16 @@ msgid ""
" * Cheque Register\n"
" "
msgstr ""
"\n"
"O Módulo de Comprovantes Contábeis inclui os comprovantes de entrada "
"exigídos para Banco, Caixa, Vendas, Compras, Despesas, etc.\n"
"============================================================================="
"===================================================\n"
"\n"
" * Comprovante de Entrada\n"
" * Recibo Comprovante\n"
" * Cópia de Cheque\n"
" "
#. module: base
#: field:res.partner,ean13:0
@ -4685,6 +4695,20 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"O módulo de compras gera um pedido de compra para aquisição de mercadorias "
"de um fornecedor.\n"
"============================================================================="
"===============\n"
"\n"
"Uma fatura do fornecedor é criada para o pedido de compra específico.\n"
"\n"
"Painel para gestão de compras, que inclui:\n"
" * Pedidos de Compras Correntes\n"
" * Pedidos de Compras Preliminares\n"
" * Gráfico de quantidade e valor por mês\n"
"\n"
" "
#. module: base
#: view:ir.model.fields:0
@ -5869,6 +5893,30 @@ msgid ""
" * Graph : Products to send in delay (date < = today)\n"
" "
msgstr ""
"\n"
"O módulo de Gestão de Estoque do OpenERP pode gerenciar múltiplos armazéns, "
"múltiplos e estruturados locais de estoque.\n"
"============================================================================="
"==========================================\n"
"\n"
"Graças à gestão de entrada dupla, o controle de estoque é poderoso e "
"flexível:\n"
" * Histórico de movimento e planejamento,\n"
" * Diferentes métodos de estoque (FIFO, LIFO, ...)\n"
" * Avaliação de estoque (padrão ou preço médio, ...)\n"
" * Solidez diante as diferenças de estoque\n"
" * Reordenamento automático de regras (nível de estoque, JIT, ...)\n"
" * Suporte a código de barras\n"
" * Detecção rápida de erros através do sistema de dupla entrada\n"
" * Rastreabilidade (entrada/saída, lotes de produção, número de série, "
"...)\n"
" * Planilha de armazém, que inclui:\n"
" * Compras em exceção\n"
" * Lista de Entrada de Produtos\n"
" * Lista de Saída de Produtos\n"
" * Gráfico: Produtos a receber em atraso (data < = hoje)\n"
" * Gráfico: Produtos a enviar em atraso (data < = hoje)\n"
" "
#. module: base
#: model:ir.model,name:base.model_ir_module_module
@ -6544,6 +6592,40 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Subsistema de e-mail genérico com armazenamento e enfileiramento de "
"mensagens\n"
"============================================================================="
"\n"
"\n"
"Este subsistema de e-mail não se destina a ser usado como aplicação\n"
"independente, mas para fornecer uma abstracção de e-mail unificada\n"
"que todas as outras aplicações podem usar.\n"
"\n"
"As principais funcionalidades são:\n"
"\n"
" * Baseia-se em Servidores de Envio de Correio globais configurados\n"
" no menu de Administração para entrega de correio enviado.\n"
" * Fornece uma API para envio de mensagens e arquivando-as,\n"
" agrupadas por conversa\n"
" * Qualquer documento do OpenERP pode atuar como um tópico de "
"conversação,\n"
" desde que inclua o suporte necessário para lidar com e-mails "
"recebidos\n"
" (veja a classe ``mail.thread`` para maiores detalhes).\n"
" * Inclui mecanismo de enfileiramento com processamento automatizado\n"
" configurável com base no agendador\n"
" * Inclui um assistente de composição de e-mail genérico, que pode se\n"
" transformar em um assistente de correio em massa, e é capaz de\n"
" interpretar um simples *marcador de expressões*, que serão "
"substituídas\n"
" por dados dinâmicos quando cada e-mail for enviado.\n"
" Este assistente genérico é facilmente extensível para fornecer "
"recursos\n"
" avançados (veja por exemplo ``email_template``, que adiciona\n"
" funcionalidades de modelos e-mail neste assistente)\n"
"\n"
" "
#. module: base
#: view:res.lang:0
@ -11488,6 +11570,20 @@ msgid ""
" * Allow to refund former sales.\n"
" "
msgstr ""
"\n"
"Este módulo proporciona um processo de venda rápido e fácil.\n"
"============================================================\n"
"\n"
"Recursos principais :\n"
"---------------------\n"
" * Codificação rápida da venda.\n"
" * Permitir escolher uma forma de pagamento (a mais rápida) ou dividir o "
"pagamento entre várias formas de pagamento.\n"
" * Cálculo do troco em dinheiro.\n"
" * Criar e confirmar escolhendo na lista automaticamente.\n"
" * Permite o usuário criar fatura automaticamente.\n"
" * Permite reembolsar vendas anteriores.\n"
" "
#. module: base
#: model:ir.actions.act_window,help:base.action_ui_view_custom
@ -14777,6 +14873,16 @@ msgid ""
"\n"
" "
msgstr ""
"\n"
"Este módulo mostra os processos básicos envolvidos nos módulos selecionados "
"e na sequência em que ocorrem.\n"
"============================================================================="
"=============================\n"
"\n"
"Nota: Isto aplica-se aos módulos contendo modulename_process_xml\n"
"exemplo: product/process/product_process_xml\n"
"\n"
" "
#. module: base
#: field:res.users,menu_tips:0
@ -15254,12 +15360,27 @@ msgid ""
" "
msgstr ""
"\n"
"Habilitar o chat ao vivo suporte para aqueles que têm um contrato de "
"manutenção. \n"
"=================================================================== \n"
"Este é o módulo base para o gerenciamento de produtos e listas de preços no "
"OpenERP.\n"
"============================================================================="
"=======\n"
"\n"
"Adicionar botão \"Suporte\" no cabeçalho de onde você pode acessar o "
"suporte OpenERP.\n"
"Suporte a variações de produtos, métodos de diferenciação de preços,\n"
"informações de fornecedores, estocagem/pedidos, unidades de medidas\n"
"diferenciadas, embalagem e propriedades dos produtos.\n"
"\n"
"Suporte às Listas de Preços:\n"
" * Múltiplos níveis de desconto (por produto, categoria, quantidades)\n"
" * Calcula preço com base em diferentes critérios:\n"
" * Outra lista de preços,\n"
" * Preço de custo,\n"
" * Preço de tabela,\n"
" * Preço do fornecedor, ...\n"
"\n"
"\n"
"Preferências de lista de preços por produto e/ou por parceiros.\n"
"\n"
"Imprimir etiquetas de produtos com código de barras.\n"
" "
#. module: base

4072
openerp/addons/base/i18n/ro.po
View File

File diff suppressed because it is too large Load Diff

343
openerp/addons/base/i18n/ru.po
View File

File diff suppressed because it is too large Load Diff

4
openerp/addons/base/i18n/sk.po
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-05-12 05:38+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/sl.po
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-05-12 05:38+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/sq.po
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-05-12 05:32+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/sr.po
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-05-12 05:38+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/sr@latin.po
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-05-12 05:41+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

625
openerp/addons/base/i18n/sv.po
View File

File diff suppressed because it is too large Load Diff

4
openerp/addons/base/i18n/th.po
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-05-12 05:39+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/tlh.po
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-05-12 05:39+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/tr.po
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-05-12 05:39+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/uk.po
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-05-12 05:39+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/ur.po
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-05-12 05:39+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/vi.po
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-05-12 05:39+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

26
openerp/addons/base/i18n/zh_CN.po
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-05-12 05:41+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh
@ -170,7 +170,7 @@ msgstr "过滤条件这个字段是可选输入的，用于在输入关系型字
#. module: base
#: field:res.partner,ref:0
msgid "Reference"
msgstr "引用"
msgstr "关联单号"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
@ -220,7 +220,7 @@ msgstr "约束错误"
#. module: base
#: model:ir.model,name:base.model_ir_ui_view_custom
msgid "ir.ui.view.custom"
msgstr "自定义视图"
msgstr "ir.ui.view.custom"
#. module: base
#: code:addons/base/ir/ir_model.py:313
@ -322,7 +322,7 @@ msgstr "字段长度"
#: model:ir.ui.menu,name:base.next_id_73
#: model:ir.ui.menu,name:base.reporting_menu
msgid "Reporting"
msgstr "报告"
msgstr "报表"
#. module: base
#: view:res.partner:0
@ -1043,7 +1043,7 @@ msgid ""
"If Value type is selected, the value will be used directly without "
"evaluation."
msgstr ""
"笔者哦是一个值定义。\n"
"表达式是一个值定义。\n"
"如果选择了公式类型，此字段可以是一个Python语句，可以使用服务器动作条件字段上的相同值。\n"
"如果选择了值类型，此值将被直接使用。"
@ -1576,7 +1576,7 @@ msgstr "报表"
msgid ""
"If set to true, the action will not be displayed on the right toolbar of a "
"form view."
msgstr "如果设为真，该动作将不会显示表单右侧的工具栏中。"
msgstr "如果设为真，该动作将不会显示于表单右侧的工具栏中。"
#. module: base
#: field:workflow,on_create:0
@ -6134,7 +6134,7 @@ msgstr "易用性"
#: field:ir.actions.act_window,domain:0
#: field:ir.filters,domain:0
msgid "Domain Value"
msgstr "所有权价值"
msgstr "过滤条件值"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_module_quality
@ -9048,7 +9048,7 @@ msgstr "美属萨摩亚"
#. module: base
#: help:ir.actions.act_window,res_model:0
msgid "Model name of the object to open in the view window"
msgstr "模型对象的名称打开视图窗口"
msgstr "在视图中打开的模型对象的名称"
#. module: base
#: model:ir.module.module,description:base.module_caldav
@ -10268,7 +10268,7 @@ msgstr ""
msgid ""
"View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
"views"
msgstr "视图类型：设为“tree”来使用树形控件显示层次数据，或者设为“form”使用其他类型视图。"
msgstr "视图类型：设为“树形列表”来使用树形控件显示层次数据，或者设为“表单”使用其他类型视图。"
#. module: base
#: code:addons/base/res/res_config.py:385
@ -11771,7 +11771,7 @@ msgstr "人事经理"
#: field:ir.rule,domain_force:0
#: field:res.partner.title,domain:0
msgid "Domain"
msgstr "域"
msgstr "过滤条件"
#. module: base
#: model:ir.module.module,shortdesc:base.module_marketing_campaign
@ -13055,7 +13055,7 @@ msgstr ""
#. module: base
#: view:ir.rule:0
msgid "Rule definition (domain filter)"
msgstr ""
msgstr "规则定义(过滤条件)"
#. module: base
#: model:ir.model,name:base.model_workflow_instance
@ -13543,7 +13543,7 @@ msgstr ""
#. module: base
#: field:res.partner.bank,acc_number:0
msgid "Account Number"
msgstr "科目编号"
msgstr "银行账号"
#. module: base
#: view:ir.rule:0

4
openerp/addons/base/i18n/zh_HK.po
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-05-12 05:40+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

4
openerp/addons/base/i18n/zh_TW.po
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-05-12 05:41+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
#. module: base
#: model:res.country,name:base.sh

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

File diff suppressed because it is too large Load Diff

50
openerp/addons/base/ir/ir_actions.py
View File

@ -203,53 +203,11 @@ class act_window(osv.osv):
def _search_view(self, cr, uid, ids, name, arg, context=None):
res = {}
def encode(s):
if isinstance(s, unicode):
return s.encode('utf8')
return s
for act in self.browse(cr, uid, ids, context=context):
fields_from_fields_get = self.pool.get(act.res_model).fields_get(cr, uid, context=context)
search_view_id = False
if act.search_view_id:
search_view_id = act.search_view_id.id
else:
res_view = self.pool.get('ir.ui.view').search(cr, uid,
[('model','=',act.res_model),('type','=','search'),
('inherit_id','=',False)], context=context)
if res_view:
search_view_id = res_view[0]
if search_view_id:
field_get = self.pool.get(act.res_model).fields_view_get(cr, uid, search_view_id,
'search', context)
fields_from_fields_get.update(field_get['fields'])
field_get['fields'] = fields_from_fields_get
res[act.id] = str(field_get)
else:
def process_child(node, new_node, doc):
for child in node.childNodes:
if child.localName=='field' and child.hasAttribute('select') \
and child.getAttribute('select')=='1':
if child.childNodes:
fld = doc.createElement('field')
for attr in child.attributes.keys():
fld.setAttribute(attr, child.getAttribute(attr))
new_node.appendChild(fld)
else:
new_node.appendChild(child)
elif child.localName in ('page','group','notebook'):
process_child(child, new_node, doc)
form_arch = self.pool.get(act.res_model).fields_view_get(cr, uid, False, 'form', context)
dom_arc = dom.minidom.parseString(encode(form_arch['arch']))
new_node = copy.deepcopy(dom_arc)
for child_node in new_node.childNodes[0].childNodes:
if child_node.nodeType == child_node.ELEMENT_NODE:
new_node.childNodes[0].removeChild(child_node)
process_child(dom_arc.childNodes[0],new_node.childNodes[0],dom_arc)
form_arch['arch'] = new_node.toxml()
form_arch['fields'].update(fields_from_fields_get)
res[act.id] = str(form_arch)
field_get = self.pool.get(act.res_model).fields_view_get(cr, uid,
act.search_view_id and act.search_view_id.id or False,
'search', context=context)
res[act.id] = str(field_get)
return res
def _get_help_status(self, cr, uid, ids, name, arg, context=None):

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

@ -28,9 +28,13 @@
<field name="model">ir.config_parameter</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Parameters">
<field name="key" colspan="4"/>
<field name="value" colspan="4"/>
<form string="System Parameters" version="7.0">
<sheet>
<group>
<field name="key"/>
<field name="value"/>
</group>
</sheet>
</form>
</field>
</record>

18
openerp/addons/base/ir/ir_filters.xml
View File

@ -16,18 +16,18 @@
<field name="model">ir.filters</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Filters">
<group colspan="4" col="6" >
<form string="Filters" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="model_id"/>
<field name="user_id"/>
<field name="model_id"/>
</group>
<group col="4" expand="1">
<separator string="Domain" colspan="2" />
<separator string="Context" colspan="2" />
<field name="domain" nolabel="1" colspan="2"/>
<field name="context" nolabel="1" colspan="2"/>
<group>
<field name="domain"/>
<field name="context"/>
</group>
</sheet>
</form>
</field>
</record>
@ -76,4 +76,4 @@
<menuitem parent="base.next_id_2" name="User-defined Filters"
id="menu_ir_filters" action="actions_ir_filters_view" sequence="5"/>
</data>
</openerp>
</openerp>

29
openerp/addons/base/ir/ir_model.py
View File

@ -517,15 +517,16 @@ class ir_model_access(osv.osv):
"""
assert access_mode in ['read','write','create','unlink'], 'Invalid access mode: %s' % access_mode
cr.execute('''SELECT
g.name
c.name, g.name
FROM
ir_model_access a
JOIN ir_model m ON (a.model_id=m.id)
JOIN res_groups g ON (a.group_id=g.id)
LEFT JOIN ir_module_category c ON (c.id=g.category_id)
WHERE
m.model=%s AND
a.perm_''' + access_mode, (model_name,))
return [x[0] for x in cr.fetchall()]
return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]
@tools.ormcache()
def check(self, cr, uid, model, mode='read', raise_exception=True, context=None):
@ -569,15 +570,23 @@ class ir_model_access(osv.osv):
r = cr.fetchone()[0]
if not r and raise_exception:
groups = ', '.join(self.group_names_with_access(cr, model_name, mode)) or '/'
msgs = {
'read': _("You can not read this document (%s) ! Be sure your user belongs to one of these groups: %s."),
'write': _("You can not write in this document (%s) ! Be sure your user belongs to one of these groups: %s."),
'create': _("You can not create this document (%s) ! Be sure your user belongs to one of these groups: %s."),
'unlink': _("You can not delete this document (%s) ! Be sure your user belongs to one of these groups: %s."),
groups = '\n\t'.join('- %s' % g for g in self.group_names_with_access(cr, model_name, mode))
msg_heads = {
# Messages are declared in extenso so they are properly exported in translation terms
'read': _("Sorry, you are not allowed to access this document."),
'write': _("Sorry, you are not allowed to modify this document."),
'create': _("Sorry, you are not allowed to create this kind of document."),
'unlink': _("Sorry, you are not allowed to delete this document."),
}
raise except_orm(_('AccessError'), msgs[mode] % (model_name, groups) )
if groups:
msg_tail = _("Only users with the following access level are currently allowed to do that") + ":\n%s\n\n(" + _("Document model") + ": %s)"
msg_params = (groups, model_name)
else:
msg_tail = _("Please contact your system administrator if you think this is an error.") + "\n\n(" + _("Document model") + ": %s)"
msg_params = (model_name,)
_logger.warning('Access Denied by ACLs for operation: %s, uid: %s, model: %s', mode, uid, model_name)
msg = '%s %s' % (msg_heads[mode], msg_tail)
raise except_orm(_('Access Denied'), msg % msg_params)
return r or False
__cache_clearing_methods = []

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

@ -255,6 +255,9 @@ class ir_ui_menu(osv.osv):
return res
def _get_needaction_info(self, cr, uid, id, domain=[], context={}):
return [False, 0]
def _get_needaction(self, cr, uid, ids, field_names, args, context=None):
if context is None:
context = {}
@ -278,7 +281,7 @@ class ir_ui_menu(osv.osv):
'menu_id', 'gid', 'Groups', help="If you have groups, the visibility of this menu will be based on these groups. "\
"If this field is empty, OpenERP will compute visibility based on the related object's read access."),
'complete_name': fields.function(_get_full_name,
string='Complete Name', type='char', size=128),
string='Full Path', type='char', size=128),
'icon': fields.selection(tools.icons, 'Icon', size=64),
'icon_pict': fields.function(_get_icon_pict, type='char', size=32),
'web_icon': fields.char('Web Icon File', size=128),

78
openerp/addons/base/ir/ir_ui_view.py
View File

@ -73,21 +73,56 @@ class view(osv.osv):
}
_order = "priority,name"
def _check_xml(self, cr, uid, ids, context=None):
for view in self.browse(cr, uid, ids, context):
eview = etree.fromstring(view.arch.encode('utf8'))
if eview.get('layout') or eview.get('validate'):
continue
# Holds the RNG schema
_relaxng_validator = None
def _relaxng(self):
if not self._relaxng_validator:
frng = tools.file_open(os.path.join('base','rng','view.rng'))
try:
relaxng_doc = etree.parse(frng)
relaxng = etree.RelaxNG(relaxng_doc)
if not relaxng.validate(eview):
for error in relaxng.error_log:
_logger.error(tools.ustr(error))
return False
self._relaxng_validator = etree.RelaxNG(relaxng_doc)
except Exception:
_logger.exception('Failed to load RelaxNG XML schema for views validation')
finally:
frng.close()
return self._relaxng_validator
def _check_render_view(self, cr, uid, view, context=None):
"""Verify that the given view's hierarchy is valid for rendering, along with all the changes applied by
its inherited views, by rendering it using ``fields_view_get()``.
@param browse_record view: view to validate
@return: the rendered definition (arch) of the view, always utf-8 bytestring (legacy convention)
if no error occurred, else False.
"""
try:
fvg = self.pool.get(view.model).fields_view_get(cr, uid, view_id=view.id, view_type=view.type, context=context)
return fvg['arch']
except:
_logger.exception("Can't render view %s for model: %s", view.xml_id, view.model)
return False
def _check_xml(self, cr, uid, ids, context=None):
for view in self.browse(cr, uid, ids, context):
# Sanity check: the view should not break anything upon rendering!
view_arch_utf8 = self._check_render_view(cr, uid, view, context=context)
# always utf-8 bytestring - legacy convention
if not view_arch_utf8: return False
# RNG-based validation is not possible anymore with 7.0 forms
# TODO 7.0: provide alternative assertion-based validation of view_arch_utf8
view_docs = [etree.fromstring(view_arch_utf8)]
if view_docs[0].tag == 'data':
# A <data> element is a wrapper for multiple root nodes
view_docs = view_docs[0]
validator = self._relaxng()
for view_arch in view_docs:
if (view_arch.get('version') < '7.0') and validator and not validator.validate(view_arch):
for error in validator.error_log:
_logger.error(tools.ustr(error))
return False
return True
_constraints = [
@ -101,16 +136,31 @@ class view(osv.osv):
cr.execute('CREATE INDEX ir_ui_view_model_type_inherit_id ON ir_ui_view (model, type, inherit_id)')
def get_inheriting_views_arch(self, cr, uid, view_id, model, context=None):
"""Retrieves the architecture of views that inherit from the given view.
"""Retrieves the architecture of views that inherit from the given view, from the sets of
views that should currently be used in the system. During the module upgrade phase it
may happen that a view is present in the database but the fields it relies on are not
fully loaded yet. This method only considers views that belong to modules whose code
is already loaded. Custom views defined directly in the database are loaded only
after the module initialization phase is completely finished.
:param int view_id: id of the view whose inheriting views should be retrieved
:param str model: model identifier of the view's related model (for double-checking)
:rtype: list of tuples
:return: [(view_arch,view_id), ...]
"""
cr.execute("""SELECT arch, id FROM ir_ui_view WHERE inherit_id=%s AND model=%s
ORDER BY priority""",
(view_id, model))
if self.pool._init:
# Module init currently in progress, only consider views from modules whose code was already loaded
query = """SELECT v.arch, v.id FROM ir_ui_view v LEFT JOIN ir_model_data md ON (md.model = 'ir.ui.view' AND md.res_id = v.id)
WHERE v.inherit_id=%s AND v.model=%s AND md.module in %s
ORDER BY priority"""
query_params = (view_id, model, tuple(self.pool._init_modules))
else:
# Modules fully loaded, consider all views
query = """SELECT v.arch, v.id FROM ir_ui_view v
WHERE v.inherit_id=%s AND v.model=%s
ORDER BY priority"""
query_params = (view_id, model)
cr.execute(query, query_params)
return cr.fetchall()
def write(self, cr, uid, ids, vals, context=None):

18
openerp/addons/base/ir/wizard/wizard_menu_view.xml
View File

@ -1,21 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_model_menu_create" model="ir.ui.view">
<field name="name">Create Menu</field>
<field name="model">wizard.ir.model.menu.create</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Menu">
<separator colspan="4" string="Create Menu"/>
<field name="name"/>
<field name="menu_id" domain="[('parent_id','&lt;&gt;',False)]"/>
<separator colspan="4" string=""/>
<label colspan="2" string=""/>
<group col="2" colspan="2">
<button special="cancel" string="_Close" icon="gtk-cancel"/>
<button name="menu_create" string="Create _Menu" type="object" icon="gtk-ok"/>
<form string="Create Menu" version="7.0">
<header>
<button name="menu_create" string="Create _Menu" type="object"/>
<button special="cancel" string="_Cancel"/>
</header>
<group>
<field name="name"/>
<field name="menu_id" domain="[('parent_id','&lt;&gt;',False)]"/>
</group>
</form>
</field>

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

@ -14,15 +14,16 @@
<field name="model">workflow</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow">
<group col="6" colspan="4" >
<form string="Workflow" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="osv"/>
<field name="on_create"/>
</group>
<separator colspan="4" string="Activities"/>
<field colspan="4" name="activities" nolabel="1"/>
</form>
<field name="activities"/>
</sheet>
</form>
</field>
</record>
@ -93,59 +94,54 @@
<field name="model">workflow.activity</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Activity">
<group col="6" colspan="4">
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<form string="Activity" version="7.0">
<sheet>
<group>
<group>
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
</group>
<group>
<field name="flow_start"/>
<field name="flow_stop"/>
</group>
</group>
<group colspan="2">
<field name="flow_start"/>
<field name="flow_stop"/>
</group>
<notebook colspan="4">
<notebook>
<page string="Properties">
<group colspan="4" col="6">
<group colspan="1" col="2">
<separator string="Subflow" colspan="2"/>
<group>
<group string="Subflow">
<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
<field name="signal_send"/>
</group>
<group colspan="1" col="2">
<separator string="Conditions" colspan="2"/>
<group string="Conditions">
<field name="split_mode"/>
<field name="join_mode"/>
</group>
<group colspan="1" col="2">
<separator string="Actions" colspan="2"/>
<group string="Actions">
<field name="action_id"/>
<field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/>
</group>
</group>
</page>
<page string="Transitions">
<group colspan="4" col="4">
<group col="2" colspan="2">
<field name="in_transitions" nolabel="1" height="400">
<tree string="Incoming Transitions">
<field name="act_from"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
<group col="2" colspan="2">
<field name="out_transitions" nolabel="1" height="400">
<tree string="Outgoing Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</group>
</group>
<field name="in_transitions">
<tree string="Incoming Transitions">
<field name="act_from"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
<field name="out_transitions">
<tree string="Outgoing Transitions">
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</tree>
</field>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@ -209,16 +205,18 @@
<field name="model">workflow.transition</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Transition">
<group col="6" colspan ="4">
<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="trigger_expr_id"/>
<field name="group_id"/>
</group>
</sheet>
</form>
</field>
</record>
@ -270,11 +268,15 @@
<field name="model">workflow.instance</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Instances">
<field name="wkf_id" readonly="1"/>
<field name="res_id" readonly="1"/>
<field name="res_type" readonly="1"/>
<field name="state" readonly="1"/>
<form string="Workflow Instances" version="7.0">
<sheet>
<group col="4">
<field name="wkf_id"/>
<field name="res_id"/>
<field name="res_type"/>
<field name="state"/>
</group>
</sheet>
</form>
</field>
</record>
@ -328,12 +330,16 @@
<field name="model">workflow.workitem</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow Workitems">
<field name="wkf_id" readonly="1"/>
<field name="act_id" readonly="1"/>
<field name="subflow_id" readonly="1"/>
<field name="inst_id" readonly="1"/>
<field name="state" readonly="1"/>
<form string="Workflow Workitems" version="7.0">
<sheet>
<group col="4">
<field name="wkf_id"/>
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
<field name="state"/>
</group>
</sheet>
</form>
</field>
</record>

18
openerp/addons/base/module/module.py
View File

@ -23,8 +23,9 @@ import logging
import re
import urllib
import zipimport
import base64
from openerp import modules, pooler, release, tools
from openerp import modules, pooler, release, tools, addons
from openerp.tools.parse_version import parse_version
from openerp.tools.translate import _
from openerp.osv import fields, osv, orm
@ -160,10 +161,22 @@ class module(osv.osv):
res[key][k] = "\n".join(sorted(v))
return res
def _get_icon_image(self, cr, uid, ids, field_name=None, arg=None, context=None):
res = dict.fromkeys(ids, '')
for module in self.browse(cr, uid, ids, context=context):
path = addons.get_module_resource(module.name, 'static', 'src', 'img', 'icon.png')
if path:
image_file = tools.file_open(path, 'rb')
try:
res[module.id] = image_file.read().encode('base64')
finally:
image_file.close()
return res
_columns = {
'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
'shortdesc': fields.char('Name', size=256, readonly=True, translate=True),
'shortdesc': fields.char('Module Name', size=256, readonly=True, translate=True),
'description': fields.text("Description", readonly=True, translate=True),
'author': fields.char("Author", size=128, readonly=True),
'maintainer': fields.char('Maintainer', size=128, readonly=True),
@ -211,6 +224,7 @@ class module(osv.osv):
'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
'application': fields.boolean('Application', readonly=True),
'icon': fields.char('Icon URL', size=128),
'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
}
_defaults = {

79
openerp/addons/base/module/module_view.xml
View File

@ -8,13 +8,14 @@
<field name="name">ir.module.category.form</field>
<field name="model">ir.module.category</field>
<field name="type">form</field>
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<form string="Module Category">
<field name="name"/>
<field name="parent_id"/>
<field name="sequence"/>
<field name="description" colspan="4"/>
<form string="Module Category" version="7.0">
<group col="4">
<field name="name"/>
<field name="parent_id"/>
<field name="sequence"/>
</group>
<field name="description"/>
</form>
</field>
</record>
@ -118,40 +119,48 @@
<field name="model">ir.module.module</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form layout="manual">
<div class="oe_form_topbar">
<form string="Module" version="7.0">
<header>
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_form_button_hi"/>
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_form_button_hi"/>
<button name="button_uninstall" states="installed" string="Uninstall (beta)"
icon="terp-dialog-close" type="object"
confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
<button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
<button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
<button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
<button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
<div class="oe_right">
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="uninstalled"/>
<field name="state" widget="statusbar" statusbar_visible="uninstalled"/>
</header>
<sheet>
<div class="oe_right oe_form_button_box">
<field name="icon_image" widget="image"/>
</div>
</div>
<sheet string="Module" layout="auto">
<field name="icon" widget='image' nolabel="1" rowspan="6" colspan="1"/>
<group colspan="2" col="2" class="oe_form_group_label_border">
<field name="shortdesc" string="Application Name"/>
<field name="category_id"/>
<field name="author" select="2"/>
<field name="license"/>
<field name="website" select="2" widget="url" string="Author Website"/>
<field name="installed_version"/>
<div class="oe_form_title">
<label for="shortdesc" class="oe_form_readonly_hidden"/>
<h1><field name="shortdesc"/></h1>
<label for="category_id" class="oe_form_readonly_hidden"/>
<h2><field name="category_id" class="oe_form_inline"/></h2>
</div>
<group>
<group>
<field name="name"/>
<field name="license"/>
<field name="installed_version"/>
</group>
<group>
<field name="author"/>
<field name="website" widget="url"/>
</group>
</group>
<notebook colspan="4">
<page string="Description">
<field colspan="4" name="description" select="2" nolabel="1" rowspan="6"/>
<field name="description"/>
</page>
<page string="Technical Data">
<field name="name"/>
<field name="certificate" />
<field name="demo"/>
<field name="application"/>
<field colspan="4" name="dependencies_id" nolabel="1">
<group col="4">
<field name="demo"/>
<field name="application"/>
</group>
<field name="dependencies_id">
<tree string="Dependencies">
<field name="name"/>
<field name="state"/>
@ -159,12 +168,12 @@
</field>
</page>
<page string="Features" attrs="{'invisible':[('state','!=','installed')]}">
<separator string="Created Menus" colspan="4"/>
<field colspan="4" name="menus_by_module" nolabel="1"/>
<separator string="Created Views" colspan="2"/>
<separator string="Defined Reports" colspan="2"/>
<field colspan="2" name="views_by_module" nolabel="1"/>
<field colspan="2" name="reports_by_module" nolabel="1"/>
<label for="menus_by_module" string="Created Menus"/>
<field name="menus_by_module"/>
<label for="views_by_module" string="Created Views"/>
<field name="views_by_module"/>
<label for="reports_by_module" string="Defined Reports"/>
<field name="reports_by_module"/>
</page>
</notebook>
</sheet>

40
openerp/addons/base/module/wizard/base_import_language_view.xml
View File

@ -7,34 +7,18 @@
<field name="model">base.language.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Translation">
<group col="8">
<group colspan="3">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="Supported file formats: *.csv (Comma-separated values) or *.po (GetText Portable Objects)"/>
<label colspan="4" width="220" string="Please double-check that the file encoding is set to UTF-8 (sometimes called Unicode) when the translator exports it."/>
<label colspan="4" width="220"/>
<label colspan="4" width="220" string="When using CSV format, please also check that the first line of your file is one of the following:"/>
<label colspan="4" width="220" string="- type,name,res_id,src,value"/>
<label colspan="4" width="220" string="- module,type,name,res_id,src,value"/>
</group>
<separator orientation="vertical" rowspan="15"/>
<group colspan="4" col="4">
<separator string="Import Translation" colspan="4"/>
<label colspan="4" 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."/>
<newline/>
<field name="name" width="200"/>
<field name="code"/>
<field name="data" colspan="4"/>
<field name="overwrite"/>
</group>
<group colspan="8" col="8">
<separator string="" colspan="8"/>
<label colspan="6" width="220"/>
<button special="cancel" string="_Close" icon="gtk-cancel"/>
<button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
</group>
<form string="Import Translation" version="7.0">
<header>
<button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
<button special="cancel" string="_Close" icon="gtk-cancel"/>
</header>
<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>
</form>
</field>

10
openerp/addons/base/module/wizard/base_module_configuration_view.xml
View File

@ -7,11 +7,11 @@
<field name="model">base.module.configuration</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Configuration Done">
<label align="0.0" string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards." colspan="4"/>
<separator string="" colspan="4"/>
<newline/>
<button special="cancel" string="_Ok" icon="gtk-ok"/>
<form string="System Configuration Done" version="7.0">
<header>
<button special="cancel" string="_Ok"/>
</header>
<label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
</form>
</field>
</record>

15
openerp/addons/base/module/wizard/base_module_scan_view.xml
View File

@ -7,15 +7,12 @@
<field name="model">base.module.scan</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scan for new modules">
<separator string="" colspan="4"/>
<label string="This function will check if you installed new modules in the 'addons' path of your server installation." colspan="4" />
<separator string="" colspan="4"/>
<newline/>
<group colspan="4">
<button special="cancel" string="Close" icon="gtk-cancel"/>
<button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok"/>
</group>
<form string="Scan for new modules" version="7.0">
<header>
<button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok"/>
<button special="cancel" string="Close" icon="gtk-cancel"/>
</header>
<label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
</form>
</field>
</record>

11
openerp/addons/base/module/wizard/base_module_upgrade.py
View File

@ -38,6 +38,7 @@ class base_module_upgrade(osv.osv_memory):
if view_type != 'form':
return res
context = {} if context is None else context
record_id = context and context.get('active_id', False) or False
active_model = context.get('active_model')
if (not record_id) or (not active_model):
@ -45,14 +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">
res['arch'] = '''<form string="Apply Scheduled Upgrades" 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="System update completed" colspan="4"/>
<label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
<label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
<separator string="" colspan="4"/>
<newline/>
<button special="cancel" string="Close" icon="gtk-cancel"/>
<button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
</form>'''
return res

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

@ -7,17 +7,16 @@
<field name="model">base.module.upgrade</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Update">
<group colspan="2" col="4">
<label align="0.0" string="Your system will be updated." colspan="4"/>
<label align="0.0" string="Note that this operation might take a few minutes." colspan="4"/>
<separator string="Modules to Update" colspan="4"/>
<field name="module_info" nolabel="1" colspan="4"/>
<separator string="" colspan="4"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward"/>
</group>
</form>
<form string="System Update" version="7.0">
<header>
<button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<label string="Your system will be updated."/>
<label string="Note that this operation might take a few minutes."/>
<separator string="Modules to Update"/>
<field name="module_info"/>
</form>
</field>
</record>
@ -37,22 +36,21 @@
id="menu_view_base_module_upgrade"
parent="menu_management"
sequence="3"/>
<record id="view_base_module_upgrade_install" model="ir.ui.view">
<field name="name">Module Upgrade Install</field>
<field name="model">base.module.upgrade</field>
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Apply Scheduled Upgrades">
<separator string="System update completed" colspan="4"/>
<label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
<label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
<separator string="" colspan="4"/>
<newline/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
</form>
<form string="Apply Scheduled Upgrades" version="7.0">
<header>
<button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<label string="The selected modules have been updated / installed !"/>
<label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/>
</form>
</field>
</record>

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

@ -22,7 +22,8 @@
<field name="model">publisher_warranty.contract</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Publisher Warranty Contract">
<form string="Publisher Warranty Contract" version="7.0">
<sheet>
<group col="3" colspan="4">
<group col="2">
<field name="name"/>
@ -45,6 +46,7 @@
attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
</group>
</group>
</sheet>
</form>
</field>
</record>

2
openerp/addons/base/res/__init__.py
View File

@ -24,7 +24,6 @@ import tools
import res_country
import res_lang
import res_partner
import res_partner_event
import res_bank
import res_config
import res_currency
@ -35,7 +34,6 @@ import res_lang
import res_widget
import ir_property
import wizard
import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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

@ -24,33 +24,23 @@
<field name="model">ir.property</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Parameters">
<separator colspan="4" string="Property"/>
<field name="name" select="1"/>
<field name="company_id" select="1" groups="base.group_multi_company"/>
<separator colspan="4" string="Field Information"/>
<field colspan="4" name="fields_id" select="1"/>
<field colspan="4" name="type"/>
<group colspan="4" attrs="{'invisible' : [('type', 'not in', ('integer', 'boolean'))]}">
<field colspan="4" name="value_integer" widget="integer"/>
<form string="Parameters" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="company_id" groups="base.group_multi_company"/>
<newline/>
<field name="fields_id"/>
<field name="type"/>
<field name="res_id"/>
</group>
<group colspan="4" attrs="{'invisible' : [('type', '!=', 'float')]}">
<field colspan="4" name="value_float" />
</group>
<group colspan="4" attrs="{'invisible' : [('type', 'not in', ('date', 'datetime'))]}">
<field colspan="4" name="value_datetime" />
</group>
<group colspan="4" attrs="{'invisible' : [('type', 'not in', ('char', 'text'))]}">
<field colspan="4" name="value_text" />
</group>
<group colspan="4" attrs="{'invisible' : [('type', '!=', 'many2one')]}">
<field colspan="4" name="value_reference" />
</group>
<group colspan="4" attrs="{'invisible' : [('type', '!=', 'binary')]}">
<field colspan="4" name="value_binary" />
</group>
<separator colspan="4" string="Resource"/>
<field colspan="4" name="res_id"/>
<field name="value_integer" attrs="{'invisible' : [('type', 'not in', ('integer', 'boolean'))]}"/>
<field name="value_float" attrs="{'invisible' : [('type', '!=', 'float')]}"/>
<field name="value_datetime" attrs="{'invisible' : [('type', 'not in', ('date', 'datetime'))]}"/>
<field name="value_text" attrs="{'invisible' : [('type', 'not in', ('char', 'text'))]}"/>
<field name="value_reference" attrs="{'invisible' : [('type', '!=', 'many2one')]}"/>
<field name="value_binary" attrs="{'invisible' : [('type', '!=', 'binary')]}"/>
</sheet>
</form>
</field>
</record>

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

@ -7,28 +7,34 @@
<field name="model">res.bank</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank">
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="bic" select="1"/>
<field name="active" select="2"/>
<form string="Bank" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="bic"/>
</group>
<newline/>
<group colspan="2" col="4">
<separator string="Address" colspan="4"/>
<field name="street" select="2"/>
<field name="street2" select="2"/>
<field name="zip"/>
<field name="city"/>
<field name="country" select="2"/>
<field name="state" select="2"/>
</group>
<group colspan="2" col="2">
<separator string="Communication" colspan="2"/>
<field name="phone"/>
<field name="fax"/>
<field name="email" widget="email"/>
<group>
<group string="Address">
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
</div>
<field name="state" placeholder="State"/>
<field name="country" placeholder="Country"/>
</div>
</group>
<group string="Communication">
<field name="phone"/>
<field name="fax"/>
<field name="email" widget="email"/>
<field name="active"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
@ -59,11 +65,13 @@
<field name="model">res.partner.bank.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank Account Type">
<field name="name"/>
<field name="code"/>
<field name="field_ids" colspan="4"/>
<field name="format_layout" colspan="4"/>
<form string="Bank Account Type" version="7.0">
<group col="4">
<field name="name"/>
<field name="code"/>
</group>
<field name="field_ids"/>
<field name="format_layout"/>
</form>
</field>
</record>
@ -73,8 +81,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Bank Account Type">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="name"/>
<field name="code"/>
</tree>
</field>
</record>
@ -84,29 +92,28 @@
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank account">
<group colspan="4" col="6">
<form string="Bank account" version="7.0">
<group col="4">
<field name="state"/>
<field name="acc_number"/>
<field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
<field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
<newline/>
<field name="acc_number"/>
</group>
<group name="owner" colspan="2" col="2">
<separator colspan="4" string="Bank Account Owner"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="owner_name"/>
<field name="street"/>
<field name="city"/>
<field name="zip"/>
<field name="country_id"/>
<field name="state_id"/>
</group>
<group name="bank" colspan="2" col="2">
<separator colspan="2" string="Information About the Bank"/>
<field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank_name" attrs="{'required': [('company_id','&lt;&gt;',False)]}"/>
<field name="bank_bic"/>
<group>
<group name="owner" string="Bank Account Owner">
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="owner_name"/>
<field name="street"/>
<field name="city"/>
<field name="zip"/>
<field name="country_id"/>
<field name="state_id"/>
</group>
<group name="bank" string="Information About the Bank">
<field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank_name" attrs="{'required': [('company_id','&lt;&gt;',False)]}"/>
<field name="bank_bic" placeholder="[Identifier code]" />
</group>
</group>
</form>

13
openerp/addons/base/res/res_company.py
View File

@ -88,17 +88,6 @@ class res_company(osv.osv):
return result
def _get_bank_data(self, cr, uid, ids, field_names, arg, context=None):
""" Read the 'address' functional fields. """
result = {}
for company in self.browse(cr, uid, ids, context=context):
r = []
for bank in company.bank_ids:
if bank.footer:
r.append(bank.name_get(context=context)[0][1])
result[company.id] = ' | '.join(r)
return result
def _set_address_data(self, cr, uid, company_id, name, value, arg, context=None):
""" Write the 'address' functional fields. """
company = self.browse(cr, uid, company_id, context=context)
@ -120,7 +109,7 @@ class res_company(osv.osv):
'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_footer1': fields.char('General Information Footer', size=200),
'rml_footer2': fields.function(_get_bank_data, type="char", string='Bank Accounts Footer', size=250, help="This field is computed automatically based on bank accounts defined, having the display on footer checkbox set."),
'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),

110
openerp/addons/base/res/res_company_view.xml
View File

@ -18,66 +18,80 @@
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Company">
<group colspan="4" col="6">
<group colspan="4" col="4">
<field name="name"/>
<form string="Company" version="7.0">
<sheet>
<div class="oe_right oe_form_avatar">
<field name="logo" nolabel="1" widget="image"/>
</div>
<div class="oe_right oe_form_button_box">
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<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>
<group colspan="2" col="2">
<field name="logo" nolabel="1" widget="image"/>
</group>
</group>
</div>
<notebook colspan="4">
<page string="General Information">
<separator string="Address Information" colspan="4"/>
<field name="street" colspan="4"/>
<field name="street2" invisible="1"/>
<field name="zip"/>
<field name="city"/>
<field name="country_id"/>
<field name="state_id"/>
<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="website" 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)"/>
<separator string="Header/Footer of Reports" colspan="4"/>
<group colspan="4" col="3">
<field name="rml_header1" colspan="3"/>
<newline/>
<field name="rml_footer1" colspan="3" groups="base.group_no_one"/>
<newline/>
<field name="rml_footer2" colspan="2"/>
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
<newline/>
<label string="" colspan="2"/>
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
<group>
<group>
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
<field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
</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="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"/>
<label for="rml_footer2"/>
<div>
<field name="rml_footer2"/>
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
</div>
</group>
</page>
<page string="Header/Footer" groups="base.group_no_one">
<group colspan="2" col="4">
<group>
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
<field name="rml_header"/>
</group>
<field colspan="4" name="rml_header" nolabel="1"/>
</page>
<page string="Internal Header/Footer" groups="base.group_no_one">
<separator string="Portrait" colspan="2"/>
<separator string="Landscape" colspan="2"/>
<field colspan="2" name="rml_header2" nolabel="1"/>
<field colspan="2" name="rml_header3" nolabel="1"/>
<label for="rml_header2"/>
<field name="rml_header2"/>
<label for="rml_header3"/>
<field name="rml_header3"/>
</page>
<page string="Configuration">
<separator string="Accounting" colspan="4"/>
<field name="currency_id" colspan="2"/>
<newline/>
<group>
<field name="currency_id"/>
</group>
</page>
<page string="Bank Accounts">
<field name="bank_ids" nolabel="1"/>
<field name="bank_ids"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@ -133,7 +147,8 @@
<field name="type">form</field>
<field name="priority" eval="8"/>
<field name="arch" type="xml">
<form string="Multi Company">
<form string="Multi Company" version="7.0">
<sheet>
<group col="6" colspan="4">
<field name="name" colspan="6"/>
<separator string="Matching" colspan="6"/>
@ -146,6 +161,7 @@
<separator string="Returning" colspan="6"/>
<field name="company_dest_id"/>
</group>
</sheet>
</form>
</field>
</record>
@ -156,10 +172,10 @@
<field name="priority" eval="8"/>
<field name="arch" type="xml">
<search string="Multi Company">
<field name="name" select="1"/>
<field name="company_id" select="1" widget="selection"/>
<field name="company_dest_id" select="1" widget="selection"/>
<field name="object_id" select="1"/>
<field name="name"/>
<field name="company_id" widget="selection"/>
<field name="company_dest_id" widget="selection"/>
<field name="object_id"/>
</search>
</field>
</record>

78
openerp/addons/base/res/res_config.xml
View File

@ -5,29 +5,15 @@
<field name="model">res.config</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form>
<group colspan="4" col="8">
<group colspan="1" width="220">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1"/>
<newline/>
<label align="0.0" string="description" width="200" colspan="2"/>
</group>
<separator string="vsep" orientation="vertical" colspan="1" rowspan="12"/>
<group colspan="6">
<separator string="title" colspan="4"/>
<group string="res_config_contents"/>
</group>
</group>
<group colspan="8" col="8">
<separator string="" colspan="6"/>
<group colspan="4" width="220">
</group>
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Cancel" colspan="1"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Apply" colspan="1"/>
</group>
</form>
<form version="7.0">
<header>
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Cancel" colspan="1"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Apply" colspan="1"/>
</header>
<group string="res_config_contents" col="4"/>
</form>
</field>
</record>
@ -36,19 +22,12 @@
<field name="model">ir.actions.configuration.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Next Configuration Step">
<image name="gtk-dialog-info"/>
<group>
<field name="note" nolabel="1" colspan="4" width="500"/>
<group colspan="4" col="8">
<field name="progress" widget="progressbar"/>
<label string="" colspan="4"/>
<group colspan="1" col="2">
<form string="Next Configuration Step" version="7.0">
<header>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Continue"/>
</group>
</group>
</group>
</header>
<field name="note"/>
</form>
</field>
</record>
@ -58,30 +37,15 @@
<field name="model">res.config.installer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form>
<group colspan="4" col="8">
<group colspan="1" width="220" height="250">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label align="0.0" string="description" width="200" colspan="2"/>
</group>
<separator string="vsep" orientation="vertical" colspan="1" rowspan="12"/>
<group colspan="6">
<separator string="title" colspan="4"/>
<group colspan="8"/>
</group>
</group>
<group colspan="8" col="8">
<separator string="" colspan="8"/>
<group colspan="4" width="220">
</group>
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Cancel" colspan="1"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Install Modules" colspan="1"/>
</group>
<form version="7.0">
<header>
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Cancel" colspan="1"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Install Modules" colspan="1"/>
</header>
<separator string="title" colspan="4"/>
</form>
</field>
</record>

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

@ -3,8 +3,8 @@
<data>
<!--
Country
-->
Country
-->
<record id="view_country_tree" model="ir.ui.view">
<field name="name">res.country.tree</field>
@ -23,10 +23,12 @@
<field name="model">res.country</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Country">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="address_format" colspan="4" groups="base.group_no_one"/>
<form string="Country" version="7.0">
<group col="4">
<field name="name"/>
<field name="code"/>
<field name="address_format" colspan="4" groups="base.group_no_one"/>
</group>
</form>
</field>
</record>
@ -65,10 +67,12 @@
<field name="model">res.country.state</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="State">
<field name="country_id" select="1"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
<form string="State" version="7.0">
<group>
<field name="name"/>
<field name="code"/>
<field name="country_id"/>
</group>
</form>
</field>
</record>

31
openerp/addons/base/res/res_currency_view.xml
View File

@ -37,39 +37,32 @@
<field name="model">res.currency</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Currency">
<group col="6" colspan="4">
<form string="Currency" version="7.0">
<group col="4">
<field name="name"/>
<field name="rate"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group col="6" colspan="4">
<group col="2" colspan="2">
<separator string="Price Accuracy" colspan="2"/>
<group>
<group string="Price Accuracy">
<field name="rounding"/>
<field name="accuracy"/>
</group>
<group col="2" colspan="2">
<separator string="Display" colspan="2"/>
<group string="Display">
<field name="symbol"/>
<field name="position"/>
</group>
<group col="2" colspan="2">
<separator string="Miscellaneous" colspan="2"/>
<group string="Miscellaneous">
<field name="base"/>
<field name="active" select="1"/>
<field name="active"/>
</group>
</group>
<field colspan="4" mode="tree,form" name="rate_ids" nolabel="1" attrs="{'readonly':[('base','=',True)]}">
<form string="Rates">
<field name="name"/>
<field name="rate"/>
</form>
<tree string="Rates">
<field mode="tree" name="rate_ids" attrs="{'readonly':[('base','=',True)]}">
<tree string="Rates" editable="bottom">
<field name="name"/>
<field name="rate"/>
</tree>
@ -95,8 +88,10 @@
<field name="model">res.currency.rate.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Currency Rate Type">
<field name="name"/>
<form string="Currency Rate Type" version="7.0">
<group>
<field name="name"/>
</group>
</form>
</field>
</record>

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

@ -23,81 +23,82 @@
<field name="model">res.lang</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Languages">
<group col="6" colspan="4">
<field name="name"/>
<field name="code" />
<field name="iso_code"/>
<newline/>
<field name="grouping" />
<field name="date_format"/>
<field name="time_format"/>
<newline/>
<field name="direction" />
<field name="decimal_point"/>
<field name="thousands_sep"/>
<newline/>
<field name="active" />
<field name="translatable"/>
</group>
<separator colspan="4" string="Legends for Date and Time Formats"/>
<form string="Languages" version="7.0">
<sheet>
<group col="6" colspan="4">
<field name="name"/>
<field name="code" />
<field name="iso_code"/>
<newline/>
<field name="grouping" />
<field name="date_format"/>
<field name="time_format"/>
<newline/>
<field name="direction" />
<field name="decimal_point"/>
<field name="thousands_sep"/>
<newline/>
<field name="active" />
<field name="translatable"/>
</group>
<separator colspan="4" string="Legends for Date and Time Formats"/>
<group col="4" colspan="4">
<label align="0.0" string="%%a - Abbreviated weekday name."/>
<label align="0.0" string="%%A - Full weekday name."/>
<newline/>
<label align="0.0" string="%%b - Abbreviated month name."/>
<label align="0.0" string="%%B - Full month name." />
<newline/>
<label align="0.0" string="%%c - Appropriate date and time representation." />
<label align="0.0" string="%%d - Day of the month [01,31]." />
<newline/>
<label align="0.0" string="%%H - Hour (24-hour clock) [00,23]." />
<label align="0.0" string="%%I - Hour (12-hour clock) [01,12]." />
<newline/>
<label align="0.0" string="%%j - Day of the year [001,366]." />
<label align="0.0" string="%%m - Month number [01,12]." />
<newline/>
<label align="0.0" string="%%M - Minute [00,59]." />
<label align="0.0" string="%%p - Equivalent of either AM or PM." />
<newline/>
<label align="0.0" string="%%S - Seconds [00,61]." />
<label align="0.0" string="%%w - Weekday number [0(Sunday),6]." />
<newline/>
<label align="0.0" string="%%x - Appropriate date representation." />
<label align="0.0" string="%%X - Appropriate time representation." />
<newline/>
<label align="0.0" string="%%y - Year without century [00,99]." />
<label align="0.0" string="%%Y - Year with century." />
<newline/>
<label align="0.0" string="%%U - Week number of the year (Sunday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Sunday are considered to be in week 0." />
<label align="0.0" string="%%W - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0." />
<newline/>
<label align="0.0" string="======================================================" />
<label align="0.0" string="%%a - Abbreviated weekday name."/>
<label align="0.0" string="%%A - Full weekday name."/>
<newline/>
<label align="0.0" string="%%b - Abbreviated month name."/>
<label align="0.0" string="%%B - Full month name." />
<newline/>
<label align="0.0" string="%%c - Appropriate date and time representation." />
<label align="0.0" string="%%d - Day of the month [01,31]." />
<newline/>
<label align="0.0" string="%%H - Hour (24-hour clock) [00,23]." />
<label align="0.0" string="%%I - Hour (12-hour clock) [01,12]." />
<newline/>
<label align="0.0" string="%%j - Day of the year [001,366]." />
<label align="0.0" string="%%m - Month number [01,12]." />
<newline/>
<label align="0.0" string="%%M - Minute [00,59]." />
<label align="0.0" string="%%p - Equivalent of either AM or PM." />
<newline/>
<label align="0.0" string="%%S - Seconds [00,61]." />
<label align="0.0" string="%%w - Weekday number [0(Sunday),6]." />
<newline/>
<label align="0.0" string="%%x - Appropriate date representation." />
<label align="0.0" string="%%X - Appropriate time representation." />
<newline/>
<label align="0.0" string="%%y - Year without century [00,99]." />
<label align="0.0" string="%%Y - Year with century." />
<newline/>
<label align="0.0" string="%%U - Week number of the year (Sunday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Sunday are considered to be in week 0." />
<label align="0.0" string="%%W - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0." />
<newline/>
<label align="0.0" string="======================================================" />
</group>
<newline/>
<group colspan="4" col="4">
<separator string="Examples" colspan="4"/>
<newline/>
<label align="0.0" string="1. %%c ==> Fri Dec 5 18:25:20 2008"/>
<label align="0.0" string="2. %%a ,%%A ==> Fri, Friday"/>
<newline/>
<label align="0.0" string="3. %%x ,%%X ==> 12/05/08, 18:25:20"/>
<label align="0.0" string="4. %%b, %%B ==> Dec, December"/>
<newline/>
<label align="0.0" string="5. %%y, %%Y ==> 08, 2008"/>
<label align="0.0" string="6. %%d, %%m ==> 05, 12"/>
<newline/>
<label align="0.0" string="7. %%H:%%M:%%S ==> 18:25:20"/>
<label align="0.0" string="8. %%I:%%M:%%S %%p ==> 06:25:20 PM"/>
<newline/>
<label align="0.0" string="9. %%j ==> 340"/>
<label align="0.0" string="10. %%S ==> 20"/>
<newline/>
<label align="0.0" string="11. %%U or %%W ==> 48 (49th week)"/>
<label align="0.0" string="12. %%w ==> 5 ( Friday is the 6th day)"/>
<newline/>
<separator string="Examples" colspan="4"/>
<newline/>
<label align="0.0" string="1. %%c ==> Fri Dec 5 18:25:20 2008"/>
<label align="0.0" string="2. %%a ,%%A ==> Fri, Friday"/>
<newline/>
<label align="0.0" string="3. %%x ,%%X ==> 12/05/08, 18:25:20"/>
<label align="0.0" string="4. %%b, %%B ==> Dec, December"/>
<newline/>
<label align="0.0" string="5. %%y, %%Y ==> 08, 2008"/>
<label align="0.0" string="6. %%d, %%m ==> 05, 12"/>
<newline/>
<label align="0.0" string="7. %%H:%%M:%%S ==> 18:25:20"/>
<label align="0.0" string="8. %%I:%%M:%%S %%p ==> 06:25:20 PM"/>
<newline/>
<label align="0.0" string="9. %%j ==> 340"/>
<label align="0.0" string="10. %%S ==> 20"/>
<newline/>
<label align="0.0" string="11. %%U or %%W ==> 48 (49th week)"/>
<label align="0.0" string="12. %%w ==> 5 ( Friday is the 6th day)"/>
<newline/>
</group>
</sheet>
</form>
</field>
</record>
@ -107,14 +108,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Languages">
<group>
<filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="code"/>
<field name="iso_code"/>
<field name="direction"/>
</group>
<group>
<filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="code"/>
<field name="iso_code"/>
<field name="direction"/>
</group>
</search>
</field>
</record>

9
openerp/addons/base/res/res_partner.py
View File

@ -132,18 +132,17 @@ class res_partner(osv.osv):
'name': fields.char('Name', size=128, required=True, select=True),
'date': fields.date('Date', select=1),
'title': fields.many2one('res.partner.title','Title'),
'parent_id': fields.many2one('res.partner','Parent Partner'),
'parent_id': fields.many2one('res.partner','Company'),
'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
'ref': fields.char('Reference', size=64, select=1),
'lang': fields.selection(_lang_get, 'Language', help="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."),
'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
'website': fields.char('Website',size=64, help="Website of Partner or Company"),
'comment': fields.text('Notes'),
'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'), # should be removed in version 7, but kept until then for backward compatibility
'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'),
'events': fields.one2many('res.partner.event', 'partner_id', 'Events'),
'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Tags'),
'credit_limit': fields.float(string='Credit Limit'),
'ean13': fields.char('EAN13', size=13),
'active': fields.boolean('Active'),
@ -205,7 +204,7 @@ class res_partner(osv.osv):
if default is None:
default = {}
name = self.read(cr, uid, [id], ['name'], context)[0]['name']
default.update({'name': _('%s (copy)')%(name), 'events':[]})
default.update({'name': _('%s (copy)')%(name)})
return super(res_partner, self).copy(cr, uid, id, default, context)
def onchange_type(self, cr, uid, ids, is_company, context=None):

42
openerp/addons/base/res/res_partner_event.py
View File

@ -1,42 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from osv import osv
from osv import fields
class res_partner_event(osv.osv):
_name = "res.partner.event"
_columns = {
'name': fields.char('Events', size=64, required=True),
'description': fields.text('Description'),
'partner_id': fields.many2one('res.partner', 'Partner', select=True),
'date': fields.datetime('Date', size=16),
'user_id': fields.many2one('res.users', 'User'),
}
_order = 'date desc'
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'user_id': lambda self, cr, uid, context: uid,
}
res_partner_event()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

36
openerp/addons/base/res/res_partner_event_view.xml
View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- <menuitem id="menu_partner_events" name="Events" parent="menu_config_address_book" sequence="7"/>-->
<record id="res_partner_event-wopartner-view_form" model="ir.ui.view">
<field name="name">res.partner.event.form</field>
<field name="model">res.partner.event</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Event Logs">
<separator colspan="4" string="General Description"/>
<field name="name" select="1" string="Name"/>
<field name="date" select="1"/>
<field name="user_id" select="1"/>
<separator colspan="4" string="Description"/>
<field colspan="4" name="description" nolabel="1" widget="text_tag"/>
</form>
</field>
</record>
<record id="res_partner_event-wopartner-view_tree" model="ir.ui.view">
<field name="name">res.partner.event.tree</field>
<field name="model">res.partner.event</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Event Logs">
<field name="date"/>
<field name="name" string="Event"/>
<field name="user_id"/>
</tree>
</field>
</record>
</data>
</openerp>

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

@ -6,225 +6,6 @@
<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 Address
=====================
-->
<record id="view_res_partner_address_filter" model="ir.ui.view">
<field name="name">res.partner.address.select</field>
<field name="model">res.partner.address</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Contact">
<group>
<filter string="Customer" name="customer" icon="terp-personal" domain="[('is_customer_add','=','1')]" />
<filter string="Supplier" name="supplier" icon="terp-personal" domain="[('is_supplier_add','=','1')]" />
<separator orientation="vertical"/>
<field name="partner_id" string="Partner"/>
<field name="name" />
<field name="country_id" />
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by' : 'partner_id'}" />
<filter string="Country" icon="terp-go-home" domain="[]" context="{'group_by' : 'country_id'}" />
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
</group>
</search>
</field>
</record>
<record id="view_partner_address_tree" model="ir.ui.view">
<field name="name">res.partner.address.tree</field>
<field name="model">res.partner.address</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Partner Addresses">
<field name="partner_id"/>
<field name="name"/>
<field name="phone"/>
<field name="email"/>
<field name="zip"/>
<field name="city"/>
<field name="country_id"/>
<field name="type"/>
</tree>
</field>
</record>
<record id="action_partner_addess_tree" model="ir.actions.act_window">
<field name="name">Partner Contacts</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner.address</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_partner_address_tree"/>
</record>
<record id="view_partner_address_form1" model="ir.ui.view">
<field name="name">res.partner.address.form1</field>
<field name="model">res.partner.address</field>
<field name="type">form</field>
<field eval="8" name="priority"/>
<field name="arch" type="xml">
<form string="Address">
<group colspan="4" col="6">
<field name="partner_id" colspan="2"/>
<field name="active"/>
<field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/>
<newline/>
<field name="name"/>
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="function"/>
</group>
<group colspan="2" col="2">
<separator string="Postal Address" colspan="4" col="4"/>
<field name="type"/>
<field name="street"/>
<field name="street2"/>
<field name="zip"/>
<field name="city"/>
<field name="country_id"/>
<field name="state_id"/>
</group>
<group colspan="2" col="2">
<separator string="Communication" colspan="4" col="4"/>
<field name="phone"/>
<field name="fax"/>
<field name="mobile"/>
<field name="email" widget="email"/>
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="contacts_kanban_view">
<field name="name">res.partner.address.kanban</field>
<field name="model">res.partner.address</field>
<field name="type">kanban</field>
<field name="arch" type="xml">
<kanban>
<field name="color"/>
<field name="name"/>
<field name="email"/>
<templates>
<t t-name="kanban-box">
<t t-set="color" t-value="kanban_color(record.color.raw_value || record.name.raw_value)"/>
<div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
<div class="oe_kanban_box oe_kanban_color_border">
<div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_auto_height">
<table class="oe_kanban_table">
<tr>
<td class="oe_kanban_title1" align="left" valign="middle">
<field name="name"/>
</td>
<td valign="top" width="22">
<img t-att-src="kanban_gravatar(record.email.value, 22)" class="oe_kanban_gravatar"/>
</td>
</tr>
</table>
</div>
<div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
<table class="oe_kanban_table">
<tr>
<td valign="top" width="22" align="left">
<img src="/base/static/src/img/kanban_partner.png" width="64" height="64"/>
</td>
<td valign="top" align="left">
<div class="oe_kanban_title2">
<field name="title"/>
<t t-if="record.title.raw_value and record.function.raw_value">,</t>
<field name="function"/>
</div>
<div class="oe_kanban_title3">
<field name="partner_id"/>
<t t-if="record.partner_id.raw_value and record.country_id.raw_value">,</t>
<field name="country_id"/>
</div>
<div class="oe_kanban_title3">
<i><field name="email"/>
<t t-if="record.phone.raw_value and record.email.raw_value">,</t>
<field name="phone"/></i>
</div>
</td>
</tr>
</table>
</div>
<div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
<div class="oe_kanban_left">
<a string="Edit" icon="gtk-edit" type="edit"/>
<a string="Change Color" icon="color-picker" type="color" name="color"/>
<a 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>
</div>
<br class="oe_kanban_clear"/>
</div>
</div>
</div>
</t>
</templates>
</kanban>
</field>
</record>
<record id="action_partner_address_form" model="ir.actions.act_window">
<field name="name">Addresses</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner.address</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,kanban</field>
<field name="context">{"search_default_customer":1}</field>
<field name="search_view_id" ref="view_res_partner_address_filter"/>
<field name="help">Customers (also called Partners in other areas of the system) helps you manage your address book of companies whether they are prospects, customers and/or suppliers. The partner form allows you to track and record all the necessary information to interact with your partners from the company address to their contacts as well as pricelists, and much more. If you installed the CRM, with the history tab, you can track all the interactions with a partner such as opportunities, emails, or sales orders issued.</field>
</record>
<record id="action_partner_address_form_view1" model="ir.actions.act_window.view">
<field eval="10" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_partner_address_tree"/>
<field name="act_window_id" ref="action_partner_address_form"/>
</record>
<record id="action_partner_address_form_view2" model="ir.actions.act_window.view">
<field eval="20" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_partner_address_form1"/>
<field name="act_window_id" ref="action_partner_address_form"/>
</record>
<!--
=========================================
the short form used in the partner form
=========================================
-->
<record id="view_partner_address_form2" model="ir.ui.view">
<field name="name">res.partner.address.form2</field>
<field name="model">res.partner.address</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Contacts">
<field name="name" select="1"/>
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="street"/>
<field name="street2"/>
<field name="type"/>
<field name="function"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
<field name="zip"/>
<field name="city"/>
<newline/>
<field completion="1" name="country_id" select="1"/>
<field name="state_id"/>
<newline/>
<field name="phone"/>
<field name="fax"/>
<newline/>
<field name="mobile"/>
<field name="email" widget="email"/>
</form>
</field>
</record>
<!--
=======================
Partner Titles
@ -236,8 +17,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Partner Titles">
<field name="name" select="1"/>
<field name="shortcut" select="1"/>
<field name="name"/>
<field name="shortcut"/>
</tree>
</field>
</record>
@ -246,10 +27,12 @@
<field name="model">res.partner.title</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Titles">
<field name="name" select="1"/>
<field name="shortcut" select="1"/>
<field name="domain"/>
<form string="Partner Titles" version="7.0">
<group col="4">
<field name="name"/>
<field name="shortcut"/>
<field name="domain"/>
</group>
</form>
</field>
</record>
@ -316,53 +99,76 @@
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partners" validate="0">
<group col="8" colspan="4">
<group col="2">
<field name="photo" widget='image' nolabel="1"/>
</group>
<group colspan="4">
<h2><field name="name" required="1" nolabel="1" colspan="4"/></h2><newline/>
<field name="function" attrs="{'invisible': [('is_company', '=', True)]}"/>
<field name="title" size="0" domain="[('domain', '=', 'contact')]"/>
<field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', True)]}"
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
<form string="Partners" version="7.0">
<sheet>
<field name="photo" widget='image' class="oe_form_avatar oe_right" height="70"/>
<div class="oe_right oe_form_button_box" name="buttons">
</div>
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<label for="name" string="Customer Name"/>
(<field name="is_company" on_change="onchange_type(is_company)" class="oe_form_inline"/> <label for="is_company" string="Is a Company?"/>)
</div>
<h1>
<field name="name"/>
</h1>
<div attrs="{'invisible': [('is_company','=', True)]}">
<label for="parent_id" class="oe_form_readonly_hidden"/>
</div>
<h2 attrs="{'invisible': [('is_company','=', True)]}">
<field name="parent_id"
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
class="oe_form_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>,
</h2>
<div attrs="{'invisible' : [('is_company', '=', True)]}">
<label for="function" class="oe_form_readonly_hidden" />
</div>
<h2 attrs="{'invisible' : [('is_company', '=', True)]}">
<field name="function" class="oe_form_inline" placeholder="Job Position"/>
</h2>
<field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
</div>
<group>
<group>
<label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
<div attrs="{'invisible': [('parent_id','=', False)]}">
<field class="oe_form_inline"
name="type"/>
<label for="use_parent_address"/>
<field name="use_parent_address"
class="oe_form_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>
</div>
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
<field name="website" widget="url" placeholder="www.openerp.com"/>
</group>
<group col="2">
<field name="is_company" on_change="onchange_type(is_company)"/>
<field name="customer"/>
<field name="supplier"/>
<group>
<field name="phone" placeholder="+32.81.81.37.00"/>
<field name="mobile"/>
<field name="fax"/>
<field name="email" widget="email"/>
<field name="title" domain="[('domain', '=', 'contact')]" attrs="{'invisible': [('is_company','=', True)]}"/>
</group>
</group>
<notebook colspan="4">
<page string="General">
<group colspan="2">
<separator string="Address" colspan="4"/>
<field name="type" string="Type" attrs="{'invisible': [('is_company','=', True)]}"/>
<group colspan="2">
<field name="use_parent_address" attrs="{'invisible': [('parent_id', '=', False)]}"
on_change="onchange_address(use_parent_address, parent_id)"/>
</group>
<newline/>
<field name="street" colspan="4"/>
<field name="street2" colspan="4"/>
<field name="zip"/>
<field name="city"/>
<field name="country_id"/>
<field name="state_id"/>
</group>
<group colspan="2">
<separator string="Communication" colspan="4"/>
<field name="phone" colspan="4"/>
<field name="mobile" colspan="4"/>
<field name="fax" colspan="4"/>
<field name="email" widget="email" colspan="4"/>
<field name="website" widget="url" colspan="4"/>
<field name="ref" colspan="4"/>
</group>
<group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
<field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban,list">
<page string="Contacts">
<field name="child_ids" context="{'default_parent_id': active_id}" mode="kanban">
<kanban>
<field name="color"/>
<field name="name"/>
@ -383,7 +189,8 @@
<templates>
<t t-name="kanban-box">
<t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
<div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
<div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
<div class="oe_module_vignette">
<a type="edit">
<img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar oe_kanban_avatar_toto"/>
@ -401,6 +208,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>
@ -412,26 +220,29 @@
</templates>
</kanban>
</field>
</group>
</page>
<page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
<separator string="General Information" colspan="4"/>
<field name="lang" colspan="4"/>
<field name="user_id"/>
<field name="active"/>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
<group>
<group>
<field name="user_id" />
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<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>
<page string="Categories">
<field name="category_id" colspan="4" nolabel="1" widget="many2many_tags"/>
</page>
<page string="Notes">
<field name="comment" colspan="4" nolabel="1"/>
<page string="History" invisible="True"></page>
<page string="Internal Notes">
<field name="comment" placeholder="Internal notes about this customer..."/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@ -443,19 +254,14 @@
<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)]"/>
<field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
<field name="category_id"/>
<field name="user_id"/>
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
<separator orientation="vertical"/>
<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 orientation="vertical"/>
<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="name" select="1"/>
<!--field name="address" select="1"/-->
<!--field name="country" select="1"/-->
<field name="category_id" select="1"/>
<field name="user_id" select="1">
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
</field>
</group>
<newline />
<group expand="0" string="Group By...">
@ -601,8 +407,10 @@
<field name="model">res.payterm</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Payment Term">
<field colspan="4" name="name"/>
<form string="Payment Term" version="7.0">
<group>
<field name="name"/>
</group>
</form>
</field>
</record>
@ -623,12 +431,12 @@
<field name="model">res.partner.category</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Category">
<field name="name" select="1"/>
<field name="active"/>
<field name="parent_id"/>
<separator colspan="4" string="Partners"/>
<field colspan="4" name="partner_ids" nolabel="1"/>
<form string="Partner Category" version="7.0">
<group col="4">
<field name="name"/>
<field name="active"/>
<field name="parent_id"/>
</group>
</form>
</field>
</record>
@ -694,12 +502,6 @@
<menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Partner Categories" sequence="4" parent="menu_config_address_book" groups="base.group_no_one"/>
<act_window domain="[('partner_id', '=', active_id)]" context="{'default_partner_id':active_id}"
id="act_res_partner_event" name="Events"
res_model="res.partner.event"
src_model="res.partner"
/>
</data>
</openerp>

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

@ -1,129 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem name="Requests" id="menu_resquest_ref" parent="base.next_id_4" sequence="1"/>
<record id="res_request_tree-view" model="ir.ui.view">
<field name="name">res.request.tree</field>
<field name="model">res.request</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Requests" colors="blue:state == 'waiting';gray:state == 'closed'">
<field name="create_date"/>
<field name="act_from"/>
<field name="act_to"/>
<field name="name"/>
<field name="priority"/>
<field name="trigger_date"/>
<field name="state"/>
</tree>
</field>
</record>
<record id="res_request-view" model="ir.ui.view">
<field name="name">res.request.form</field>
<field name="model">res.request</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Requests">
<group colspan="4" col="6">
<field name="name" colspan="4"/>
<field name="create_date" string="Request Date"/>
<newline/>
<field name="act_from"/>
<field name="priority"/>
<field name="active"/>
</group>
<notebook colspan="4">
<page string="Request">
<field name="act_to"/>
<field name="trigger_date"/>
<separator colspan="4" string="Description"/>
<newline/>
<field colspan="4" name="body" nolabel="1"/>
<group col="5" colspan="4">
<field name="state"/>
<button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-close"/>
<button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/>
<button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
</group>
</page>
<page string="References">
<field name="ref_partner_id"/>
<field colspan="4" name="ref_doc1"/>
<field colspan="4" name="ref_doc2"/>
</page>
<page string="History">
<field colspan="4" name="history" nolabel="1" widget="one2many_list"/>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="res_request_calendar_view">
<field name="name">Request - Calendar</field>
<field name="model">res.request</field>
<field name="type">calendar</field>
<field name="priority" eval="2"/>
<field name="arch" type="xml">
<calendar string="Requests" date_start="trigger_date" color="act_to">
<field name="name"/>
<field name="act_from"/>
</calendar>
</field>
</record>
<record id="res_request_search_view" model="ir.ui.view">
<field name="name">res.request.search</field>
<field name="model">res.request</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Requests">
<filter string="Current" icon="terp-camera_test" domain="['|',('state','=','draft'),('state','=','active')]"
help="Draft and Active"/>
<separator orientation="vertical"/>
<filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state','=','waiting')]"/>
<separator orientation="vertical"/>
<field name="act_from"/>
<field name="act_to" select="1"/>
<field name="name"/>
<field name="state"/>
<newline/>
<group expand="0" string="Group By" colspan="4">
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
</record>
<record id="res_request_calendar_view" model="ir.ui.view">
<field name="name">res.request.calendar</field>
<field name="model">res.request</field>
<field name="type">calendar</field>
<field name="arch" type="xml">
<calendar string="Requests" date_start="create_date" color="act_to">
<field name="name"/>
<field name="act_to"/>
</calendar>
</field>
</record>
<record id="res_request-act" model="ir.actions.act_window">
<field name="name">Requests</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.request</field>
<field name="view_id" eval="False"/>
<field name="view_mode">tree,form,calendar</field>
<field name="search_view_id" ref="res_request_search_view"/>
<field name="context">{"search_default_act_to":uid}</field>
</record>
<menuitem action="res_request-act" id="menu_res_request_act" parent="menu_resquest_ref" />
<record id="res_request_link-view" model="ir.ui.view">
<field name="name">res.request.link.form</field>
<field name="model">res.request.link</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Request Link">
<field name="name"/>
<field name="object"/>
<field name="priority"/>
<form string="Request Link" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="object"/>
<field name="priority"/>
</group>
</sheet>
</form>
</field>
</record>
@ -158,38 +48,7 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="res_request_link_search_view"/>
</record>
<menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="menu_resquest_ref" />
<menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_4" />
<record id="res_request_history_tree-view" model="ir.ui.view">
<field name="name">res.request.history.tree</field>
<field name="model">res.request.history</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Request History">
<field name="act_from"/>
<field name="act_to"/>
<field name="date_sent"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="res_request_history_form-view" model="ir.ui.view">
<field name="name">res.request.history.form</field>
<field name="model">res.request.history</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Request History">
<field name="act_from"/>
<field name="act_to"/>
<field name="date_sent"/>
<newline/>
<field colspan="4" name="body"/>
</form>
</field>
</record>
</data>
</openerp>

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

@ -112,6 +112,7 @@ class users(osv.osv):
__admin_ids = {}
_uid_cache = {}
_name = "res.users"
_description = 'Users'
_order = 'name'
WELCOME_MAIL_SUBJECT = u"Welcome to OpenERP"

146
openerp/addons/base/res/res_users_view.xml
View File

@ -7,22 +7,25 @@
<field name="model">res.groups</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Groups">
<field name="category_id" select="1"/>
<field name="name" select="1"/>
<notebook colspan="4">
<form string="Groups" version="7.0">
<sheet>
<group col="4">
<field name="category_id"/>
<field name="name"/>
</group>
<notebook>
<page string="Users">
<field colspan="4" name="users" nolabel="1"/>
<field name="users"/>
</page>
<page string="Inherited">
<label colspan="4" string="Users added to this group are automatically added in the following groups."/>
<field colspan="4" name="implied_ids" nolabel="1"/>
<label string="Users added to this group are automatically added in the following groups."/>
<field name="implied_ids"/>
</page>
<page string="Menus">
<field colspan="4" name="menu_access" nolabel="1"/>
<field name="menu_access"/>
</page>
<page string="Access Rights">
<field colspan="4" name="model_access" nolabel="1">
<field name="model_access">
<tree string="Access Rules" editable="top">
<field name="model_id"/>
<field name="perm_read"/>
@ -31,19 +34,20 @@
<field name="perm_unlink"/>
<field name="name"/>
</tree>
<form string="Access Controls">
<field colspan="4" name="name" select="1"/>
<field name="model_id" select="1"/>
<newline/>
<field name="perm_read"/>
<field name="perm_write"/>
<field name="perm_create"/>
<field name="perm_unlink"/>
<form string="Access Controls" version="7.0">
<group col="4">
<field name="name"/>
<field name="model_id"/>
<field name="perm_read"/>
<field name="perm_write"/>
<field name="perm_create"/>
<field name="perm_unlink"/>
</group>
</form>
</field>
</page>
<page string="Rules">
<field colspan="4" name="rule_groups" nolabel="1">
<field name="rule_groups">
<tree string="Rules">
<field name="name"/>
<field name="model_id"/>
@ -51,9 +55,10 @@
</tree>
</field>
</page><page string="Notes">
<field colspan="4" name="comment" nolabel="1"/>
<field name="comment"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@ -73,55 +78,53 @@
<field name="model">res.users</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Users" layout="manual">
<sheet layout="auto">
<field name="id" invisible="1"/>
<group colspan="4" col="4" class="oe_form_group_label_border">
<field name="id" invisible="1"/>
<field name="name" select="1"/>
<field name="login" select="1"/>
<field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
<field name="active"/>
<form string="Users" version="7.0">
<field name="id" invisible="1"/>
<sheet>
<div class="oe_right">
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_form_avatar"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<h1><field name="name"/></h1>
<label for="company_id" class="oe_form_readonly_hidden"/>
<h2><field name="company_id" context="{'user_preference': 0}"/></h2>
</div>
<group>
<group>
<field name="login"/>
<field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
</group>
<group>
<field name="active"/>
</group>
</group>
<notebook colspan="4">
<page string="User">
<group col="2" colspan="3" width="80%%">
<group col="2" name="preferences" class="oe_form_group_label_border">
<separator string="Preferences" colspan="2"/>
<page string="Preferences">
<group>
<group name="preferences">
<field name="context_lang"/>
<field name="context_tz"/>
<field name="menu_tips"/>
</group>
<group col="1">
<group col="2" groups="base.group_no_one" class="oe_form_group_label_border">
<separator string="Action" colspan="2"/>
<field name="action_id"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
</group>
<group name="default_filters" col="2" class="oe_form_group_label_border">
<separator string="Default Filters" colspan="2"/>
<field name="company_id" required="1" context="{'user_preference': 0}" groups="base.group_multi_company"/>
</group>
<group groups="base.group_no_one">
<field name="action_id"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
</group>
</group>
<group col="1" name="avatar" class="oe_form_group_label_border">
<separator string="Avatar"/>
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)"/>
</group>
<group colspan="4" col="2" class="oe_form_group_label_border">
<separator string="Email Preferences" colspan="2"/>
<group>
<field name="user_email" widget="email"/>
<field name="signature"/>
</group>
</page>
<page string="Access Rights">
<group colspan="4" col="4" class="oe_form_group_label_border">
<field nolabel="1" name="groups_id"/>
<group col="4">
<field name="groups_id"/>
</group>
</page>
<page string="Allowed Companies" groups="base.group_multi_company">
<field colspan="4" nolabel="1" name="company_ids" select="1"/>
<field name="company_ids"/>
</page>
</notebook>
</sheet>
@ -191,34 +194,31 @@
<field name="type">form</field>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<form string="Users" layout="auto">
<div class="oe_form_title" colspan="4">
<field name="name" readonly="1" nolabel="1"/>
(<field name="login" readonly="1" nolabel="1"/>)
<form string="Users" version="7.0">
<sheet>
<div class="oe_right oe_form_avatar">
<field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
</div>
<newline/>
<group col="2" colspan="3">
<group col="2" colspan="2" name="preferences" class="oe_form_group_label_border">
<separator string="Preferences" colspan="2"/>
<field name="context_lang" readonly="0"/>
<field name="context_tz" readonly="0"/>
<field name="menu_tips" readonly="0" groups="base.group_no_one"/>
</group>
<group name="default_filters" colspan="2" col="2" class="oe_form_group_label_border">
<separator string="Default Filters" colspan="2"/>
<div class="oe_form_title">
<h1>
<field name="name" readonly="1" class="oe_form_readonly_hidden"/>
(<field name="login" readonly="1" class="oe_form_readonly_hidden"/>)
</h1>
<label for="company_id" class="oe_form_readonly_hidden"/>
<h2>
<field name="company_id" widget="selection" readonly="0"
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
</group>
</h2>
</div>
<group col="4" string="Preferences">
<field name="context_lang" readonly="0"/>
<field name="context_tz" readonly="0"/>
</group>
<group col="1">
<separator string="Avatar"/>
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" readonly="0"/>
</group>
<group col="2" colspan="4" class="oe_form_group_label_border">
<separator string="Email Preferences" colspan="2"/>
<group string="Email Preferences">
<field name="user_email" widget="email" readonly="0"/>
<field name="signature" readonly="0"/>
</group>
</sheet>
</form>
</field>
</record>

38
openerp/addons/base/res/res_widget_view.xml
View File

@ -16,9 +16,13 @@
<field name="model">res.widget</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Widgets">
<field name="title" colspan="4"/>
<field name="content" colspan="4" nolabel="1"/>
<form string="Widgets" version="7.0">
<sheet>
<group>
<field name="title"/>
<field name="content"/>
</group>
</sheet>
</form>
</field>
</record>
@ -59,10 +63,14 @@
<field name="model">res.widget.user</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User Widgets">
<field name="widget_id"/>
<field name="user_id"/>
<field name="sequence"/>
<form string="User Widgets" version="7.0">
<sheet>
<group col="4">
<field name="widget_id"/>
<field name="user_id"/>
<field name="sequence"/>
</group>
</sheet>
</form>
</field>
</record>
@ -79,15 +87,13 @@
<field name="model">res.widget.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Widget Wizard" col="4">
<field name="widgets_list" colspan="4"/>
<newline/>
<separator string="" colspan="6"/>
<group colspan="6" col="4" >
<button special="cancel" string="Cancel" icon="gtk-cancel" />
<button name="res_widget_add" string="Add" type="object"/>
</group>
</form>
<form string="Widget Wizard" col="4" version="7.0">
<header>
<button name="res_widget_add" string="Add" type="object"/>
<button special="cancel" string="Cancel" icon="gtk-cancel" />
</header>
<field name="widgets_list"/>
</form>
</field>
</record>
<act_window name="Homepage Widgets Management"

28
openerp/addons/base/res/wizard/__init__.py
View File

@ -1,28 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import partner_sms_send
import partner_wizard_massmail
import partner_clear_ids
import partner_wizard_ean_check
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

53
openerp/addons/base/res/wizard/partner_clear_ids.py
View File

@ -1,53 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import netsvc
from osv import fields, osv
class partner_clear_ids(osv.osv_memory):
""" Clear IDs """
_name = "partner.clear.ids"
_description = "Clear IDs"
def clear_ids(self, cr, uid, ids, context):
"""
Clear Ids
@param cr: the current row, from the database cursor.
@param uid: the current user’s ID for security checks.
@param ids: the ID or list of IDs
@param context: A standard dictionary
"""
partner_pool = self.pool.get('res.partner')
active_ids = context and context.get('active_ids', [])
res = {}
for partner in partner_pool.browse(cr, uid, active_ids, context=context):
if active_ids in partner:
res.update({'ref': False})
return res
partner_clear_ids()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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