[MERGE] sales/crm: minor improvements in account_analytic_analysis, crm, event_sale, hr_timesheet_invoice, sale views
bzr revid: tde@openerp.com-20140205160347-nptajwoxfl5ylfa9
This commit is contained in:
commit
1b13217838
|
@ -622,7 +622,7 @@ class account_analytic_account(osv.osv):
|
||||||
|
|
||||||
def onchange_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
|
def onchange_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
|
||||||
if not invoice_on_timesheets:
|
if not invoice_on_timesheets:
|
||||||
return {}
|
return {'value': {'to_invoice': False}}
|
||||||
result = {'value': {'use_timesheets': True}}
|
result = {'value': {'use_timesheets': True}}
|
||||||
try:
|
try:
|
||||||
to_invoice = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
|
to_invoice = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
|
||||||
|
|
|
@ -868,8 +868,8 @@ class crm_lead(format_address, osv.osv):
|
||||||
'res_id': int(opportunity_id),
|
'res_id': int(opportunity_id),
|
||||||
'view_id': False,
|
'view_id': False,
|
||||||
'views': [(form_view or False, 'form'),
|
'views': [(form_view or False, 'form'),
|
||||||
(tree_view or False, 'tree'),
|
(tree_view or False, 'tree'), (False, 'kanban'),
|
||||||
(False, 'calendar'), (False, 'graph')],
|
(False, 'calendar'), (False, 'graph')],
|
||||||
'type': 'ir.actions.act_window',
|
'type': 'ir.actions.act_window',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<field name="model">product.product</field>
|
<field name="model">product.product</field>
|
||||||
<field name="inherit_id" ref="product.product_normal_form_view" />
|
<field name="inherit_id" ref="product.product_normal_form_view" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<div name="options" position="inside">
|
<div name="options" position="after">
|
||||||
<field name="event_ok" on_change="onchange_event_ok(type, event_ok, context)"
|
<field name="event_ok" on_change="onchange_event_ok(type, event_ok, context)"
|
||||||
attrs="{'readonly': [('is_only_child', '=', False)]}"/>
|
attrs="{'readonly': [('is_only_child', '=', False)]}"/>
|
||||||
<label for="event_ok"/>
|
<label for="event_ok"/>
|
||||||
|
|
|
@ -18,10 +18,9 @@
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="/form/sheet" position='before'>
|
<xpath expr="/form/sheet" position='before'>
|
||||||
<header>
|
<header>
|
||||||
<button name="set_pending" string="Pending" type="object" states="open" />
|
<button name="set_pending" string="To Renew" type="object" states="open" />
|
||||||
<button name="set_close" string="Contract Finished" type="object" states="open,pending" />
|
<button name="set_close" string="Close Contract" type="object" states="open,pending" />
|
||||||
<button name="set_open" string="Re-open project" type="object" states="pending,close" />
|
<button name="set_open" string="Set In Progress" type="object" states="pending,close,cancelled,draft" />
|
||||||
<button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
|
|
||||||
<button name="set_cancel" string="Cancel Contract" type="object" states="open,pending"/>
|
<button name="set_cancel" string="Cancel Contract" type="object" states="open,pending"/>
|
||||||
<field name="state" readonly="1" widget="statusbar"
|
<field name="state" readonly="1" widget="statusbar"
|
||||||
statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
|
statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
|
||||||
|
|
|
@ -179,8 +179,8 @@
|
||||||
groups="product.group_uom" options='{"no_open": True}'/>
|
groups="product.group_uom" options='{"no_open": True}'/>
|
||||||
<field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
|
<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="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="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="discount" groups="sale.group_discount_per_so_line"/>
|
||||||
<field name="price_subtotal"/>
|
<field name="price_subtotal"/>
|
||||||
</tree>
|
</tree>
|
||||||
|
|
Loading…
Reference in New Issue