Contract management

Merge lp:~agilebg/contract-management/7.0-bug-1280998-elbati into lp:~contract-management-core-editors/contract-management/7.0

  1. 7.0-bug-1280998-elbati
  2. Merge into 7.0
Proposed by Lorenzo Battistini
Status: Merged
Approved by: Guewen Baconnier @ Camptocamp
Approved revision: 9
Merged at revision: 9
Proposed branch: lp:~agilebg/contract-management/7.0-bug-1280998-elbati
Merge into: lp:~contract-management-core-editors/contract-management/7.0
Diff against target: 15 lines (+1/-1)
1 file modified
analytic_hours_block/__openerp__.py (+1/-1)
To merge this branch: bzr merge lp:~agilebg/contract-management/7.0-bug-1280998-elbati
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve
Joao Alfredo Gama Batista code review and tests Approve
Review via email: mp+206666@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Joao Alfredo Gama Batista (joao-gama) wrote :

lgtm.

review: Approve (code review and tests)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM. Thanks!

review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'analytic_hours_block/__openerp__.py'
2--- analytic_hours_block/__openerp__.py 2014-01-08 11:55:30 +0000
3+++ analytic_hours_block/__openerp__.py 2014-02-17 08:34:31 +0000
4@@ -43,10 +43,10 @@
5 "analytic"
6 ],
7 "data": [
8+ "report.xml",
9 "hours_block_view.xml",
10 "hours_block_data.xml",
11 "hours_block_menu.xml",
12- "report.xml",
13 "security/hours_block_security.xml",
14 "security/ir.model.access.csv",
15 ],

Subscribers

People subscribed via source and target branches