- Testing view
- Testing conflict
Merge remote-tracking branch 'origin/master' into General
- Bo asset_id o Other Expense Line
Merge remote-tracking branch 'origin/General'

Conflicts:
	src/kderp_general_expense/views/kderp_general_expense_view.xml
- Bo comment out
Them string 'Amount'
Merge remote-tracking branch 'origin/Interface'
Merge remote-tracking branch 'origin/General'
- Cap nhat GE
- Cap nhat Budget View
Merge remote-tracking branch 'origin/Interface' into General
Merge remote-tracking branch 'origin/origin' into General
Merge remote-tracking branch 'origin/General'
Thu commit
Merge remote-tracking branch 'origin/Interface' into General
Merge remote-tracking branch 'origin/Report' into General
Merge remote-tracking branch 'origin/General'
- Commit git setting ignore
Merge remote-tracking branch 'origin/master' into Report