OpenERP Community Backports (Server)

Merge lp:~therp-nl/ocb-server/7.0-lp1170373-report_address_without_company into lp:ocb-server

  1. 7.0-lp1170373-report_address_without_company
  2. Merge into 7.0
Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 5086
Proposed branch: lp:~therp-nl/ocb-server/7.0-lp1170373-report_address_without_company
Merge into: lp:ocb-server
Diff against target: 14 lines (+2/-2)
1 file modified
openerp/report/report_sxw.py (+2/-2)
To merge this branch: bzr merge lp:~therp-nl/ocb-server/7.0-lp1170373-report_address_without_company
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+180711@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/report/report_sxw.py'
2--- openerp/report/report_sxw.py 2013-07-18 09:49:43 +0000
3+++ openerp/report/report_sxw.py 2013-08-17 20:48:34 +0000
4@@ -322,8 +322,8 @@
5 res='%s %s'%(currency_obj.symbol, res)
6 return res
7
8- def display_address(self, address_browse_record):
9- return self.pool.get('res.partner')._display_address(self.cr, self.uid, address_browse_record)
10+ def display_address(self, address_browse_record, without_company=False):
11+ return self.pool.get('res.partner')._display_address(self.cr, self.uid, address_browse_record, without_company=without_company)
12
13 def repeatIn(self, lst, name,nodes_parent=False):
14 ret_lst = []

Subscribers

People subscribed via source and target branches

to status/vote changes: