OpenERP Swiss Localization

Merge lp:~camptocamp/openerp-swiss-localization/7.0-fix-1197798 into lp:~camptocamp/openerp-swiss-localization/7.0

  1. 7.0-fix-1197798
  2. Merge into 7.0
Proposed by Yannick Vaucher @ Camptocamp
Status: Merged
Merged at revision: 179
Proposed branch: lp:~camptocamp/openerp-swiss-localization/7.0-fix-1197798
Merge into: lp:~camptocamp/openerp-swiss-localization/7.0
Diff against target: 21 lines (+2/-2)
1 file modified
l10n_ch_payment_slip/report/bvr.mako (+2/-2)
To merge this branch: bzr merge lp:~camptocamp/openerp-swiss-localization/7.0-fix-1197798
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Romain Deheele - Camptocamp (community) code review Approve
Review via email: mp+177553@code.launchpad.net

This proposal supersedes a proposal from 2013-07-04.

To post a comment you must log in.
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote : Posted in a previous version of this proposal

Hello,

Thanks for the patch

You forgot to also fix this div:

       <div id="slip_comp" class="slip_comp">
        <table class="slip_add">
            <tr><td>${user.company_id.partner_id.name}</td></tr>
            <tr><td>${user.company_id.partner_id.street}</td></tr>
            <tr><td></td></tr>
            <tr><td>${user.company_id.partner_id.city} ${user.company_id.partner_id.zip}</td></tr>
        </table>
      </div>

Regards

Nicolas

review: Needs Fixing
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote : Posted in a previous version of this proposal

Thanks for the review

Second mixed zip and city is fixed

Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote : Posted in a previous version of this proposal

conflict to resolve -> work in progress

Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

MP resubmitted (I made the 2 changes in one rev this time)

Revision history for this message
Romain Deheele - Camptocamp (romaindeheele) wrote :

LGTM,

Romain

review: Approve (code review)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ch_payment_slip/report/bvr.mako'
2--- l10n_ch_payment_slip/report/bvr.mako 2013-06-14 14:06:54 +0000
3+++ l10n_ch_payment_slip/report/bvr.mako 2013-07-30 10:06:27 +0000
4@@ -238,7 +238,7 @@
5 <tr><td>${user.company_id.partner_id.name}</td></tr>
6 <tr><td>${user.company_id.partner_id.street}</td></tr>
7 <tr><td></td></tr>
8- <tr><td>${user.company_id.partner_id.city} ${user.company_id.partner_id.zip}</td></tr>
9+ <tr><td>${user.company_id.partner_id.zip} ${user.company_id.partner_id.city}</td></tr>
10 </table>
11 </div>
12 %endif
13@@ -267,7 +267,7 @@
14 <tr><td>${user.company_id.partner_id.name}</td></tr>
15 <tr><td>${user.company_id.partner_id.street}</td></tr>
16 <tr><td></td></tr>
17- <tr><td>${user.company_id.partner_id.city} ${user.company_id.partner_id.zip}</td></tr>
18+ <tr><td>${user.company_id.partner_id.zip} ${user.company_id.partner_id.city}</td></tr>
19 </table>
20 </div>
21 %endif

Subscribers

People subscribed via source and target branches

to all changes: