Merge lp:~unifield-team/unifield-server/qt-us-2292 into lp:unifield-server
Proposed by
Quentin THEURET @Amaris
Status: | Merged |
---|---|
Merged at revision: | 4263 |
Proposed branch: | lp:~unifield-team/unifield-server/qt-us-2292 |
Merge into: | lp:unifield-server |
Diff against target: |
116 lines (+37/-16) 2 files modified
bin/addons/consumption_calculation/consumption_calculation.py (+10/-7) bin/addons/consumption_calculation/history_consumption.py (+27/-9) |
To merge this branch: | bzr merge lp:~unifield-team/unifield-server/qt-us-2292 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeff Allen | Pending | ||
Review via email: mp+318072@code.launchpad.net |
To post a comment you must log in.