Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
Corrected incorrect lang trans key
Expedition class name was not being translated when creating invoice from it
Fixed incorrect translations in holidays module
Modified traslation keys to reflect expected translation
Fixed typos
Merge pull request #892 from marcosgdf/expedition-translations

Corrected incorrect lang trans key
Merge pull request #891 from marcosgdf/bug-857

Fix: [ bug #857 ] Invoice created from shipment does not have the order ...
Merge pull request #894 from marcosgdf/holidays-translations

Holidays translations
Fix: [bug #856] Mail error if destination user doesn't have an email
Merge pull request #896 from marcosgdf/bug-856

Fix: [bug #856] Mail error if destination user doesn't have an email