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

[MERGE] Sync with 7.0 

bzr revid: tde@openerp.com-20130226151604-iwit88917a3fw2ky
This commit is contained in:
Thibault Delavallée 2013-02-26 16:16:04 +01:00
parent 68545cf6ae dafdd4d967
commit e78c6ed511
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm_phonecall_view.xml
View File

@ -152,7 +152,7 @@
name="action_button_convert2opportunity"
states="open,pending"
icon="gtk-index"
type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
type="object" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
</tree>
</field>
</record>

2
addons/product/product.py
View File

@ -554,7 +554,7 @@ class product_product(osv.osv):
'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True),
'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', size=128, store=True, select=True),
'color': fields.integer('Color Index'),
# image: all image fields are base64 encoded and PIL-supported
'image': fields.binary("Image",

9
addons/project_issue/project_issue_view.xml
View File

@ -59,6 +59,8 @@
<sheet string="Issue">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="categ_ids" class="oe_edit_only"/>
<field name="categ_ids" widget="many2many_tags"/>
<group>
<group groups="base.group_user">
<field name="user_id"/>
@ -71,7 +73,7 @@
</div>
</group>
<group>
<field name="categ_ids" widget="many2many_tags"/>
<field name="id"/>
<field name="version_id" groups="base.group_user"/>
<field name="priority" groups="base.group_user"/>
<label for="task_id" groups="base.group_user"/>
@ -94,11 +96,8 @@
<field name="inactivity_days"/>
<field name="days_since_creation"/>
</group>
<group string="References">
<field name="id"/>
<field name="active"/>
</group>
<group string="Status" groups="base.group_no_one">
<field name="active"/>
<field name="state" string="Status"/>
</group>
</page>