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

[MERGE] Latest trunk 

bzr revid: vta@openerp.com-20121220135003-4rcofmk0k66n3lsa
This commit is contained in:
vta vta@openerp.com 2012-12-20 14:50:03 +01:00
parent 7bd5ab29b1 e29f0565c9
commit 79f46d675c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,11 @@
<field name="name" class="oe_inline"/>
</h1>
</div>
<div attrs="{'invisible' : [('logo','!=',False)]}" class="oe_view_nocontent oe_clear">
<p class="oe_view_nocontent_create">
Click to set your company logo.
</p>
</div>
<group col="4">
<field name="parent_id" groups="base.group_multi_company"/>
</group>

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

@ -201,6 +201,7 @@
<field name="city"/>
<field name="country_id"/>
<field name="mobile"/>
<field name="fax"/>
<field name="state_id"/>
<templates>
<t t-name="kanban-box">
@ -222,6 +223,9 @@
<div><a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value">
<field name="email"/>
</a></div>
<div t-if="record.phone.raw_value">Phone: <field name="phone"/></div>
<div t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></div>
<div t-if="record.fax.raw_value">Fax: <field name="fax"/></div>
</td>
</tr>
</table>
@ -285,8 +289,7 @@
<field name="arch" type="xml">
<search string="Search Partner">
<field name="name"
filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
string="Partner"/>
filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/>
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
<separator/>
<filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>

2
openerp/tools/config.py
View File

@ -484,7 +484,7 @@ class configmanager(object):
if opt.server_wide_modules:
openerp.conf.server_wide_modules = map(lambda m: m.strip(), opt.server_wide_modules.split(','))
else:
openerp.conf.server_wide_modules = ['web']
openerp.conf.server_wide_modules = ['web','web_kanban']
if complete:
openerp.modules.module.initialize_sys_path()
openerp.modules.loading.open_openerp_namespace()