[merge]lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu-sale_crm_usablity-rma
bzr revid: rmu@tinyerp.com-20130122055733-trgru38pos72rzxy
This commit is contained in:
@@ -872,7 +872,7 @@ class crm_lead(base_stage, format_address, osv.osv):
|
||||
'res_id': int(opportunity_id),
|
||||
'view_id': False,
|
||||
'views': [(form_view or False, 'form'),
|
||||
(tree_view or False, 'tree'),
|
||||
(tree_view or False, 'tree'),(False, 'kanban'),
|
||||
(False, 'calendar'), (False, 'graph')],
|
||||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<field name="model">product.product</field>
|
||||
<field name="inherit_id" ref="product.product_normal_form_view" />
|
||||
<field name="arch" type="xml">
|
||||
<div name="options" position="inside">
|
||||
<div name="options" position="after">
|
||||
<field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
|
||||
<label for="event_ok"/>
|
||||
</div>
|
||||
|
||||
@@ -234,8 +234,8 @@
|
||||
groups="product.group_uom" options='{"no_open": True}'/>
|
||||
<field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
|
||||
<field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
|
||||
<field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/>
|
||||
<field name="price_unit"/>
|
||||
<field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/>
|
||||
<field name="discount" groups="sale.group_discount_per_so_line"/>
|
||||
<field name="price_subtotal"/>
|
||||
</tree>
|
||||
|
||||
Reference in New Issue
Block a user