From caf09e3709d2ca78650ada9783862e81638c8e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 5 Aug 2016 17:04:36 +0200 Subject: [PATCH] [FIX] various: fix digits_compute attribute changed to digits in new API --- addons/stock/models/product.py | 16 ++++++++-------- addons/stock/models/stock_inventory.py | 4 ++-- addons/stock/models/stock_move.py | 4 ++-- addons/stock/models/stock_pack_operation.py | 6 +++--- addons/stock/models/stock_warehouse.py | 6 +++--- addons/stock/wizard/stock_change_product_qty.py | 2 +- addons/stock/wizard/stock_move_scrap.py | 2 +- addons/stock/wizard/stock_picking_return.py | 2 +- addons/website_sale/models/sale_order.py | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py index 032b526f1f1..cfadaf0c1d3 100644 --- a/addons/stock/models/product.py +++ b/addons/stock/models/product.py @@ -17,7 +17,7 @@ class Product(models.Model): stock_move_ids = fields.One2many('stock.move', 'product_id', help='Technical: used to compute quantities.') qty_available = fields.Float( 'Quantity On Hand', compute='_compute_quantities', search='_search_qty_available', - digits_compute=dp.get_precision('Product Unit of Measure'), + digits=dp.get_precision('Product Unit of Measure'), help="Current quantity of products.\n" "In a context with a single Stock Location, this includes " "goods stored at this Location, or any of its children.\n" @@ -30,7 +30,7 @@ class Product(models.Model): "with 'internal' type.") virtual_available = fields.Float( 'Forecast Quantity', compute='_compute_quantities', search='_search_virtual_available', - digits_compute=dp.get_precision('Product Unit of Measure'), + digits=dp.get_precision('Product Unit of Measure'), help="Forecast quantity (computed as Quantity On Hand " "- Outgoing + Incoming)\n" "In a context with a single Stock Location, this includes " @@ -42,7 +42,7 @@ class Product(models.Model): "with 'internal' type.") incoming_qty = fields.Float( 'Incoming', compute='_compute_quantities', search='_search_incoming_qty', - digits_compute=dp.get_precision('Product Unit of Measure'), + digits=dp.get_precision('Product Unit of Measure'), help="Quantity of products that are planned to arrive.\n" "In a context with a single Stock Location, this includes " "goods arriving to this Location, or any of its children.\n" @@ -53,7 +53,7 @@ class Product(models.Model): "Location with 'internal' type.") outgoing_qty = fields.Float( 'Outgoing', compute='_compute_quantities', search='_search_outgoing_qty', - digits_compute=dp.get_precision('Product Unit of Measure'), + digits=dp.get_precision('Product Unit of Measure'), help="Quantity of products that are planned to leave.\n" "In a context with a single Stock Location, this includes " "goods leaving this Location, or any of its children.\n" @@ -365,16 +365,16 @@ class ProductTemplate(models.Model): description_picking = fields.Text('Description on Picking', translate=True) qty_available = fields.Float( 'Quantity On Hand', compute='_compute_quantities', search='_search_quantities', - digits_compute=dp.get_precision('Product Unit of Measure')) + digits=dp.get_precision('Product Unit of Measure')) virtual_available = fields.Float( 'Forecasted Quantity', compute='_compute_quantities', search='_search_quantities', - digits_compute=dp.get_precision('Product Unit of Measure')) + digits=dp.get_precision('Product Unit of Measure')) incoming_qty = fields.Float( 'Incoming', compute='_compute_quantities', search='_search_quantities', - digits_compute=dp.get_precision('Product Unit of Measure')) + digits=dp.get_precision('Product Unit of Measure')) outgoing_qty = fields.Float( 'Outgoing', compute='_compute_quantities', search='_search_quantities', - digits_compute=dp.get_precision('Product Unit of Measure')) + digits=dp.get_precision('Product Unit of Measure')) location_id = fields.Many2one('stock.location', 'Location') warehouse_id = fields.Many2one('stock.warehouse', 'Warehouse') route_ids = fields.Many2many( diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py index 124ebf3fa2e..6561b0bd1e3 100644 --- a/addons/stock/models/stock_inventory.py +++ b/addons/stock/models/stock_inventory.py @@ -231,7 +231,7 @@ class InventoryLine(models.Model): default=lambda self: self.env.ref('product.product_uom_unit', raise_if_not_found=True)) product_qty = fields.Float( 'Checked Quantity', - digits_compute=dp.get_precision('Product Unit of Measure'), default=0) + digits=dp.get_precision('Product Unit of Measure'), default=0) location_id = fields.Many2one( 'stock.location', 'Location', index=True, required=True) @@ -255,7 +255,7 @@ class InventoryLine(models.Model): 'Status', related='inventory_id.state', readonly=True) theoretical_qty = fields.Float( 'Theoretical Quantity', compute='_compute_theoretical_qty', - digits_compute=dp.get_precision('Product Unit of Measure'), readonly=True, store=True) + digits=dp.get_precision('Product Unit of Measure'), readonly=True, store=True) @api.one @api.depends('location_id', 'product_id', 'package_id', 'product_uom_id', 'company_id', 'prod_lot_id', 'partner_id') diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index 617de2d350e..5c0e4871bc8 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -43,14 +43,14 @@ class StockMove(models.Model): 'product.product', 'Product', domain=[('type', 'in', ['product', 'consu'])], index=True, required=True, states={'done': [('readonly', True)]}) - ordered_qty = fields.Float('Ordered Quantity', digits_compute=dp.get_precision('Product Unit of Measure')) + ordered_qty = fields.Float('Ordered Quantity', digits=dp.get_precision('Product Unit of Measure')) product_qty = fields.Float( 'Quantity', compute='_compute_product_qty', inverse='_set_product_qty', digits=0, store=True, help='Quantity in the default UoM of the product') product_uom_qty = fields.Float( 'Quantity', - digits_compute=dp.get_precision('Product Unit of Measure'), + digits=dp.get_precision('Product Unit of Measure'), default=1.0, required=True, states={'done': [('readonly', True)]}, help="This is the quantity of products from an inventory " "point of view. For moves in the state 'done', this is the " diff --git a/addons/stock/models/stock_pack_operation.py b/addons/stock/models/stock_pack_operation.py index 9051e51d8b0..0848ae263d7 100644 --- a/addons/stock/models/stock_pack_operation.py +++ b/addons/stock/models/stock_pack_operation.py @@ -31,9 +31,9 @@ class PackOperation(models.Model): help='The stock operation where the packing has been made') product_id = fields.Many2one('product.product', 'Product', ondelete="cascade") product_uom_id = fields.Many2one('product.uom', 'Unit of Measure') - product_qty = fields.Float('To Do', default=0.0, digits_compute=dp.get_precision('Product Unit of Measure'), required=True) - ordered_qty = fields.Float('Ordered Quantity', digits_compute=dp.get_precision('Product Unit of Measure')) - qty_done = fields.Float('Done', default=0.0, digits_compute=dp.get_precision('Product Unit of Measure')) + product_qty = fields.Float('To Do', default=0.0, digits=dp.get_precision('Product Unit of Measure'), required=True) + ordered_qty = fields.Float('Ordered Quantity', digits=dp.get_precision('Product Unit of Measure')) + qty_done = fields.Float('Done', default=0.0, digits=dp.get_precision('Product Unit of Measure')) # TDE FIXME: what what what what ?? is_done = fields.Boolean(compute='_compute_is_done', inverse='_set_is_done', string='Done', oldname='processed_boolean') package_id = fields.Many2one('stock.quant.package', 'Source Package') diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py index ca41e66d85b..46964b1ca11 100644 --- a/addons/stock/models/stock_warehouse.py +++ b/addons/stock/models/stock_warehouse.py @@ -732,15 +732,15 @@ class Orderpoint(models.Model): readonly=True, required=True, default=lambda self: self._context.get('product_uom', False)) product_min_qty = fields.Float( - 'Minimum Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, + 'Minimum Quantity', digits=dp.get_precision('Product Unit of Measure'), required=True, help="When the virtual stock goes below the Min Quantity specified for this field, Odoo generates " "a procurement to bring the forecasted quantity to the Max Quantity.") product_max_qty = fields.Float( - 'Maximum Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, + 'Maximum Quantity', digits=dp.get_precision('Product Unit of Measure'), required=True, help="When the virtual stock goes below the Min Quantity, Odoo generates " "a procurement to bring the forecasted quantity to the Quantity specified as Max Quantity.") qty_multiple = fields.Float( - 'Qty Multiple', digits_compute=dp.get_precision('Product Unit of Measure'), + 'Qty Multiple', digits=dp.get_precision('Product Unit of Measure'), default=1, required=True, help="The procurement quantity will be rounded up to this multiple. If it is 0, the exact quantity will be used.") procurement_ids = fields.One2many('procurement.order', 'orderpoint_id', 'Created Procurements') diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py index 8f29ccabbdd..1dc26554bff 100644 --- a/addons/stock/wizard/stock_change_product_qty.py +++ b/addons/stock/wizard/stock_change_product_qty.py @@ -16,7 +16,7 @@ class ProductChangeQuantity(models.TransientModel): product_variant_count = fields.Integer('Variant Count', related='product_tmpl_id.product_variant_count') new_quantity = fields.Float( 'New Quantity on Hand', default=1, - digits_compute=dp.get_precision('Product Unit of Measure'), required=True, + digits=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.') lot_id = fields.Many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]") location_id = fields.Many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]") diff --git a/addons/stock/wizard/stock_move_scrap.py b/addons/stock/wizard/stock_move_scrap.py index 443889de072..0fce04ba850 100644 --- a/addons/stock/wizard/stock_move_scrap.py +++ b/addons/stock/wizard/stock_move_scrap.py @@ -10,7 +10,7 @@ class ScrapProduct(models.TransientModel): _description = "Scrap Products" product_id = fields.Many2one('product.product', 'Product', required=True) - product_qty = fields.Float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True) + product_qty = fields.Float('Quantity', digits=dp.get_precision('Product Unit of Measure'), required=True) product_uom = fields.Many2one('product.uom', 'Product Unit of Measure', required=True) location_id = fields.Many2one('stock.location', 'Location', required=True) restrict_lot_id = fields.Many2one('stock.production.lot', 'Lot') diff --git a/addons/stock/wizard/stock_picking_return.py b/addons/stock/wizard/stock_picking_return.py index 936c2022f19..23f93e8c339 100644 --- a/addons/stock/wizard/stock_picking_return.py +++ b/addons/stock/wizard/stock_picking_return.py @@ -11,7 +11,7 @@ class ReturnPickingLine(models.TransientModel): _rec_name = 'product_id' product_id = fields.Many2one('product.product', string="Product", required=True) - quantity = fields.Float("Quantity", digits_compute=dp.get_precision('Product Unit of Measure'), required=True) + quantity = fields.Float("Quantity", digits=dp.get_precision('Product Unit of Measure'), required=True) wizard_id = fields.Many2one('stock.return.picking', string="Wizard") move_id = fields.Many2one('stock.move', "Move") diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py index 37835fd8a11..4df83920c48 100644 --- a/addons/website_sale/models/sale_order.py +++ b/addons/website_sale/models/sale_order.py @@ -124,7 +124,7 @@ class SaleOrder(models.Model): class SaleOrderLine(models.Model): _inherit = "sale.order.line" - discounted_price = fields.Float(compute='_compute_discounted_price', digits_compute=dp.get_precision('Product Price')) + discounted_price = fields.Float(compute='_compute_discounted_price', digits=dp.get_precision('Product Price')) @api.depends('price_unit', 'discount') def _compute_discounted_price(self):