Odoo Addons (MOVED TO GITHUB)

Merge lp:~camptocamp/openobject-addons/6.1-fix1032662 into lp:openobject-addons/6.1

  1. 6.1-fix1032662
  2. Merge into 6.1
Proposed by Alexandre Fayolle - camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-addons/6.1-fix1032662
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
report_webkit_sample/report/report_webkit_html.mako (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/6.1-fix1032662
Reviewer Review Type Date Requested Status
Serpent Consulting Services (community) Approve
Nicolas Bessi - Camptocamp (community) Approve
OpenERP Core Team Pending
Review via email: mp+118115@code.launchpad.net

Description of the change

fix lp:1032662 by using partner_id.title.name instead of partner_id.title

To post a comment you must log in.
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) :
review: Approve
Reply
lp:~camptocamp/openobject-addons/6.1-fix1032662 updated
6933. By Alexandre Fayolle @ camptocamp <email address hidden>

[MRG] from 6.1

Revision history for this message
Serpent Consulting Services (serpent-consulting-services) wrote :

+1

review: Approve
Reply
Revision history for this message
Serpent Consulting Services (serpent-consulting-services) wrote :

A little suggestion and this is what we did here for a customer:

> All the amounts are formatLang-ed. Please do the same line.discount too. Additionally, you may want to do the same for quantity.

Thanks,
Serpent Consulting Services.

Reply
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

> A little suggestion and this is what we did here for a customer:
>
> > All the amounts are formatLang-ed. Please do the same line.discount too.
> Additionally, you may want to do the same for quantity.
>
> Thanks,
> Serpent Consulting Services.

Please report this as a separate wishlist. This merge request is about a problem with the title field.

Reply

Unmerged revisions

6933. By Alexandre Fayolle @ camptocamp <email address hidden>

[MRG] from 6.1

6932. By Alexandre Fayolle @ camptocamp <email address hidden>

[FIX] use partner_id.title.name (closes lp:1032662)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_webkit_sample/report/report_webkit_html.mako'
2--- report_webkit_sample/report/report_webkit_html.mako 2011-01-14 00:11:01 +0000
3+++ report_webkit_sample/report/report_webkit_html.mako 2012-09-12 13:36:45 +0000
4@@ -8,7 +8,7 @@
5 %for inv in objects :
6 <% setLang(inv.partner_id.lang) %>
7 <table class="dest_address">
8- <tr><td ><b>${inv.partner_id.title or ''|entity} ${inv.partner_id.name |entity}</b></td></tr>
9+ <tr><td ><b>${inv.partner_id.title and inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity}</b></td></tr>
10 <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
11 <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
12 <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>