Merge lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin into lp://staging/~therp-nl/therp-addons/7.0
Proposed by
Holger Brunn (Therp)
| Status: | Merged |
|---|---|
| Merged at revision: | 109 |
| Proposed branch: | lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin |
| Merge into: | lp://staging/~therp-nl/therp-addons/7.0 |
| Diff against target: |
925 lines (+324/-174) 18 files modified
report_aeroo_ooo_plugin/__openerp__.py (+44/-20) report_aeroo_ooo_plugin/model/__init__.py (+1/-0) report_aeroo_ooo_plugin/model/get_plugin.py (+24/-11) report_aeroo_ooo_plugin/model/instant_aeroo.py (+34/-35) report_aeroo_ooo_plugin/model/ir_filters.py (+49/-0) report_aeroo_ooo_plugin/plugin/META-INF/manifest.xml (+16/-14) report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py (+97/-62) report_aeroo_ooo_plugin/plugin/Paths.xcu (+11/-0) report_aeroo_ooo_plugin/plugin/description.xml (+7/-4) report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser.xdl (+10/-0) report_aeroo_ooo_plugin/plugin/dialogs/FilterChooser_en_US.properties (+1/-0) report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py (+5/-6) report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py (+5/-4) report_aeroo_ooo_plugin/plugin/registry/data/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcu (+1/-1) report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/Addons.xcu (+4/-4) report_aeroo_ooo_plugin/plugin/registry/data/org/openoffice/Office/OptionsDialog.xcu (+5/-5) report_aeroo_ooo_plugin/plugin/registry/schema/org/odoo/report_aeroo_ooo_plugin/OpenERPOptions.xcs (+2/-2) report_aeroo_ooo_plugin/view/get_plugin.xml (+8/-6) |
| To merge this branch: | bzr merge lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stefan Rijnhart (Opener) (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[ADD] port report_
Description of the change
This is a port of report_
Some small things were changed too:
- ids which were colliding with the report designer plugin were changed
- odoo branding
- provide a sample document template
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Very cool