[-] BO : fixed bug #PSCFV-6381 - Customer Service mixing groups of shops (Multistore)
[-] Core: Hook actionUpdateQuantity was not called for product without attributes which depends on the physical stock
[-] BO - fixed bug #PSCFV-5549 -
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] BO : fixed quick access for upgrade from 1.4 #PSCFV-6370
[-] FO : fixed reduction display on product page #PSCFV-6308
[-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format
// AdminHomeController, syntax changed
Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development
//update localization for canada
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
// Module upload error message
[-] FO : fixed bug #PSCFV-5635 - Mobile Theme tax displayed
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
// Something was missing in commit ee62ed8d27c0cf545e8064a6dd613296782d4b88
// lower memory usage for SpecificPrice::getProductIdByDate
// DbQuery could now use multiple tables for FROM
[-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled
Merge remote-tracking branch 'upstream/development' into development