Merge branch '8.0' of github.com:odoomrp/odoomrp-wip into 8.0

quality_control_stock/__openerp__.py

@@ -34,6 +34,7 @@
         'stock',
     ],
     "data": [
+        'data/quality_control_stock_data.xml',
         'views/qc_inspection_view.xml',
         'views/stock_picking_view.xml',
         'views/stock_production_lot_view.xml',

quality_control_stock/models/qc_trigger.py

@@ -9,4 +9,4 @@ class QcTrigger(models.Model):
     _inherit = 'qc.trigger'
 
     picking_type = fields.Many2one(
-        comodel_name="stock.picking.type", readonly=True)
+        comodel_name="stock.picking.type", readonly=True)

quality_control_stock/models/stock_picking.py

@@ -47,4 +47,3 @@ class StockPicking(models.Model):
             for test in tests:
                 inspection_model._make_inspection(operation, test)
         return res
-

quality_control_stock/models/stock_picking_type.py

@@ -2,7 +2,7 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from openerp import models, fields, api
+from openerp import models, api
 
 
 class StockPickingType(models.Model):
@@ -38,4 +38,4 @@ class StockPickingType(models.Model):
     def unlink(self):
         self.env['qc.trigger'].sudo().search(
             [('picking_type', '=', self.id)]).unlink()
-        return super(StockPickingType, self).unlink()
+        return super(StockPickingType, self).unlink()