Merge lp:~camptocamp/openerp-rma/7.0-crm_claim_rma-add-picking-buttons into lp:~openerprma/openerp-rma/7.0

Proposed by Yannick Vaucher @ Camptocamp
Status: Merged
Merged at revision: 76
Proposed branch: lp:~camptocamp/openerp-rma/7.0-crm_claim_rma-add-picking-buttons
Merge into: lp:~openerprma/openerp-rma/7.0
Diff against target: 45 lines (+13/-0)
3 files modified
crm_claim_rma/crm_claim_rma.py (+2/-0)
crm_claim_rma/crm_claim_rma_view.xml (+10/-0)
crm_claim_rma/stock_view.xml (+1/-0)
To merge this branch: bzr merge lp:~camptocamp/openerp-rma/7.0-crm_claim_rma-add-picking-buttons
Reviewer Review Type Date Requested Status
Joël Grand-Guillaume @ camptocamp code review, no tests Approve
Leonardo Pistone code review Approve
Benoit Guillot - http://www.akretion.com code review, no tests Approve
Raphaël Valyi - http://www.akretion.com Approve
Review via email: mp+208334@code.launchpad.net

Commit message

Add buttons to access to related pickings from claim

To post a comment you must log in.
Revision history for this message
Raphaël Valyi - http://www.akretion.com (rvalyi) wrote :

LGTM, no tests

review: Approve
Revision history for this message
Benoit Guillot - http://www.akretion.com (benoit-guillot-z) wrote :

LGTM

review: Approve (code review, no tests)
Revision history for this message
Leonardo Pistone (lepistone) wrote :

lgtm thanks

review: Approve (code review)
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM. Thanks !

review: Approve (code review, no tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm_claim_rma/crm_claim_rma.py'
2--- crm_claim_rma/crm_claim_rma.py 2013-12-03 10:38:43 +0000
3+++ crm_claim_rma/crm_claim_rma.py 2014-02-26 11:13:16 +0000
4@@ -343,6 +343,8 @@
5
6 def name_get(self, cr, uid, ids, context=None):
7 res = []
8+ if isinstance(ids, (int, long)):
9+ ids = [ids]
10 for claim in self.browse(cr, uid, ids, context=context):
11 res.append((claim.id, '[' + claim.number + '] ' + claim.name))
12 return res
13
14=== modified file 'crm_claim_rma/crm_claim_rma_view.xml'
15--- crm_claim_rma/crm_claim_rma_view.xml 2013-12-13 12:45:43 +0000
16+++ crm_claim_rma/crm_claim_rma_view.xml 2014-02-26 11:13:16 +0000
17@@ -305,6 +305,16 @@
18 attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['customer','other'])]}"
19 context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
20 />
21+ <button name="%(act_crm_claim_rma_picking_in)d" type="action"
22+ string="Returned Products"
23+ attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['supplier','other'])]}"
24+ context="{'search_default_claim_id': active_id,'search_default_user_id':False}"
25+ />
26+ <button name="%(act_crm_claim_rma_picking_out)d" type="action"
27+ string="Deliveries"
28+ attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['supplier','other'])]}"
29+ context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
30+ />
31 </div>
32 </xpath>
33 </field>
34
35=== modified file 'crm_claim_rma/stock_view.xml'
36--- crm_claim_rma/stock_view.xml 2013-11-14 10:07:54 +0000
37+++ crm_claim_rma/stock_view.xml 2014-02-26 11:13:16 +0000
38@@ -33,6 +33,7 @@
39 <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" position="after">
40 <separator/>
41 <filter string="RMA" icon="terp-accessories-archiver-minus" domain="[('claim_id', '!=', 'False')]" />
42+ <field name="claim_id" string="RMA" invisible="True"/>
43 </filter>
44 </field>
45 </record>

Subscribers

People subscribed via source and target branches