Odoo Addons (MOVED TO GITHUB)

Merge lp:~qdp/openobject-addons/5.0-fix-followup into lp:openobject-addons/5.0

  1. 5.0-fix-followup
  2. Merge into 5.0
Proposed by qdp (OpenERP)
Status: Rejected
Rejected by: Jay Vora (Serpent Consulting Services)
Proposed branch: lp:~qdp/openobject-addons/5.0-fix-followup
Merge into: lp:openobject-addons/5.0
Diff against target: 41 lines (+8/-8)
2 files modified
account_followup/report/rappel.rml (+7/-7)
account_followup/report/report_followup_print.py (+1/-1)
To merge this branch: bzr merge lp:~qdp/openobject-addons/5.0-fix-followup
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Approve
Review via email: mp+28617@code.launchpad.net

Description of the change

account_followup fix (crash when no address is defined for a partner)

To post a comment you must log in.
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

Hi,

The .sxw file would be a good way to commit the fix.
And,

[[ 'name' in a and a['name'] or '' ]] can well be replaced by:[[ a.get('name','') ]]

Thanks.

review: Needs Fixing
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

I meant, Attach the improved .sxw!

Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

Fix Landed by revision 2876 <email address hidden> authored to Quentin.
Had to reject the branch as this branch is not current-stable compatible.
Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_followup/report/rappel.rml'
2--- account_followup/report/rappel.rml 2009-02-12 07:22:02 +0000
3+++ account_followup/report/rappel.rml 2010-06-28 10:08:34 +0000
4@@ -93,17 +93,17 @@
5 <para style="terp_default_8">[[ repeatIn(ids_to_objects(data['form']['partner_ids']),'o') ]] </para>
6 <para style="terp_default_8">[[ setLang(o.lang) ]]</para>
7 <blockTable colWidths="286.0,224.0" style="Tableau2">
8- <tr>
9+ <tr>[[ repeatIn(adr_get(o,'invoice'),'a' )]]
10 <td>
11- <para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
12+ <para style="terp_default_9"></para>
13 </td>
14 <td>
15 <para style="terp_default_9">[[ o.name ]]</para>
16- <para style="terp_default_9">[[ a['name'] ]]</para>
17- <para style="terp_default_9">[[ a['street'] ]]</para>
18- <para style="terp_default_9">[[ a['zip'] ]] </para>
19- <para style="terp_default_9">[[ a['city'] ]]</para>
20- <para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
21+ <para style="terp_default_9">[[ 'name' in a and a['name'] or '' ]]</para>
22+ <para style="terp_default_9">[[ 'street' in a and a['street'] or '' ]]</para>
23+ <para style="terp_default_9">[[ 'zip' in a and a['zip'] or '' ]] </para>
24+ <para style="terp_default_9">[[ 'city' in a and a['city'] or '' ]]</para>
25+ <para style="terp_default_9">[[ 'country_id' in a and ( a['country_id'] and a['country_id'][1]) or '']]</para>
26 <para style="terp_default_9">
27 <font color="white"> </font>
28 </para>
29
30=== modified file 'account_followup/report/report_followup_print.py'
31--- account_followup/report/report_followup_print.py 2009-10-09 11:49:00 +0000
32+++ account_followup/report/report_followup_print.py 2010-06-28 10:08:34 +0000
33@@ -50,7 +50,7 @@
34 res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
35 res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
36 adr = res_partner.address_get(self.cr, self.uid, [partner.id], [type])[type]
37- return adr and res_partner_address.read(self.cr, self.uid, [adr]) or False
38+ return adr and res_partner_address.read(self.cr, self.uid, [adr]) or [{}]
39
40 def _lines_get(self, partner):
41 moveline_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')