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

[Stefan Rijnhart (Opener)]

Unmerged revisions

5052. By Stefan Rijnhart (Opener) on 2013-08-17

[FIX] Allow the use of without_company in report address rendering

=== modified file 'openerp/report/report_sxw.py'
--- openerp/report/report_sxw.py	2013-07-18 09:49:43 +0000
+++ openerp/report/report_sxw.py	2013-08-17 21:03:26 +0000
@@ -322,8 +322,8 @@
                 res='%s %s'%(currency_obj.symbol, res)
         return res
 
-    def display_address(self, address_browse_record):
-        return self.pool.get('res.partner')._display_address(self.cr, self.uid, address_browse_record)
+    def display_address(self, address_browse_record, without_company=False):
+        return self.pool.get('res.partner')._display_address(self.cr, self.uid, address_browse_record, without_company=without_company)
 
     def repeatIn(self, lst, name,nodes_parent=False):
         ret_lst = []