Merge lp:~openerp-dev/openobject-server/server-6.0-training-bugfixes into lp:openobject-server/6.0
Status: | Rejected |
---|---|
Rejected by: | Vo Minh Thu |
Proposed branch: | lp:~openerp-dev/openobject-server/server-6.0-training-bugfixes |
Merge into: | lp:openobject-server/6.0 |
Diff against target: |
96 lines (+18/-16) 4 files modified
bin/addons/base/res/res_lang.py (+1/-1) bin/addons/base/rng/view.rng (+1/-0) bin/import_xml.rng (+1/-0) bin/report/render/rml2pdf/trml2pdf.py (+15/-15) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-server/server-6.0-training-bugfixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vo Minh Thu (community) | Disapprove | ||
Review via email: mp+59206@code.launchpad.net |
Description of the change
[FIX] allow inheriting and/or changing style per row inside <blockTable/>
[IMP] Add the link xml attribute in the Relax NG file (used in web client)
[FIX] IndexError for empty 's' parm in res.lang _group() function
Unmerged revisions
- 3415. By Olivier Laurent (Open ERP)
-
[FIX] allow inheriting and/or changing style per row inside <blockTable/>
Normally you can to something like this:
<blockTable ... style="
terp_style_ 1">
<tr ... style="terp_style_ 2">
<td></td>
<td></td>
</tr>
<tr ... style="terp_style_ 2_colspan2" >
<td></td>
</tr>
</blockTable>This is permitted by the system and is implemented, BUT actually the table
style inheriting is using tuple() and this avoid any style modification.The patch simply change tuple() to list() without any futher modification,
to permit a more flexible table style inheriting. (colspan, ...) - 3414. By Olivier Laurent (Open ERP)
-
[IMP] Add the link xml attribute in the Relax NG file
- 3413. By Olivier Laurent (Open ERP)
-
[FIX] IndexError for empty 's' parm in res.lang _group() function
Hi,
The tuple->list conversion seems a bit fragile. Unless there is a compelling reason to do so, this will not be accepted. Anyway, a separate merge proposal would be needed.
The link attribute on the field element is a fragile, unsupported feature. Also, it gives only a false sense of security.
The IndexError will be corrected on its own.
Still, thanks for the merge proposal.