Therp Addons

Merge lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3 into lp://staging/~therp-nl/therp-addons/7.0

  1. 7.0-report_aeroo_ooo_plugin_python3
  2. Merge into 7.0
Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 110
Proposed branch: lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3
Merge into: lp://staging/~therp-nl/therp-addons/7.0
Prerequisite: lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_save_addressee
Diff against target: 381 lines (+82/-54)
9 files modified
report_aeroo_ooo_plugin/__openerp__.py (+2/-2)
report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py (+5/-3)
report_aeroo_ooo_plugin/plugin/description.xml (+1/-1)
report_aeroo_ooo_plugin/plugin/pythonpath/FileUtils.py (+7/-4)
report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py (+24/-20)
report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py (+1/-1)
report_aeroo_ooo_plugin/plugin/pythonpath/TinySocket.py (+38/-19)
report_aeroo_ooo_plugin_save_addressee/model/aeroo_mailmerge.py (+2/-2)
report_aeroo_ooo_plugin_save_addressee/view/aeroo_mailmerge.xml (+2/-2)
To merge this branch: bzr merge lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) (community) Approve
Review via email: mp+228870@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3 updated
124. By Holger Brunn (Therp)

[FIX] report_aeroo_ooo_plugin: remove debug statement

Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Great, tnx!

review: Approve
lp://staging/~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3 updated
125. By Holger Brunn (Therp)

[FIX] name_get returns a list, not a dictionary

126. By Holger Brunn (Therp)

[IMP] report_aeroo_ooo_plugin_save_addressee: Also hide delete button in
form view

127. By Holger Brunn (Therp)

[IMP] allow deleting mail merges via the UI

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 all changes: