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

[MERGE]:merged from trunk. 

bzr revid: apa@tinyerp.com-20100831133218-y9la1bqkj5jp4hrh
bzr revid: apa@tinyerp.com-20100901045057-pyt2b5ymls6l2xah
This commit is contained in:
apa-tiny 2010-09-01 10:20:57 +05:30
parent b453709b83 313afc0fe8
commit f0df82db17
12 changed files with 539 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/addons/base/base_update.xml
View File

@ -116,7 +116,11 @@
<page string="User">
<field name="address_id" select="1"/>
<field name="user_email" widget="email"/>
<field name="company_id" required="1" context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
<field name="company_id" required="1"
context="{'user_id': self, 'user_preference': 1}"
on_change="on_change_company_id(company_id)"
groups="base.group_multi_company"
/>
<field name="action_id" required="True"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
<field name="context_lang"/>

4
bin/addons/base/i18n/hr.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-30 07:47+0000\n"
"PO-Revision-Date: 2010-08-31 07:44+0000\n"
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
"Language-Team: openerp-translators\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-31 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-09-01 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"

4
bin/addons/base/i18n/it.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-30 07:41+0000\n"
"PO-Revision-Date: 2010-08-31 07:41+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-31 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-01 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

4
bin/addons/base/i18n/ja.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-30 07:49+0000\n"
"PO-Revision-Date: 2010-08-31 07:33+0000\n"
"Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\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: 2010-08-31 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-01 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

976
bin/addons/base/i18n/mn.po
View File

File diff suppressed because it is too large Load Diff

4
bin/addons/base/i18n/pt_BR.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-30 07:42+0000\n"
"PO-Revision-Date: 2010-08-31 07:27+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: <pt@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: 2010-08-31 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-09-01 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

4
bin/addons/base/i18n/sv.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-30 07:52+0000\n"
"PO-Revision-Date: 2010-08-31 07:30+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-31 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-09-01 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

4
bin/addons/base/i18n/uk.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-30 07:44+0000\n"
"PO-Revision-Date: 2010-08-31 07:37+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2010-08-31 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-09-01 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

18
bin/addons/base/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-30 07:51+0000\n"
"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
"PO-Revision-Date: 2010-09-01 01:27+0000\n"
"Last-Translator: mrshelly <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-31 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-09-01 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@ -199,7 +199,7 @@ msgstr "模块数"
#. module: base
#: field:res.partner.bank.type.field,size:0
msgid "Max. Size"
msgstr ""
msgstr "字段长度"
#. module: base
#: field:res.partner.address,name:0
@ -229,7 +229,7 @@ msgstr "密码不符合！"
#: code:addons/base/module/module.py:0
#, python-format
msgid "This url '%s' must provide an html file with links to zip modules"
msgstr ""
msgstr "这个 URL '%s' 必须提供一个链接到 zip 模块文件的 HTML 页面"
#. module: base
#: selection:res.request,state:0
@ -1232,7 +1232,7 @@ msgstr "提示：这个操作会花费一些时间"
msgid ""
"If set, sequence will only be used in case this python expression matches, "
"and will precede other sequences."
msgstr ""
msgstr "当设置后, 系统会优先使用这个python表达式来做为序号."
#. module: base
#: selection:ir.actions.act_window,view_type:0
@ -2606,7 +2606,7 @@ msgstr "作者"
#. module: base
#: model:res.country,name:base.mk
msgid "FYROM"
msgstr ""
msgstr "马其顿共和国"
#. module: base
#: selection:ir.ui.menu,icon:0
@ -5381,7 +5381,7 @@ msgstr "强制域"
#. module: base
#: help:ir.sequence,weight:0
msgid "If two sequences match, the highest weight will be used."
msgstr ""
msgstr "如果有两种设置, 则采用优先级最高的一个."
#. module: base
#: model:ir.actions.act_window,name:base.action_attachment
@ -6064,7 +6064,7 @@ msgstr "上级"
#. module: base
#: view:multi_company.default:0
msgid "Returning"
msgstr ""
msgstr "所属公司"
#. module: base
#: field:ir.actions.act_window,res_model:0

21
bin/addons/base/res/res_request_view.xml
View File

@ -57,6 +57,18 @@
</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>
@ -65,7 +77,7 @@
<search string="Requests">
<group colspan="4" col="10">
<field name="act_from"/>
<field name="act_to"/>
<field name="act_to" select="1"/>
<field name="name"/>
<field name="state"/>
</group>
@ -81,10 +93,11 @@
<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 id="next_id_12" name="Requests" parent="base.next_id_4"/>
<menuitem action="res_request-act" id="menu_res_request_act" parent="next_id_12" sequence="1"/>
<menuitem action="res_request-act" id="menu_res_request_act" parent="base.next_id_4" sequence="1"/>
<record id="res_request_link-view" model="ir.ui.view">
<field name="name">res.request.link.form</field>
@ -129,7 +142,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="base.next_id_12" sequence="4"/>
<menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_4" sequence="4"/>
<record id="res_request_history_tree-view" model="ir.ui.view">

7
bin/addons/base/res/res_user.py
View File

@ -268,6 +268,13 @@ class users(osv.osv):
}
def on_change_company_id(self, cr, uid, ids, company_id):
return {
'value': {
'warning' : _("Please keep in mind that data currently displayed may not be relevant after switching to another company. If you have unsaved changes, please make sure to save and close the forms before switching to a different company (you can click on Cancel now)"),
}
}
def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
def override_password(o):
if 'password' in o and ( 'id' not in o or o['id'] != uid ):

2
bin/osv/orm.py
View File

@ -1496,7 +1496,7 @@ class orm_template(object):
view = self.fields_view_get(cr, uid, False, 'form', context)
root = etree.fromstring(encode(view['arch']))
res = etree.XML("<search string='%s'></search>" % root.get("string", ""))
res = etree.XML("""<search string="%s"></search>""" % root.get("string", ""))
node = etree.Element("group")
res.append(node)