first round on charge method
charge method done
Merge branch 'invoice_bi'