[FIX] issue when we add product which is service with another stockable in SO with invoice on delivery and when after delivery we create invoice service type produc is not  there in invoice line
[IMP] remove call of button_compute method.
[MRG] merge with parent branch
[IMP] revert the code of revision no 9440.
[MRG] merge with parent branch
[MRG] merge with parent branch
Launchpad automatic translations update.
Launchpad automatic translations update.
[MERGE] [FIX] sale_stock: invoice services when invoicing on delivery order
Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
[FIX] mail: mails with attachments containing special chars (such as é) were not delivered properly

get_filename method from email lib returns sometimes decoded value, sometimes still encoded.
for instance, get_filename cannot decode iso encoded filename

Recently, decode method has been applied on filename string, to handle iso encoded file. 
Sadly, one cannot decode already decoded values.
Therefore, decoding already decoded windows or utf-8 encoded filename with special chars failed.
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9728 rev-id: dle@openerp.com-20140102161149-x268xj7bzvvsit2h