[FIX]Fixed the issue of active state does not get highlighted in sale order line, the issue raised due to double state field in the view.
[stock] : Wrong Invoice generated due to product_uos_qty not updated (case ref:600277)
[MERGE] [FIX] stock: correctly recount quantity when split on multiple locations for product reservations (opw 600277)
[MERGE] [FIX] sale: sale.order.line, remove duplicated state field that made the statusbar in the header to be incorrectly rendered (opw 598572)
[FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping
[FIX] stock.picking.in: typo in default_get implementation
[MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
[FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping.
followup of commit mat@openerp.com-20131121151305-t5je12s4w5uctu0k