summaryrefslogtreecommitdiff
path: root/addons/mrp
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2015-08-19 08:18:01 +0200
committerThibault Delavallée <tde@openerp.com>2015-08-24 10:46:38 +0200
commitcae29df7d984d20c2cb736498b37bfb42545d67a (patch)
treec96b0921eb5a2e65c204c4efb6f45a8593e62dfb /addons/mrp
parenta94da27d8eacd4aaf2bdf1ce57b531e8d1aeb4a7 (diff)
[CLEAN] product and various: light model / code cleaning
Main changes summarized product - [REM] weight_net field. Weight net is removed from the product model. Indeed a product should be modeled without its possible packaging data. Moreover in the codebase the weight_net field is not really used. - unused import - removed _common.py file holding wrappers for tools (rouding and ceiling), used only once in the codebase purchase - unused imports purchase_requisition - dead code - purchase_requisition: from boolean to selection, because V > M stock - [REM] qty_available2, logic, loc_rack, loc_row, loc_case fields. location_id and warehouse_id moved from the product to the template to ease the configuration. - [ADD] description_picking field stock_account - [REM] date_account field on stock.inventory misc wording (sale_margin, ...), notably Cost Price renamed to Cost.
Diffstat (limited to 'addons/mrp')
-rw-r--r--addons/mrp/mrp.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index de8bd18a3d5..c523523d679 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -10,7 +10,6 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
from openerp.tools import float_compare, float_is_zero
from openerp.tools.translate import _
from openerp import tools, SUPERUSER_ID
-from openerp.addons.product import _common
from openerp.exceptions import UserError, AccessError
@@ -276,7 +275,10 @@ class mrp_bom(osv.osv):
def _factor(factor, product_efficiency, product_rounding):
factor = factor / (product_efficiency or 1.0)
- factor = _common.ceiling(factor, product_rounding)
+ if product_rounding:
+ factor = tools.float_round(factor,
+ precision_rounding=product_rounding,
+ rounding_method='UP')
if factor < product_rounding:
factor = product_rounding
return factor