lp:~camptocamp/openerp-connector-magento/7-htaccess-auth-support-dbl-next-release-gbr

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0-next-release

Sébastien BEAU - http://www.akretion.com: Approve (code review, no test) on 2014-05-02

David BEAL (ak) (community): Approve on 2014-04-11

Diff: 222 lines (+105/-18)

5 files modified

magentoerpconnect/CHANGES.rst (+2/-0)
magentoerpconnect/magento_model.py (+29/-4)
magentoerpconnect/magento_model_view.xml (+21/-7)
magentoerpconnect/product.py (+20/-1)
magentoerpconnect/unit/backend_adapter.py (+33/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

978. By Guewen Baconnier @ Camptocamp on 2014-05-06

merge from next-release branch

977. By Guewen Baconnier @ Camptocamp on 2014-04-04

add release note

976. By Guewen Baconnier @ Camptocamp on 2014-04-04

Use the MagentoLocation instance to store the informations about the Magento connection. This object is also responsible to build the complete location.

Rename display_auth_basic to use_auth_basic, because if it is not checked and the username and password are filled, they should not be used

975. By Guewen Baconnier @ Camptocamp on 2014-04-04

do not use \

974. By Guewen Baconnier @ Camptocamp on 2014-04-04

Move the basic auth options in the 'Magento Configuration' section (use a notebook for that), changed a bit some tooltips

973. By Guewen Baconnier @ Camptocamp on 2014-04-04

fix indentation

972. By Guewen Baconnier @ Camptocamp on 2014-04-04

display the custom api path field next to the location, easier to understand that it is related to the location

971. By Guewen Baconnier @ Camptocamp on 2014-04-04

rebase from 7.0-next-release

970. By David BEAL (ak) on 2014-04-03

[FIX] tool tip

969. By David BEAL (ak) on 2014-04-03

[FIX] fields name, tool tip