Merge pull request #44 from shalabhaggarwal/develop

Remove extra try excepts
Import order states from magento #1800 fixes #39

Import order states from magento and create a user configurable map of
states between openerp and magento.
Optimal defaults are filled in
Merge pull request #47 from shalabhaggarwal/feature/task-1800

Import order states from magento #1800 fixes #39
Added magento_product_type field to product view #1878

Task ID: project-1735/task-1878
Review ID: 216005
Handle bundle products while importing sales #1877 fixes #46

When sales are imported bundle products need to be handled in a different way.
Create a bom for bundle product along with sale with duplication handling
Merge pull request #48 from prakashpp/feature/task-1878

Added magento_product_type field to product view #1878
Merge pull request #49 from shalabhaggarwal/feature/task-1877

Handle bundle products while importing sales #1877 fixes #46
Add icon image to README
Merge pull request #50 from sharoonthomas/develop

Add icon image to README
Added a text field magento_notes to sale line #1879

Task ID: project-1735/task-1879
Review ID: 222001
Button to import order states #1891

This patch has added button on magento instance to import order states
and an usererror is raised if order states are not found while importing
orders.

Task ID: project-1735/task-1891
Review ID: 227001
Merge pull request #53 from priyankarani/feature/task-1891

Button to import order states #1891
Merge pull request #51 from prakashpp/feature/task-1879

Added a text field magento_notes to sale line #1879
Export product stock information to magento #1876 fixes #45

This patch exports stock information about product for current website
to magento.

Task ID: project-1735/task-1876
Review ID: 215002
Merge pull request #52 from priyankarani/feature/task-1876

Export product stock information to magento #1876
Added default_uom_type field to website #1887

Task ID: project-1735/task-1887
Review ID: 226001
Merge pull request #54 from prakashpp/feature/task-1887

Added default_uom_type field to website #1887
Use magento_notes instead of notes on sale lines #1914

Sale line does not have a notes field. Replace it with the new magento_notes
field
API to import shipping methods from magento to Openerp #1904

This patch will import shipping methods from magento to openerp.

Review ID: 235001
Merge pull request #56 from tarunbhardwaj/feature/task-1904

API to import shipping methods from Magento to Openerp #1904