z_invoice_line_merge: Update code
Merge branch 'master' of https://github.com/zuher83/z-odoo8-addons