Fix ShipmentWork.contract searcher and Contract's Shipment Work related action

This commit is contained in:
Guillem Barba 2016-08-25 14:49:34 +02:00
parent 5ce2b23984
commit e4031212a0
2 changed files with 5 additions and 9 deletions

View file

@ -47,16 +47,13 @@ class ShipmentWork:
'get_contract', searcher='search_contract')
def get_contract(self, name):
Contract = Pool().get('contract')
if not isinstance(self.origin, Contract):
return None
return (self.origin and self.origin.contract and
self.origin.contract.id or None)
ContractLine = Pool().get('contract.line')
if isinstance(self.origin, ContractLine) and self.origin.contract:
return self.origin.contract.id
@classmethod
def search_contract(cls, name, clause):
print [('origin.contract',) + tuple(clause[1:])]
return [('origin.contract',) + tuple(clause[1:])]
return [('origin.contract',) + tuple(clause[1:] + ['contract.line'])]
@classmethod
def _get_origin(cls):

View file

@ -50,8 +50,7 @@
<record model="ir.action.act_window" id="act_shipment_works">
<field name="name">Shipment Works</field>
<field name="res_model">shipment.work</field>
<field name="domain" eval="[('contract', 'in', Eval('active_ids'),
Eval('active_model'))]" pyson="1"/>
<field name="domain" eval="[('contract', 'in', Eval('active_ids'))]" pyson="1"/>
</record>
<record model="ir.action.keyword" id="act_shipment_works_keyword1">