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

merge from trunk

Browse Source 
bzr revid: rco@openerp.com-20111206111115-2oz2cpc41ngkfepx
This commit is contained in:
Raphael Collet
2011-12-06 12:11:15 +01:00
parent 9e1de990fd 1921462ecd
commit 5fdb413021
8 changed files with 148 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/i18n/ar.po
+4 -4
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-11-21 12:13+0000\n"
"PO-Revision-Date: 2011-12-04 16:26+0000\n"
"Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-11-22 05:00+0000\n"
"X-Generator: Launchpad (build 14299)\n"
"X-Launchpad-Export-Date: 2011-12-05 05:21+0000\n"
"X-Generator: Launchpad (build 14418)\n"
#. module: base
#: view:ir.filters:0
@@ -874,7 +874,7 @@ msgstr "حرف"
#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
msgid "Contracts"
msgstr "المتعاقدون"
msgstr "عقود"
#. module: base
#: selection:base.language.install,lang:0
openerp/addons/base/i18n/en_GB.po
+104 -58
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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-09-30 20:48+0000\n"
"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
"PO-Revision-Date: 2011-12-02 12:19+0000\n"
"Last-Translator: John Bradshaw <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@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: 2011-11-04 04:54+0000\n"
"X-Generator: Launchpad (build 14231)\n"
"X-Launchpad-Export-Date: 2011-12-03 05:13+0000\n"
"X-Generator: Launchpad (build 14418)\n"
#. module: base
#: view:ir.filters:0
@@ -6118,7 +6118,7 @@ msgstr "Base"
#. module: base
#: selection:base.language.install,lang:0
msgid "Telugu / తెలుగు"
msgstr ""
msgstr "Telugu / తెలుగు"
#. module: base
#: model:res.country,name:base.lr
@@ -7226,7 +7226,7 @@ msgstr "Customer"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (NI) / Español (NI)"
msgstr ""
msgstr "Spanish (NI) / Español (NI)"
#. module: base
#: field:ir.module.module,shortdesc:0
@@ -7247,7 +7247,7 @@ msgstr "Hour 00->24: %(h24)s"
#. module: base
#: field:ir.cron,nextcall:0
msgid "Next Execution Date"
msgstr ""
msgstr "Next Execution Date"
#. module: base
#: help:multi_company.default,field_id:0
@@ -7311,12 +7311,12 @@ msgstr "Cancel Install"
#. module: base
#: field:ir.model.fields,selection:0
msgid "Selection Options"
msgstr ""
msgstr "Selection Options"
#. module: base
#: field:res.partner.category,parent_right:0
msgid "Right parent"
msgstr ""
msgstr "Right parent"
#. module: base
#: view:res.lang:0
@@ -7334,6 +7334,7 @@ msgstr "Copy Object"
msgid ""
"Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
msgstr ""
"Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
#. module: base
#: model:ir.actions.act_window,name:base.action_country_state
@@ -7388,6 +7389,9 @@ msgid ""
"\n"
"[object with reference: %s - %s]"
msgstr ""
"\n"
"\n"
"[object with reference: %s - %s]"
#. module: base
#: model:ir.model,name:base.model_ir_default
@@ -7427,6 +7431,8 @@ msgid ""
"Changing the type of a column is not yet supported. Please drop it and "
"create it again!"
msgstr ""
"Changing the type of a column is not yet supported. Please drop it and "
"create it again!"
#. module: base
#: field:ir.ui.view_sc,user_id:0
@@ -7458,7 +7464,7 @@ msgstr "Configuration"
#. module: base
#: model:ir.model,name:base.model_publisher_warranty_contract_wizard
msgid "publisher_warranty.contract.wizard"
msgstr ""
msgstr "publisher_warranty.contract.wizard"
#. module: base
#: field:ir.actions.server,expression:0
@@ -7552,7 +7558,7 @@ msgstr "Load an Official Translation"
#. module: base
#: view:res.currency:0
msgid "Miscelleanous"
msgstr ""
msgstr "Miscellaneous"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_10
@@ -7602,7 +7608,7 @@ msgstr ""
#. module: base
#: view:base.language.import:0
msgid "- type,name,res_id,src,value"
msgstr ""
msgstr "- type,name,res_id,src,value"
#. module: base
#: model:res.country,name:base.hm
@@ -7644,6 +7650,8 @@ msgid ""
"You try to install module '%s' that depends on module '%s'.\n"
"But the latter module is not available in your system."
msgstr ""
"You try to install module '%s' that depends on module '%s'.\n"
"But the latter module is not available in your system."
#. module: base
#: view:base.language.import:0
@@ -7753,7 +7761,7 @@ msgstr "undefined get method !"
#. module: base
#: selection:base.language.install,lang:0
msgid "Norwegian Bokmål / Norsk bokmål"
msgstr ""
msgstr "Norwegian Bokmål / Norsk bokmål"
#. module: base
#: help:res.config.users,new_password:0
@@ -7762,6 +7770,8 @@ msgid ""
"Only specify a value if you want to change the user password. This user will "
"have to logout and login again!"
msgstr ""
"Only specify a value if you want to change the user password. This user will "
"have to logout and login again!"
#. module: base
#: model:res.partner.title,name:base.res_partner_title_madam
@@ -7781,7 +7791,7 @@ msgstr "Dashboards"
#. module: base
#: help:ir.attachment,type:0
msgid "Binary File or external URL"
msgstr ""
msgstr "Binary File or external URL"
#. module: base
#: field:res.config.users,new_password:0
@@ -7898,7 +7908,7 @@ msgstr "Croatian / hrvatski jezik"
#. module: base
#: field:base.language.install,overwrite:0
msgid "Overwrite Existing Terms"
msgstr ""
msgstr "Overwrite Existing Terms"
#. module: base
#: help:ir.actions.server,code:0
@@ -7929,7 +7939,7 @@ msgstr "Trigger"
#. module: base
#: model:ir.model,name:base.model_base_module_update
msgid "Update Module"
msgstr ""
msgstr "Update Module"
#. module: base
#: view:ir.model.fields:0
@@ -7960,6 +7970,9 @@ msgid ""
"defining a list of (key, label) pairs. For example: "
"[('blue','Blue'),('yellow','Yellow')]"
msgstr ""
"List of options for a selection field, specified as a Python expression "
"defining a list of (key, label) pairs. For example: "
"[('blue','Blue'),('yellow','Yellow')]"
#. module: base
#: selection:base.language.export,state:0
@@ -7972,6 +7985,8 @@ msgid ""
"Indicates whether this object model lives in memory only, i.e. is not "
"persisted (osv.osv_memory)"
msgstr ""
"Indicates whether this object model lives in memory only, i.e. is not "
"persisted (osv.osv_memory)"
#. module: base
#: field:res.partner,child_ids:0
@@ -8089,6 +8104,8 @@ msgid ""
"Name of the method to be called on the object when this scheduler is "
"executed."
msgstr ""
"Name of the method to be called on the object when this scheduler is "
"executed."
#. module: base
#: code:addons/base/ir/ir_model.py:219
@@ -8097,6 +8114,8 @@ msgid ""
"The Selection Options expression is must be in the [('key','Label'), ...] "
"format!"
msgstr ""
"The Selection Options expression is must be in the [('key','Label'), ...] "
"format!"
#. module: base
#: view:ir.actions.report.xml:0
@@ -8115,6 +8134,8 @@ msgid ""
"--\n"
"%(name)s %(email)s\n"
msgstr ""
"--\n"
"%(name)s %(email)s\n"
#. module: base
#: model:res.country,name:base.eh
@@ -8157,6 +8178,8 @@ msgid ""
"Expression, must be True to match\n"
"use context.get or user (browse)"
msgstr ""
"Expression, must be True to match\n"
"use context.get or user (browse)"
#. module: base
#: model:res.country,name:base.bg
@@ -8222,7 +8245,7 @@ msgstr "Administration"
#. module: base
#: view:base.module.update:0
msgid "Click on Update below to start the process..."
msgstr ""
msgstr "Click on Update below to start the process..."
#. module: base
#: model:res.country,name:base.ir
@@ -8233,12 +8256,12 @@ msgstr "Iran"
#: model:ir.actions.act_window,name:base.res_widget_user_act_window
#: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
msgid "Widgets per User"
msgstr ""
msgstr "Widgets per User"
#. module: base
#: selection:base.language.install,lang:0
msgid "Slovak / Slovenský jazyk"
msgstr ""
msgstr "Slovak / Slovenský jazyk"
#. module: base
#: field:base.language.export,state:0
@@ -8256,7 +8279,7 @@ msgstr "Symbol"
#: help:res.config.users,login:0
#: help:res.users,login:0
msgid "Used to log into the system"
msgstr ""
msgstr "Used to log into the system"
#. module: base
#: view:base.update.translations:0
@@ -8308,13 +8331,13 @@ msgstr "CSV File"
#. module: base
#: field:res.company,account_no:0
msgid "Account No."
msgstr ""
msgstr "Account No."
#. module: base
#: code:addons/base/res/res_lang.py:157
#, python-format
msgid "Base Language 'en_US' can not be deleted !"
msgstr ""
msgstr "Base Language 'en_US' can not be deleted !"
#. module: base
#: selection:ir.model,state:0
@@ -8353,6 +8376,8 @@ msgid ""
"Operation prohibited by access rules, or performed on an already deleted "
"document (Operation: %s, Document type: %s)."
msgstr ""
"Operation prohibited by access rules, or performed on an already deleted "
"document (Operation: %s, Document type: %s)."
#. module: base
#: model:res.country,name:base.zr
@@ -8376,12 +8401,12 @@ msgstr "Information"
#. module: base
#: view:res.widget.user:0
msgid "User Widgets"
msgstr ""
msgstr "User Widgets"
#. module: base
#: view:base.module.update:0
msgid "Update Module List"
msgstr ""
msgstr "Update Module List"
#. module: base
#: selection:res.partner.address,type:0
@@ -8415,7 +8440,7 @@ msgstr "Auto-Refresh"
#: code:addons/base/ir/ir_model.py:62
#, python-format
msgid "The osv_memory field can only be compared with = and != operator."
msgstr ""
msgstr "The osv_memory field can only be compared with = and != operator."
#. module: base
#: selection:ir.ui.view,type:0
@@ -8425,7 +8450,7 @@ msgstr "Diagram"
#. module: base
#: help:multi_company.default,name:0
msgid "Name it to easily find a record"
msgstr ""
msgstr "Name it to easily find a record"
#. module: base
#: model:ir.actions.act_window,name:base.grant_menu_access
@@ -8436,13 +8461,13 @@ msgstr "Menu Items"
#. module: base
#: constraint:ir.rule:0
msgid "Rules are not supported for osv_memory objects !"
msgstr ""
msgstr "Rules are not supported for osv_memory objects !"
#. module: base
#: model:ir.ui.menu,name:base.menu_event_association
#: model:ir.ui.menu,name:base.menu_event_main
msgid "Events Organisation"
msgstr ""
msgstr "Events Organisation"
#. module: base
#: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -8523,7 +8548,7 @@ msgstr "Add or not the coporate RML header"
#. module: base
#: help:workflow.transition,act_to:0
msgid "The destination activity."
msgstr ""
msgstr "The destination activity."
#. module: base
#: view:base.module.update:0
@@ -8549,7 +8574,7 @@ msgstr "Danish / Dansk"
#. module: base
#: selection:ir.model.fields,select_level:0
msgid "Advanced Search (deprecated)"
msgstr ""
msgstr "Advanced Search (deprecated)"
#. module: base
#: model:res.country,name:base.cx
@@ -8583,7 +8608,7 @@ msgstr "Extra Info"
#: model:ir.actions.act_window,name:base.act_values_form_action
#: model:ir.ui.menu,name:base.menu_values_form_action
msgid "Client Events"
msgstr ""
msgstr "Client Events"
#. module: base
#: view:ir.module.module:0
@@ -8604,7 +8629,7 @@ msgstr "You can not have two users with the same login !"
#. module: base
#: model:ir.model,name:base.model_multi_company_default
msgid "Default multi company"
msgstr ""
msgstr "Default multi company"
#. module: base
#: view:res.request:0
@@ -8615,7 +8640,7 @@ msgstr "Send"
#: field:res.config.users,menu_tips:0
#: field:res.users,menu_tips:0
msgid "Menu Tips"
msgstr ""
msgstr "Menu Tips"
#. module: base
#: field:ir.translation,src:0
@@ -8677,7 +8702,7 @@ msgstr "Dominican Republic"
#. module: base
#: selection:base.language.install,lang:0
msgid "Serbian (Cyrillic) / српски"
msgstr ""
msgstr "Serbian (Cyrillic) / српски"
#. module: base
#: code:addons/orm.py:2161
@@ -8686,6 +8711,8 @@ msgid ""
"Invalid group_by specification: \"%s\".\n"
"A group_by specification must be a list of valid fields."
msgstr ""
"Invalid group_by specification: \"%s\".\n"
"A group_by specification must be a list of valid fields."
#. module: base
#: model:res.country,name:base.sa
@@ -8709,13 +8736,13 @@ msgstr "Relation Field"
#. module: base
#: view:res.partner.event:0
msgid "Event Logs"
msgstr ""
msgstr "Event Logs"
#. module: base
#: code:addons/base/module/wizard/base_module_configuration.py:37
#, python-format
msgid "System Configuration done"
msgstr ""
msgstr "System Configuration done"
#. module: base
#: field:workflow.triggers,instance_id:0
@@ -8741,7 +8768,7 @@ msgstr "XML path"
#. module: base
#: selection:ir.actions.todo,restart:0
msgid "On Skip"
msgstr ""
msgstr "On Skip"
#. module: base
#: model:res.country,name:base.gn
@@ -8764,14 +8791,14 @@ msgstr ""
#: code:addons/base/ir/ir_ui_menu.py:285
#, python-format
msgid "Error ! You can not create recursive Menu."
msgstr ""
msgstr "Error ! You can not create recursive Menu."
#. module: base
#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
#: view:publisher_warranty.contract.wizard:0
msgid "Register a Contract"
msgstr ""
msgstr "Register a Contract"
#. module: base
#: view:ir.rule:0
@@ -8779,12 +8806,14 @@ msgid ""
"3. If user belongs to several groups, the results from step 2 are combined "
"with logical OR operator"
msgstr ""
"3. If user belongs to several groups, the results from step 2 are combined "
"with logical OR operator"
#. module: base
#: code:addons/base/publisher_warranty/publisher_warranty.py:145
#, python-format
msgid "Please check your publisher warranty contract name and validity."
msgstr ""
msgstr "Please check your publisher warranty contract name and validity."
#. module: base
#: model:res.country,name:base.sv
@@ -8829,7 +8858,7 @@ msgstr "Leads & Opportunities"
#. module: base
#: selection:base.language.install,lang:0
msgid "Romanian / română"
msgstr ""
msgstr "Romanian / română"
#. module: base
#: view:res.log:0
@@ -8867,7 +8896,7 @@ msgstr "ir.actions.act_window"
#. module: base
#: field:ir.rule,perm_create:0
msgid "Apply For Create"
msgstr ""
msgstr "Apply For Create"
#. module: base
#: model:res.country,name:base.vi
@@ -8893,6 +8922,11 @@ msgid ""
"be assigned to specific groups in order to make them accessible to some "
"users within the system."
msgstr ""
"Manage and customize the items available and displayed in your OpenERP "
"system menu. You can delete an item by clicking on the box at the beginning "
"of each line and then delete it through the button that appears. Items can "
"be assigned to specific groups to make them accessible to some users within "
"the system."
#. module: base
#: field:ir.ui.view,field_parent:0
@@ -8933,7 +8967,7 @@ msgstr "View Auto-Load"
#: code:addons/base/ir/ir_model.py:232
#, python-format
msgid "You cannot remove the field '%s' !"
msgstr ""
msgstr "You cannot remove the field '%s' !"
#. module: base
#: field:ir.exports,resource:0
@@ -8945,23 +8979,23 @@ msgstr "Resource"
#. module: base
#: field:ir.ui.menu,web_icon:0
msgid "Web Icon File"
msgstr ""
msgstr "Web Icon File"
#. module: base
#: selection:base.language.install,lang:0
msgid "Persian / فارس"
msgstr ""
msgstr "Persian / فارس"
#. module: base
#: view:ir.actions.act_window:0
msgid "View Ordering"
msgstr ""
msgstr "View Ordering"
#. module: base
#: code:addons/base/module/wizard/base_module_upgrade.py:95
#, python-format
msgid "Unmet dependency !"
msgstr ""
msgstr "Unmet dependency !"
#. module: base
#: view:base.language.import:0
@@ -8969,6 +9003,8 @@ msgid ""
"Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
"Portable Objects)"
msgstr ""
"Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
"Portable Objects)"
#. module: base
#: code:addons/base/ir/ir_model.py:487
@@ -8977,11 +9013,13 @@ msgid ""
"You can not delete this document (%s) ! Be sure your user belongs to one of "
"these groups: %s."
msgstr ""
"You can not delete this document (%s) ! Be sure your user belongs to one of "
"these groups: %s."
#. module: base
#: model:ir.model,name:base.model_base_module_configuration
msgid "base.module.configuration"
msgstr ""
msgstr "base.module.configuration"
#. module: base
#: field:base.language.export,name:0
@@ -9060,7 +9098,7 @@ msgstr "Publisher Warranty Contract"
#. module: base
#: selection:base.language.install,lang:0
msgid "Bulgarian / български език"
msgstr ""
msgstr "Bulgarian / български език"
#. module: base
#: model:ir.ui.menu,name:base.menu_aftersale
@@ -9145,6 +9183,10 @@ msgid ""
"uncheck the 'Suppliers' filter button in order to search in all your "
"partners, including customers and prospects."
msgstr ""
"You can access all information regarding your suppliers from the supplier "
"form: accounting data, history of emails, meetings, purchases, etc. You can "
"uncheck the 'Suppliers' filter button in order to search in all your "
"partners, including customers and prospects."
#. module: base
#: model:res.country,name:base.rw
@@ -9226,6 +9268,8 @@ msgid ""
"1. Global rules are combined together with a logical AND operator, and with "
"the result of the following steps"
msgstr ""
"1. Global rules are combined together with a logical AND operator, and with "
"the result of the following steps"
#. module: base
#: field:res.partner.category,name:0
@@ -9250,7 +9294,7 @@ msgstr "%X - Appropriate time representation."
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (SV) / Español (SV)"
msgstr ""
msgstr "Spanish (SV) / Español (SV)"
#. module: base
#: help:res.lang,grouping:0
@@ -9284,7 +9328,7 @@ msgstr "Wizard Button"
#. module: base
#: selection:ir.translation,type:0
msgid "Report/Template"
msgstr ""
msgstr "Report/Template"
#. module: base
#: selection:ir.actions.act_window.view,view_mode:0
@@ -9328,7 +9372,7 @@ msgstr "Split Mode"
#. module: base
#: view:base.module.upgrade:0
msgid "Note that this operation might take a few minutes."
msgstr ""
msgstr "Note that this operation might take a few minutes."
#. module: base
#: model:ir.ui.menu,name:base.menu_localisation
@@ -9377,11 +9421,13 @@ msgid ""
"Only one client action will be executed, last client action will be "
"considered in case of multiple client actions."
msgstr ""
"Only one client action will be executed, last client action will be "
"considered in case of multiple client actions."
#. module: base
#: view:res.lang:0
msgid "%j - Day of the year [001,366]."
msgstr ""
msgstr "%j - Day of the year [001,366]."
#. module: base
#: field:ir.actions.server,mobile:0
@@ -9410,7 +9456,7 @@ msgstr "Wizard Field"
#. module: base
#: help:ir.sequence,prefix:0
msgid "Prefix value of the record for the sequence"
msgstr ""
msgstr "Prefix value of the record for the sequence"
#. module: base
#: model:res.country,name:base.sc
@@ -9448,12 +9494,12 @@ msgstr "Account Owner"
#: code:addons/base/res/res_user.py:256
#, python-format
msgid "Company Switch Warning"
msgstr ""
msgstr "Company Switch Warning"
#. module: base
#: model:ir.actions.act_window,name:base.action_res_widget_wizard
msgid "Homepage Widgets Management"
msgstr ""
msgstr "Homepage Widgets Management"
#. module: base
#: field:workflow,osv:0
@@ -9464,7 +9510,7 @@ msgstr "Resource Object"
#. module: base
#: help:ir.sequence,number_increment:0
msgid "The next number of the sequence will be incremented by this number"
msgstr ""
msgstr "The next number of the sequence will be incremented by this number"
#. module: base
#: field:ir.cron,function:0
@@ -9476,7 +9522,7 @@ msgstr "Function"
#. module: base
#: view:res.widget:0
msgid "Search Widget"
msgstr ""
msgstr "Search Widget"
#. module: base
#: selection:ir.actions.todo,restart:0
openerp/addons/base/ir/ir.xml
+2 -1
View File
@@ -1924,7 +1924,8 @@
<field name="view_type">form</field>
<field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field>
</record>
<menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="2"/>
<menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="2"
groups="base.group_extended"/>
<menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
parent="next_id_11" sequence="20"/>
openerp/addons/base/ir/ir_ui_menu.py
-1
View File
@@ -208,7 +208,6 @@ class ir_ui_menu(osv.osv):
'name': 'Menuitem',
'model': self._name,
'value': value,
'object': True,
'key': 'action',
'key2': 'tree_but_open',
'res_id': menu_id,
openerp/addons/base/module/module.py
+1
View File
@@ -215,6 +215,7 @@ class module(osv.osv):
'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta", store=True),
'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
'web': fields.boolean('Has a web component', readonly=True),
'icon': fields.char('Icon URL', size=128),
'complexity': fields.selection([('easy','Easy'), ('normal','Normal'), ('expert','Expert')],
string='Complexity', readonly=True,
help='Level of difficulty of module. Easy: intuitive and easy to use for everyone. Normal: easy to use for business experts. Expert: requires technical skills.'),
openerp/addons/base/module/module_view.xml
+35 -2
View File
@@ -62,12 +62,44 @@
</field>
</record>
<record model="ir.ui.view" id="module_view_kanban">
<field name="name">Modules Kanban</field>
<field name="model">ir.module.module</field>
<field name="type">kanban</field>
<field name="arch" type="xml">
<kanban>
<field name="name"/>
<field name="icon"/>
<field name="complexity"/>
<field name="category_id"/>
<field name="state"/>
<templates>
<t t-name="kanban-box">
<table border="0">
<tr>
<td>
<img src="/web/static/src/img/header-preferences.png"/>
</td><td>
<field name="name"/><br/>
<field name="category_id"/><br/>
<field name="complexity"/><br/>
<field name="state"/>
</td>
</tr>
</table>
</t>
</templates>
</kanban>
</field>
</record>
<record id="action_module_open_categ" model="ir.actions.act_window">
<field name="name">Modules</field>
<field name="res_model">ir.module.module</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form,kanban</field>
<field name="domain">[('category_id','=',active_id)]</field>
</record>
<record id="ir_action_module_category" model="ir.values">
@@ -92,6 +124,7 @@
<field name="category_id"/>
<field name="complexity"/>
<field name="demo" readonly="1"/>
<field name="icon"/>
<notebook colspan="4">
<page string="Module">
<group colspan="4" col="4">
@@ -163,7 +196,7 @@
<field name="name">Modules</field>
<field name="res_model">ir.module.module</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form,kanban</field>
<field name="domain"/>
<field name="search_view_id" ref="view_module_filter"/>
<field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade".</field>
openerp/addons/base/res/res_bank.py
+1 -1
View File
@@ -139,7 +139,7 @@ class res_partner_bank(osv.osv):
'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
change_default=True),
'sequence': fields.integer('Sequence'),
'footer': fields.boolean("Display on Reports")
'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.")
}
_defaults = {
'owner_name': lambda obj, cursor, user, context: obj._default_value(
openerp/addons/base/res/res_country.py
+1 -1
View File
@@ -46,7 +46,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
'The code of the country must be unique !')
]
_defaults = {
'address_format': "%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s",
'address_format': "%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s",
}
def name_search(self, cr, user, name='', args=None, operator='ilike',