Merge pull request odoo#728 from odoo-dev/master-wmsstagingmig-jco

Master wmsstagingmig jco

addons/calendar/calendar.py

@@ -762,7 +762,6 @@ def _compute(self, cr, uid, ids, fields, arg, context=None):
                     res[meeting_id][field] = meeting.start_date if meeting.allday else meeting.start_datetime
                 elif field == 'stop':
                     res[meeting_id][field] = meeting.stop_date if meeting.allday else meeting.stop_datetime
-
         return res
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):

addons/stock/product.py

@@ -324,11 +324,6 @@ def _search_product_quantity(self, cr, uid, obj, name, domain, context):
         return res
 
     _columns = {
-        'valuation':fields.selection([('manual_periodic', 'Periodical (manual)'),
-            ('real_time','Real Time (automated)'),], 'Inventory Valuation',
-            help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
-                 "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
-            , required=True),
         'type': fields.selection([('product', 'Stockable Product'), ('consu', 'Consumable'), ('service', 'Service')], 'Product Type', required=True, help="Consumable: Will not imply stock management for this product. \nStockable product: Will imply stock management for this product."),
         'property_stock_procurement': fields.property(
             type='many2one',
@@ -376,7 +371,6 @@ def _search_product_quantity(self, cr, uid, obj, name, domain, context):
 
     _defaults = {
         'sale_delay': 7,
-        'valuation': 'manual_periodic',
     }
 
     def action_view_routes(self, cr, uid, ids, context=None):