Merge lp:~openerp-community/stock-logistic-flows/improve-relative-imports into lp:stock-logistic-flows/6.1

[Niels Huylebroeck]

Minor cleaning of the imports

[Omar (Pexego) (omar7r)]

LGTM

review: Approve (code review no test)

[David BEAL (ak) (davidbeal)]

Good idea to clean code but why not replace

class company(osv.osv):

by

class company(orm.Model):

with this import :

from openerp.osv import fields, orm

thanks

[Pedro Manuel Baeza (pedro.baeza)]

LGTM.

Well, this kind of refactorings are being more focused on v7, but, hey, it's also good for v6.1.

review: Approve (code review, no test)

[Niels Huylebroeck (red15)]

The idea is that I want to keep this merge small enough so everyone can
understand what's going on.

I will try to get around doing another cleanup round to replace such class
inheritance as well, but combining both becomes a bigger commit with more
chances to introduce bugs.

2013/9/30 Pedro Manuel Baeza <email address hidden>

> Review: Approve code review, no test
>
> LGTM.
>
> Well, this kind of refactorings are being more focused on v7, but, hey,
> it's also good for v6.1.
> --
>
> https://code.launchpad.net/~openerp-community/stock-logistic-flows/improve-relative-imports/+merge/188285
> Your team Stock and Logistic Core Editors is subscribed to branch
> lp:stock-logistic-flows.
>
> --
> Mailing list: https://launchpad.net/~openerp-community-reviewer
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~openerp-community-reviewer
> More help : https://help.launchpad.net/ListHelp
>

--
Niels Huylebroeck
Lead Architect -- Agaplan
Tel. : [phone]
Web : http://www.agaplan.eu

=== modified file 'picking_dispatch/picking_dispatch.py'
--- picking_dispatch/picking_dispatch.py	2012-12-10 10:51:23 +0000
+++ picking_dispatch/picking_dispatch.py	2013-09-30 09:57:03 +0000
@@ -23,7 +23,7 @@
 from openerp.osv.orm import Model
 from openerp.osv import osv, fields
 from openerp.osv.osv import except_osv
-from tools.translate import _
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 

=== modified file 'product_serial/company.py'
--- product_serial/company.py	2011-10-25 13:57:35 +0000
+++ product_serial/company.py	2013-09-30 09:57:03 +0000
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from openerp.osv import osv, fields
 
 class company(osv.osv):
     _inherit = 'res.company'

=== modified file 'product_serial/prodlot_wizard.py'
--- product_serial/prodlot_wizard.py	2011-10-25 13:57:35 +0000
+++ product_serial/prodlot_wizard.py	2013-09-30 09:57:03 +0000
@@ -20,8 +20,8 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
 
 def is_integer(value):
     try:

=== modified file 'product_serial/product.py'
--- product_serial/product.py	2011-10-25 13:57:35 +0000
+++ product_serial/product.py	2013-09-30 09:57:03 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, osv
 
 class product_product(osv.osv):
     _inherit = "product.product"

=== modified file 'product_serial/stock.py'
--- product_serial/stock.py	2013-05-14 16:34:57 +0000
+++ product_serial/stock.py	2013-09-30 09:57:03 +0000
@@ -23,9 +23,9 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 import hashlib
-from tools.translate import _
 
 
 class stock_move(osv.osv):

=== modified file 'stock_move_on_hold/invoice.py'
--- stock_move_on_hold/invoice.py	2012-03-07 12:56:37 +0000
+++ stock_move_on_hold/invoice.py	2013-09-30 09:57:03 +0000
@@ -19,8 +19,8 @@
 #
 #################################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class account_invoice(osv.osv):
     

=== modified file 'stock_move_on_hold/product.py'
--- stock_move_on_hold/product.py	2013-05-14 16:34:57 +0000
+++ stock_move_on_hold/product.py	2013-09-30 09:57:03 +0000
@@ -19,9 +19,9 @@
 #
 #################################################################################
 
-from osv import fields, osv
-from tools.translate import _
-import decimal_precision as dp
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
 
 class product_product(osv.osv):
     

=== modified file 'stock_move_on_hold/stock.py'
--- stock_move_on_hold/stock.py	2012-03-07 12:56:37 +0000
+++ stock_move_on_hold/stock.py	2013-09-30 09:57:03 +0000
@@ -20,9 +20,9 @@
 #################################################################################
 
 from datetime import datetime
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
 
 # ----------------------------------------------------
 # Move