Merge proposals dependent on lp:~jan-philipp-fischer/openerp-connector-magento/7.0-discount-percent

1. 7.0-discount-percent
2. Dependent merge proposals