[-] CORE : FixBug #PSCSX-3523 - Rotate image for correct orientation
// add error message 

when voucher not refound
// Small Fix
// revert from https://github.com/PrestaShop/PrestaShop/commit/55ccd2317c8e3451da15783cfeae4f13e947fcb7
// correct input when check checkbox on total refund
Mergeeeeeeeeeeeeeeeeeeeeeeeeeeeee branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
[-] CORE : Fix #PSCSX-3643 Delivery slip without invoices
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[-] CORE : Fix #PSCFV-11170 add .htaccess in upload dir
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// follow up https://github.com/PrestaShop/PrestaShop/commit/d23e559e777b99f28bfc296e41bd53000272b148
// updated Spanish fixtures translations

Conflicts:
	install-dev/langs/es/data/order_state.xml
// updated French fixtures translations

Conflicts:
	install-dev/langs/fr/data/order_state.xml
[*] BO : Fix Catalog rule for multishop
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// updated Italian fixtures translations

Conflicts:
	install-dev/langs/it/data/order_state.xml
// updated Dutch fixtures translations

Conflicts:
	install-dev/langs/nl/data/order_state.xml
// updated Brazilian fixtures translations

Conflicts:
	install-dev/langs/br/data/order_state.xml
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// typo