Merge lp:~unifield-team/unifield-server/us-1318 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/report/account_balance_sheet.py'
--- bin/addons/account/report/account_balance_sheet.py	2016-04-08 12:37:21 +0000
+++ bin/addons/account/report/account_balance_sheet.py	2016-05-19 08:33:41 +0000
@@ -183,6 +183,7 @@
                                 'cash',
                                 'asset',
                                 'stock',
+                                'receivables',  # added US-1318
                                 )) or False
                 elif  typ == 'liability':
                     # US-227/1, breakdown in liability:
@@ -194,6 +195,7 @@
                             and account.user_type.code in (
                                 'debt',
                                 'equity',
+                                'payables',  # added US-1318
                                 )) or False
                 if register_account:
                     account_dict = {