Merge lp:~openerp-dev/openobject-addons/trunk-bug-718722-ron into lp:openobject-addons

Proposed by Rohan Nayani(Open ERP)
Status: Merged
Merged at revision: 4554
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-718722-ron
Merge into: lp:openobject-addons
Diff against target: 15 lines (+2/-1)
1 file modified
mrp/mrp.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-718722-ron
Reviewer Review Type Date Requested Status
Rucha (Open ERP) (community) Approve
OpenERP buildbot (community) Disapprove
qdp (OpenERP) Pending
Review via email: mp+53239@code.launchpad.net
To post a comment you must log in.
Revision history for this message
OpenERP buildbot (openerp-buildbot) wrote :

hr_evaluation/test/test_hr_evaluation.yml: ('warning', 'Warning !')
crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove
Revision history for this message
Rucha (Open ERP) (rpa-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mrp/mrp.py'
2--- mrp/mrp.py 2011-03-11 15:18:19 +0000
3+++ mrp/mrp.py 2011-03-14 13:31:50 +0000
4@@ -386,9 +386,10 @@
5 mrp_bom_revision()
6
7 def rounding(f, r):
8+ import math
9 if not r:
10 return f
11- return round(f / r) * r
12+ return math.ceil(f / r) * r
13
14 class mrp_production(osv.osv):
15 """

Subscribers

People subscribed via source and target branches

to all changes: