Merge lp://staging/~therp-nl/ocb-server/6.1_lp1425545_enhanced_flowable_linebreak into lp://staging/ocb-server/6.1

Proposed by Ronald Portier (Therp)
Status: Needs review
Proposed branch: lp://staging/~therp-nl/ocb-server/6.1_lp1425545_enhanced_flowable_linebreak
Merge into: lp://staging/ocb-server/6.1
Diff against target: 35 lines (+6/-12)
1 file modified
openerp/report/render/rml2pdf/trml2pdf.py (+6/-12)
To merge this branch: bzr merge lp://staging/~therp-nl/ocb-server/6.1_lp1425545_enhanced_flowable_linebreak
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) Needs Information
Review via email: mp+250950@code.staging.launchpad.net

Description of the change

Backport report rendering improvement from 7.0

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

This change looks like a proper backport of the upstream change in https://github.com/OCA/OCB/commit/25f5329deb4068ac737bf7ffdfe54046a46221da + https://github.com/OCA/OCB/commit/c62a75a5f3eb08f5fefe69706858a438361cb73d, except that it undoes the OCB-specific change in http://bazaar.launchpad.net/~ocb/ocb-server/6.1/revision/4324. Is this intentional, i.e. is the fix from rev. 4324 included in the upstream change?

review: Needs Information

Unmerged revisions

4332. By Ronald Portier (Therp)

[FIX] Backport odoo/oca 7.0 rendering fix.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: