Merge lp:~jan-philipp-fischer/openerp-connector-magento/7.0-strip-html into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0
Proposed by
Jan-Philipp Fischer
Status: | Needs review |
---|---|
Proposed branch: | lp:~jan-philipp-fischer/openerp-connector-magento/7.0-strip-html |
Merge into: | lp:~openerp-connector-core-editors/openerp-connector-magento/7.0 |
Diff against target: |
63 lines (+34/-2) (has conflicts) 2 files modified
magentoerpconnect/product.py (+6/-2) magentoerpconnect/unit/mapper.py (+28/-0) Text conflict in magentoerpconnect/product.py Conflict adding file magentoerpconnect/unit/mapper.py. Moved existing file to magentoerpconnect/unit/mapper.py.moved. |
To merge this branch: | bzr merge lp:~jan-philipp-fischer/openerp-connector-magento/7.0-strip-html |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guewen Baconnier @ Camptocamp | Needs Resubmitting | ||
Jan-Philipp Fischer (community) | Needs Resubmitting | ||
Sébastien BEAU - http://www.akretion.com | Needs Fixing | ||
Review via email: mp+211911@code.launchpad.net |
Description of the change
Strips HTML Tags from description and sale_description.
Addes a general modifier for that.
To post a comment you must log in.
Unmerged revisions
- 966. By Jan-Philipp Fischer
-
Using html2text
- 965. By Jan-Philipp Fischer
-
[FIX] Copyright and pep-8 issues
- 964. By Jan-Philipp Fischer
-
[FIX] Stripping HTML Tags from Description
Hi Jan,
Thanks for the contribution. Can you fix the copyright?
You are the author of the change, be proud of your work ;)
You have some pep-8 issue in the file mapper.py
- miss a blank line before the "class MLStriper" (always 2 blank line before a class)
- miss a blank line before the "def...."
- remove the last blank line at the end of the file.
(Note I use https:/ /github. com/nbessi/ openerp- conventions ;) )
Fix the pep8 issue and it will be ok for me