Merge lp://staging/~therp-nl/openobject-extension/oerp6.1-stable_lp1071378_magento_category_export into lp://staging/openobject-extension/oerp6.1-stable

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 395
Proposed branch: lp://staging/~therp-nl/openobject-extension/oerp6.1-stable_lp1071378_magento_category_export
Merge into: lp://staging/openobject-extension/oerp6.1-stable
Diff against target: 59 lines (+15/-3)
2 files modified
base_external_referentials/external_osv.py (+9/-1)
base_external_referentials/report.py (+6/-2)
To merge this branch: bzr merge lp://staging/~therp-nl/openobject-extension/oerp6.1-stable_lp1071378_magento_category_export
Reviewer Review Type Date Requested Status
extra-addons-commiter Pending
Review via email: mp+163509@code.staging.launchpad.net

Description of the change

Needed for https://code.launchpad.net/~therp-nl/magentoerpconnect/oerp6.1-stable_lp1071378_magento_category_export

As I wrote on the other branch' merge proposal, I am hoping that the changes base_external_referentials/report.py won't be necessary.

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches