Camptocamp Addons

Merge lp:~camptocamp/c2c-addons/trunk-fix1032632 into lp:~camptocamp/c2c-addons/trunk-old

  1. trunk-fix1032632
  2. Merge into trunk-old
Proposed by Alexandre Fayolle - camptocamp
Status: Merged
Merge reported by: Nicolas Bessi - Camptocamp
Merged at revision: not available
Proposed branch: lp:~camptocamp/c2c-addons/trunk-fix1032632
Merge into: lp:~camptocamp/c2c-addons/trunk-old
Diff against target: 89 lines (+9/-9)
4 files modified
invoice_webkit/report/account_invoice.mako (+2/-2)
purchase_order_webkit/report/purchase_order.mako (+2/-2)
purchase_order_webkit/report/request_quotation.mako (+2/-2)
sale_order_webkit/report/sale_order.mako (+3/-3)
To merge this branch: bzr merge lp:~camptocamp/c2c-addons/trunk-fix1032632
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Review via email: mp+118107@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

Cool Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'invoice_webkit/report/account_invoice.mako'
2--- invoice_webkit/report/account_invoice.mako 2012-07-24 12:05:41 +0000
3+++ invoice_webkit/report/account_invoice.mako 2012-08-03 14:21:21 +0000
4@@ -132,8 +132,8 @@
5 <% setLang(inv.partner_id.lang) %>
6 <div class="address">
7 <table class="recipient">
8- <tr><td class="name">${inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
9- <tr><td>${inv.address_invoice_id.title.name or ''} ${inv.address_invoice_id.name }</td></tr>
10+ <tr><td class="name">${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
11+ <tr><td>${inv.address_invoice_id.title and inv.address_invoice_id.title.name or ''} ${inv.address_invoice_id.name }</td></tr>
12 <tr><td>${inv.address_invoice_id.street or ''}</td></tr>
13 <tr><td>${inv.address_invoice_id.street2 or ''}</td></tr>
14 <tr><td>${inv.address_invoice_id.zip or ''} ${inv.address_invoice_id.city or ''}</td></tr>
15
16=== modified file 'purchase_order_webkit/report/purchase_order.mako'
17--- purchase_order_webkit/report/purchase_order.mako 2012-05-29 07:06:32 +0000
18+++ purchase_order_webkit/report/purchase_order.mako 2012-08-03 14:21:21 +0000
19@@ -20,7 +20,7 @@
20 <% setLang(purch.partner_id.lang) %>
21 <div class="address">
22 <table class="recipient">
23- <tr><td class="name">${purch.partner_id.title or ''} ${purch.partner_id.name }</td></tr>
24+ <tr><td class="name">${purch.partner_id.title and purch.partner_id.title.name or ''} ${purch.partner_id.name }</td></tr>
25 <tr><td>${purch.partner_address_id.street or ''}</td></tr>
26 <tr><td>${purch.partner_address_id.street2 or ''}</td></tr>
27 <tr><td>${purch.partner_address_id.zip or ''} ${purch.partner_address_id.city or ''}</td></tr>
28@@ -44,7 +44,7 @@
29 %if purch.dest_address_id:
30 <table class="shipping">
31 <tr><td class="address_title">${_("Shipping address:")}</td></tr>
32- <tr><td>${purch.partner_id.title or ''} ${purch.partner_id.name }</td></tr>
33+ <tr><td>${purch.partner_id.title and purch.partner_id.title.name or ''} ${purch.partner_id.name }</td></tr>
34 <tr><td>${purch.dest_address_id.street or ''}</td></tr>
35 <tr><td>${purch.dest_address_id.street2 or ''}</td></tr>
36 <tr><td>${purch.dest_address_id.zip or ''} ${purch.dest_address_id.city or ''}</td></tr>
37
38=== modified file 'purchase_order_webkit/report/request_quotation.mako'
39--- purchase_order_webkit/report/request_quotation.mako 2011-12-20 11:28:09 +0000
40+++ purchase_order_webkit/report/request_quotation.mako 2012-08-03 14:21:21 +0000
41@@ -16,7 +16,7 @@
42 <% setLang(purch.partner_id.lang) %>
43 <div class="address">
44 <table class="recipient">
45- <tr><td class="name">${purch.partner_id.title or ''} ${purch.partner_id.name }</td></tr>
46+ <tr><td class="name">${purch.partner_id.title and purch.partner_id.title.name or ''} ${purch.partner_id.name }</td></tr>
47 <tr><td>${purch.partner_address_id.street or ''}</td></tr>
48 <tr><td>${purch.partner_address_id.street2 or ''}</td></tr>
49 <tr><td>${purch.partner_address_id.zip or ''} ${purch.partner_address_id.city or ''}</td></tr>
50@@ -40,7 +40,7 @@
51 <table class="shipping">
52 <tr><td class="address_title">${_("Expected Delivery address:")}</td></tr>
53 %if purch.dest_address_id:
54- <tr><td>${purch.partner_id.title or ''} ${purch.partner_id.name }</td></tr>
55+ <tr><td>${purch.partner_id.title and purch.partner_id.title.name or ''} ${purch.partner_id.name }</td></tr>
56 <tr><td>${purch.dest_address_id.street or ''}</td></tr>
57 <tr><td>${purch.dest_address_id.street2 or ''}</td></tr>
58 <tr><td>${purch.dest_address_id.zip or ''} ${purch.dest_address_id.city or ''}</td></tr>
59
60=== modified file 'sale_order_webkit/report/sale_order.mako'
61--- sale_order_webkit/report/sale_order.mako 2012-07-20 12:15:08 +0000
62+++ sale_order_webkit/report/sale_order.mako 2012-08-03 14:21:21 +0000
63@@ -115,7 +115,7 @@
64 %>
65 <div class="address">
66 <table class="recipient">
67- <tr><td class="name">${order.partner_id.title or ''} ${order.partner_id.name }</td></tr>
68+ <tr><td class="name">${order.partner_id.title and order.partner_id.title.name or ''} ${order.partner_id.name }</td></tr>
69 <tr><td>${order.partner_order_id.street or ''}</td></tr>
70 <tr><td>${order.partner_order_id.street2 or ''}</td></tr>
71 <tr><td>${order.partner_order_id.zip or ''} ${order.partner_order_id.city or ''}</td></tr>
72@@ -141,7 +141,7 @@
73
74 <table class="shipping">
75 <tr><td class="address_title">${_("Shipping address:")}</td></tr>
76- <tr><td >${order.partner_id.title or ''} ${order.partner_id.name }</td></tr>
77+ <tr><td >${order.partner_id.title and order.partner_id.title.name or ''} ${order.partner_id.name }</td></tr>
78 <tr><td>${order.partner_shipping_id.street or ''}</td></tr>
79 <tr><td>${order.partner_shipping_id.street2 or ''}</td></tr>
80 <tr><td>${order.partner_shipping_id.zip or ''} ${order.partner_shipping_id.city or ''}</td></tr>
81@@ -155,7 +155,7 @@
82
83 <table class="invoice">
84 <tr><td class="address_title">${_("Invoice address:")}</td></tr>
85- <tr><td>${order.partner_id.title or ''} ${order.partner_id.name }</td></tr>
86+ <tr><td>${order.partner_id.title and order.partner_id.title.name or ''} ${order.partner_id.name }</td></tr>
87 <tr><td>${order.partner_invoice_id.street or ''}</td></tr>
88 <tr><td>${order.partner_invoice_id.street2 or ''}</td></tr>
89 <tr><td>${order.partner_invoice_id.zip or ''} ${order.partner_invoice_id.city or ''}</td></tr>

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: