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

Proposed by jftempo
Status: Merged
Merged at revision: 3756
Proposed branch: lp:~unifield-team/unifield-server/us-1318
Merge into: lp:unifield-server
Diff against target: 19 lines (+2/-0)
1 file modified
bin/addons/account/report/account_balance_sheet.py (+2/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1318
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+295174@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account/report/account_balance_sheet.py'
2--- bin/addons/account/report/account_balance_sheet.py 2016-04-08 12:37:21 +0000
3+++ bin/addons/account/report/account_balance_sheet.py 2016-05-19 08:33:41 +0000
4@@ -183,6 +183,7 @@
5 'cash',
6 'asset',
7 'stock',
8+ 'receivables', # added US-1318
9 )) or False
10 elif typ == 'liability':
11 # US-227/1, breakdown in liability:
12@@ -194,6 +195,7 @@
13 and account.user_type.code in (
14 'debt',
15 'equity',
16+ 'payables', # added US-1318
17 )) or False
18 if register_account:
19 account_dict = {

Subscribers

People subscribed via source and target branches

to all changes: