Merge lp://staging/~therp-nl/therp-addons/7.0_lp1215430 into lp://staging/~therp-nl/therp-addons/7.0
Proposed by
Ronald Portier (Therp)
| Status: | Merged |
|---|---|
| Merged at revision: | 83 |
| Proposed branch: | lp://staging/~therp-nl/therp-addons/7.0_lp1215430 |
| Merge into: | lp://staging/~therp-nl/therp-addons/7.0 |
| Diff against target: |
25650 lines (+0/-25353) 58 files modified
base_report_creator/__init__.py (+0/-25) base_report_creator/__openerp__.py (+0/-60) base_report_creator/base_report_creator.py (+0/-614) base_report_creator/base_report_creator_demo.xml (+0/-43) base_report_creator/base_report_creator_view.xml (+0/-151) base_report_creator/base_report_creator_wizard.xml (+0/-7) base_report_creator/i18n/ar.po (+0/-521) base_report_creator/i18n/base_report_creator.pot (+0/-511) base_report_creator/i18n/bg.po (+0/-516) base_report_creator/i18n/bs.po (+0/-516) base_report_creator/i18n/ca.po (+0/-530) base_report_creator/i18n/cs.po (+0/-516) base_report_creator/i18n/da.po (+0/-517) base_report_creator/i18n/de.po (+0/-532) base_report_creator/i18n/el.po (+0/-526) base_report_creator/i18n/es.po (+0/-530) base_report_creator/i18n/es_AR.po (+0/-519) base_report_creator/i18n/es_CR.po (+0/-530) base_report_creator/i18n/es_EC.po (+0/-520) base_report_creator/i18n/es_PY.po (+0/-528) base_report_creator/i18n/et.po (+0/-516) base_report_creator/i18n/fa.po (+0/-517) base_report_creator/i18n/fi.po (+0/-522) base_report_creator/i18n/fr.po (+0/-537) base_report_creator/i18n/gl.po (+0/-526) base_report_creator/i18n/hr.po (+0/-520) base_report_creator/i18n/hu.po (+0/-525) base_report_creator/i18n/id.po (+0/-516) base_report_creator/i18n/it.po (+0/-534) base_report_creator/i18n/ko.po (+0/-517) base_report_creator/i18n/lt.po (+0/-516) base_report_creator/i18n/nb.po (+0/-527) base_report_creator/i18n/nl.po (+0/-531) base_report_creator/i18n/nl_BE.po (+0/-517) base_report_creator/i18n/pl.po (+0/-516) base_report_creator/i18n/pt.po (+0/-523) base_report_creator/i18n/pt_BR.po (+0/-530) base_report_creator/i18n/ro.po (+0/-532) base_report_creator/i18n/ru.po (+0/-529) base_report_creator/i18n/sk.po (+0/-517) base_report_creator/i18n/sl.po (+0/-520) base_report_creator/i18n/sq.po (+0/-517) base_report_creator/i18n/sr.po (+0/-528) base_report_creator/i18n/sr@latin.po (+0/-528) base_report_creator/i18n/sv.po (+0/-521) base_report_creator/i18n/tlh.po (+0/-516) base_report_creator/i18n/tr.po (+0/-527) base_report_creator/i18n/uk.po (+0/-516) base_report_creator/i18n/vi.po (+0/-517) base_report_creator/i18n/zh_CN.po (+0/-521) base_report_creator/i18n/zh_HK.po (+0/-517) base_report_creator/i18n/zh_TW.po (+0/-516) base_report_creator/security/ir.model.access.csv (+0/-4) base_report_creator/static/src/js/graph.js (+0/-51) base_report_creator/wizard/__init__.py (+0/-30) base_report_creator/wizard/report_menu_create.py (+0/-84) base_report_creator/wizard/report_menu_create_view.xml (+0/-39) base_report_creator/wizard/wiz_set_filter_fields.py (+0/-221) |
| To merge this branch: | bzr merge lp://staging/~therp-nl/therp-addons/7.0_lp1215430 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Holger Brunn (Therp) | Approve | ||
| Stefan Rijnhart (Opener) (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Resubmit of merge proposal to merge with 7.0 version.
To post a comment you must log in.
Revision history for this message
| Stefan Rijnhart (Opener) (stefan-opener) | # |
review:
Approve
Revision history for this message
| Holger Brunn (Therp) (hbrunn) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
