Merge lp:~unifield-team/unifield-wm/UF_2192 into lp:unifield-wm

Proposed by jftempo
Status: Merged
Merged at revision: 1849
Proposed branch: lp:~unifield-team/unifield-wm/UF_2192
Merge into: lp:unifield-wm
Diff against target: 22 lines (+2/-2)
1 file modified
account_journal/project/project.py (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/UF_2192
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+195015@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
=== modified file 'account_journal/project/project.py'
--- account_journal/project/project.py 2013-07-01 13:17:41 +0000
+++ account_journal/project/project.py 2013-11-13 09:42:05 +0000
@@ -40,16 +40,16 @@
40 ('correction', 'Correction'),40 ('correction', 'Correction'),
41 ('cur_adj', 'Currency Adjustement'),41 ('cur_adj', 'Currency Adjustement'),
42 ('engagement', 'Engagement'),42 ('engagement', 'Engagement'),
43 ('extra', 'OD-Extra Accounting'),
44 ('general','General'),43 ('general','General'),
45 ('hq', 'HQ'),44 ('hq', 'HQ'),
46 ('hr', 'HR'),45 ('hr', 'HR'),
47 ('inkind', 'In-kind Donation'),46 ('inkind', 'In-kind Donation'),
48 ('intermission', 'Intermission'),47 ('intermission', 'Intermission'),
48 ('migration', 'Migration'),
49 ('extra', 'OD-Extra Accounting'),
49 ('purchase','Purchase'),50 ('purchase','Purchase'),
50 ('sale','Sale'),51 ('sale','Sale'),
51 ('situation','Situation'),52 ('situation','Situation'),
52 ('migration', 'Migration'),
53 ]53 ]
5454
55 _columns = {55 _columns = {

Subscribers

People subscribed via source and target branches