Merge lp://qastaging/~numerigraphe/openobject-server/5.0-bug516966-wrong-pageCount-pageNumber into lp://qastaging/openobject-server/5.0
Proposed by
Numérigraphe
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~numerigraphe/openobject-server/5.0-bug516966-wrong-pageCount-pageNumber |
| Merge into: | lp://qastaging/openobject-server/5.0 |
| Diff against target: |
100 lines (+34/-8) 1 file modified
bin/report/render/rml2pdf/trml2pdf.py (+34/-8) |
| To merge this branch: | bzr merge lp://qastaging/~numerigraphe/openobject-server/5.0-bug516966-wrong-pageCount-pageNumber |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Core Team | Pending | ||
| Anup(SerpentCS) | Pending | ||
| Xavier ALT | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2010-05-20.
Description of the change
Contributions from Xavier ALT (AJM) and Numérigraphe to fix Bug #516966: report_sxw: wrong pageCount and pageNumber when attachments are not kept.
If this can't make it in 5.0 I personally won't mind if you reject this merge, but please let us know.
Lionel
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Lionel,
I've check with your modifications, all goods for me. Now pageCount is ok with or without the presence of <pageNumberReset/> tag.
Test 1 - 1 Invoice - 1 page
Test 2 - 1 Invoice - 2 pages
Test 3 - 5 Invoice - 1 page for all invoice
Test 4 - 5 Invoice - different number of pages for each invoices
Test 5 - report containing <pageNumberReset/> - different number of pages records