Merge lp:~serpentcs/stock-logistic-report/stock-logistic-report-v7-serpentcs into lp:stock-logistic-report

[Serpent Consulting Services]

[lp:~serpentcs/stock-logistic-report/stock-logistic-report-v7-serpentcs]

5. By Nishant Jogi (Serpent Consulting Services) on 2013-10-08

[MIGRATE] Import statement corrected as per V7.

[Pedro Manuel Baeza (pedro.baeza)]

review: Approve (code review, no test)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve

[Omar (Pexego) (omar7r)]

LGTM

review: Approve (code review)

=== modified file 'stock_picking_webkit/__init__.py'
--- stock_picking_webkit/__init__.py	2013-04-09 14:16:53 +0000
+++ stock_picking_webkit/__init__.py	2013-10-08 11:33:32 +0000
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import report
+from . import report

=== modified file 'stock_picking_webkit/__openerp__.py'
--- stock_picking_webkit/__openerp__.py	2013-04-09 14:16:53 +0000
+++ stock_picking_webkit/__openerp__.py	2013-10-08 11:33:32 +0000
@@ -31,5 +31,5 @@
     'depends': ['base', 'report_webkit', 'base_headers_webkit', 'stock', 'delivery'],
     'data': ['report.xml'],
     'installable': True,
-    'active': False,
+    'auto_install': False,
 }