unifield-wm

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

  1. UF_2192
  2. Merge into trunk
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
1=== modified file 'account_journal/project/project.py'
2--- account_journal/project/project.py 2013-07-01 13:17:41 +0000
3+++ account_journal/project/project.py 2013-11-13 09:42:05 +0000
4@@ -40,16 +40,16 @@
5 ('correction', 'Correction'),
6 ('cur_adj', 'Currency Adjustement'),
7 ('engagement', 'Engagement'),
8- ('extra', 'OD-Extra Accounting'),
9 ('general','General'),
10 ('hq', 'HQ'),
11 ('hr', 'HR'),
12 ('inkind', 'In-kind Donation'),
13 ('intermission', 'Intermission'),
14+ ('migration', 'Migration'),
15+ ('extra', 'OD-Extra Accounting'),
16 ('purchase','Purchase'),
17 ('sale','Sale'),
18 ('situation','Situation'),
19- ('migration', 'Migration'),
20 ]
21
22 _columns = {

Subscribers

People subscribed via source and target branches