[FIX] holidays, mpr bom open all selected
bzr revid: fp@tinyerp.com-20111230122811-kdv25gd2at2ps33r
This commit is contained in:
parent
6f82675a8a
commit
c113b63b4e
|
@ -236,6 +236,13 @@ class hr_holidays(osv.osv):
|
|||
for id in ids:
|
||||
wf_service.trg_delete(uid, 'hr.holidays', id, cr)
|
||||
wf_service.trg_create(uid, 'hr.holidays', id, cr)
|
||||
to_unlink = []
|
||||
for record in self.browse(cr, uid, ids, context=context):
|
||||
for record2 in record.linked_request_ids:
|
||||
self.set_to_draft(cr, uid, [record2.id], context=context)
|
||||
to_unlink.append(record2.id)
|
||||
if to_unlink:
|
||||
self.unlink(cr, uid, to_unlink, context=context)
|
||||
return True
|
||||
|
||||
def holidays_validate(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
<filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-go-year" name="year" string="Year" domain="[('create_date','>=',time.strftime('%%Y-1-1')),('create_date','<=',time.strftime('%%Y-12-31'))]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Month" icon="terp-go-month" name="This Month" domain="[('date_from','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="employee_id">
|
||||
|
|
|
@ -520,7 +520,7 @@
|
|||
<field name="name">Bill of Materials Structure</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">mrp.bom</field>
|
||||
<field name="domain">[('id','=',active_id)]</field>
|
||||
<field name="domain">[('id','in',active_ids)]</field>
|
||||
<field name="view_type">tree</field>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="mrp_bom_tree_view"/>
|
||||
|
@ -985,7 +985,7 @@
|
|||
<act_window
|
||||
id="action_product_bom_structure"
|
||||
name="Product BoM Structure"
|
||||
domain="[('product_id', '=', active_id),('bom_id','=',False)]"
|
||||
domain="[('product_id', 'in', active_ids),('bom_id','=',False)]"
|
||||
context="{'default_product_id': active_id}"
|
||||
view_type="tree"
|
||||
view_mode="tree"
|
||||
|
|
Loading…
Reference in New Issue