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
=== modified file 'crm_claim_rma/crm_claim_rma.py'
--- crm_claim_rma/crm_claim_rma.py 2013-12-03 10:38:43 +0000
+++ crm_claim_rma/crm_claim_rma.py 2014-02-26 11:13:16 +0000
@@ -343,6 +343,8 @@
343343
344 def name_get(self, cr, uid, ids, context=None):344 def name_get(self, cr, uid, ids, context=None):
345 res = []345 res = []
346 if isinstance(ids, (int, long)):
347 ids = [ids]
346 for claim in self.browse(cr, uid, ids, context=context):348 for claim in self.browse(cr, uid, ids, context=context):
347 res.append((claim.id, '[' + claim.number + '] ' + claim.name))349 res.append((claim.id, '[' + claim.number + '] ' + claim.name))
348 return res350 return res
349351
=== modified file 'crm_claim_rma/crm_claim_rma_view.xml'
--- crm_claim_rma/crm_claim_rma_view.xml 2013-12-13 12:45:43 +0000
+++ crm_claim_rma/crm_claim_rma_view.xml 2014-02-26 11:13:16 +0000
@@ -305,6 +305,16 @@
305 attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['customer','other'])]}"305 attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['customer','other'])]}"
306 context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"306 context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
307 />307 />
308 <button name="%(act_crm_claim_rma_picking_in)d" type="action"
309 string="Returned Products"
310 attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['supplier','other'])]}"
311 context="{'search_default_claim_id': active_id,'search_default_user_id':False}"
312 />
313 <button name="%(act_crm_claim_rma_picking_out)d" type="action"
314 string="Deliveries"
315 attrs="{'invisible': ['|',('partner_id','=', False),('claim_type','in', ['supplier','other'])]}"
316 context="{'search_default_partner_id': [partner_id],'search_default_user_id':False}"
317 />
308 </div>318 </div>
309 </xpath>319 </xpath>
310 </field>320 </field>
311321
=== modified file 'crm_claim_rma/stock_view.xml'
--- crm_claim_rma/stock_view.xml 2013-11-14 10:07:54 +0000
+++ crm_claim_rma/stock_view.xml 2014-02-26 11:13:16 +0000
@@ -33,6 +33,7 @@
33 <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" position="after">33 <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" position="after">
34 <separator/>34 <separator/>
35 <filter string="RMA" icon="terp-accessories-archiver-minus" domain="[('claim_id', '!=', 'False')]" />35 <filter string="RMA" icon="terp-accessories-archiver-minus" domain="[('claim_id', '!=', 'False')]" />
36 <field name="claim_id" string="RMA" invisible="True"/>
36 </filter>37 </filter>
37 </field>38 </field>
38 </record>39 </record>

Subscribers

People subscribed via source and target branches