Added allow_invoice
Merge branch 'customer_groups'