Merge lp:~francois-ctrlaltdel/openerp-swiss-localization/openerp-swiss-localization into lp:~camptocamp/openerp-swiss-localization/7.0

[Francois Deppierraz]

[lp:~francois-ctrlaltdel/openerp-swiss-localization/openerp-swiss-localization]

204. By Francois Deppierraz on 2014-06-13

Fix openerp.pooler import

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks for the fix

Looks good!

review: Approve (code review, no tests)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Rejected as it as moved to Github: https://github.com/OCA/switzerland/pull/7

Unmerged revisions

204. By Francois Deppierraz on 2014-06-13

Fix openerp.pooler import

203. By Francois Deppierraz on 2014-06-13

Fix mod10r import

 This should fix the following issue in odoo 8. Backward compatibility has *not* been tested.

[...]
  File "/home/ubuntu/openerp-swiss-localization/l10n_ch_base_bank/bank.py", line 24, in <module>
    from tools import mod10r
ImportError: No module named tools

=== modified file 'l10n_ch_base_bank/bank.py'
--- l10n_ch_base_bank/bank.py	2014-02-07 15:09:42 +0000
+++ l10n_ch_base_bank/bank.py	2014-06-13 11:47:52 +0000
@@ -21,7 +21,7 @@
 ##############################################################################
 import re
 from openerp.osv import orm, fields
-from tools import mod10r
+from openerp.tools import mod10r
 
 
 class BankCommon(object):

=== modified file 'l10n_ch_dta/wizard/create_dta.py'
--- l10n_ch_dta/wizard/create_dta.py	2014-04-14 12:39:06 +0000
+++ l10n_ch_dta/wizard/create_dta.py	2014-06-13 11:47:52 +0000
@@ -28,7 +28,7 @@
 from openerp.osv.osv import except_osv
 from openerp.osv.orm import TransientModel
 from openerp.tools.translate import _
-from tools import mod10r
+from openerp.tools import mod10r
 
 TRANS = [(u'é', 'e'),
          (u'è', 'e'),

=== modified file 'l10n_ch_scan_bvr/wizard/scan_bvr.py'
--- l10n_ch_scan_bvr/wizard/scan_bvr.py	2014-01-31 13:23:36 +0000
+++ l10n_ch_scan_bvr/wizard/scan_bvr.py	2014-06-13 11:47:52 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-import pooler
 import time
 
 from openerp.osv import orm
 from openerp.osv.orm import TransientModel, fields
 from openerp.tools.translate import _
+from openerp import pooler
 
 
 class scan_bvr(TransientModel):

=== modified file 'l10n_ch_sepa/base_sepa/pain_001.py'
--- l10n_ch_sepa/base_sepa/pain_001.py	2014-04-24 11:07:08 +0000
+++ l10n_ch_sepa/base_sepa/pain_001.py	2014-06-13 11:47:52 +0000
@@ -25,7 +25,7 @@
 from mako import exceptions
 from mako.lookup import TemplateLookup
 
-import pooler
+from openerp import pooler
 from openerp import addons
 from openerp.osv import orm
 from openerp.tools.translate import _