[MERGE] Missing modelines, requested and provided by Lionel Sausin (Numerigraphe)

bzr revid: odo@openerp.com-20111124155058-le9vg75rik4pl0xa

diff --cc addons/account/wizard/account_report_common_journal.py
index 8e9db05,cc07b65..e71d380
--- 1/addons/account/wizard/account_report_common_journal.py
--- 2/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@@ -49,4 -49,5 +49,4 @@@ class account_common_journal_report(osv
  
  account_common_journal_report()
  
--#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/account/wizard/account_vat.py
index 186f79c,a7029b0..cbdf18d
--- 1/addons/account/wizard/account_vat.py
--- 2/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@@ -59,4 -59,5 +59,4 @@@ class account_vat_declaration(osv.osv_m
  
  account_vat_declaration()
  
--#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/document/report/__init__.py
index bfdeacd,6fa6327..f5b827f
--- 1/addons/document/report/__init__.py
--- 2/addons/document/report/__init__.py
+++ b/addons/document/report/__init__.py
@@@ -18,4 -18,5 +18,6 @@@
  #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  ##############################################################################
- import document_report
+ import document_report
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/edi/models/__init__.py
index cf8c0ff,8825961..a1e6129
--- 1/addons/edi/models/__init__.py
--- 2/addons/edi/models/__init__.py
+++ b/addons/edi/models/__init__.py
@@@ -22,4 -22,5 +22,6 @@@
  import edi
  import res_partner
  import res_company
- import res_currency
+ import res_currency
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/edi/models/res_currency.py
index d057f4e,4c16150..0f56bc8
--- 1/addons/edi/models/res_currency.py
--- 2/addons/edi/models/res_currency.py
+++ b/addons/edi/models/res_currency.py
@@@ -61,4 -61,5 +61,6 @@@ class res_currency(osv.osv, EDIMixin)
          if rate:
              self.pool.get('res.currency.rate').create(cr, SUPERUSER_ID, {'currency_id': currency_id,
                                                                           'rate': rate}, context=context)
-         return currency_id
+         return currency_id
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/email_template/res_partner.py
index 74d8b4e,a175323..a451b17
--- 1/addons/email_template/res_partner.py
--- 2/addons/email_template/res_partner.py
+++ b/addons/email_template/res_partner.py
@@@ -34,4 -34,5 +34,6 @@@ class res_partner(osv.osv)
  
      _defaults = {
          'opt_out': False,
-     }
+     }
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/html_view/__init__.py
index 465ad75,e6e7c07..12bd1af
--- 1/addons/html_view/__init__.py
--- 2/addons/html_view/__init__.py
+++ b/addons/html_view/__init__.py
@@@ -1,1 -1,2 +1,3 @@@
- import html_view
+ import html_view
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/html_view/html_view.py
index 79f4bd7,0c89b36..09201b2
--- 1/addons/html_view/html_view.py
--- 2/addons/html_view/html_view.py
+++ b/addons/html_view/html_view.py
@@@ -10,4 -10,5 +10,6 @@@ class html_view(osv.osv)
          'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
      }
      
- html_view()
+ html_view()
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/import_base/__init__.py
index 0a5d7fb,6df3448..52366e5
--- 1/addons/import_base/__init__.py
--- 2/addons/import_base/__init__.py
+++ b/addons/import_base/__init__.py
@@@ -20,4 -20,5 +20,6 @@@
  ##############################################################################
  
  import import_framework
- import mapper
+ import mapper
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/l10n_at/__init__.py
index b3516a6,329606c..a295fe1
--- 1/addons/l10n_at/__init__.py
--- 2/addons/l10n_at/__init__.py
+++ b/addons/l10n_at/__init__.py
@@@ -19,4 -19,5 +19,6 @@@
  #
  ##############################################################################
  
- import account_wizard
+ import account_wizard
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/l10n_br/account.py
index 965ff50,a2c9f7d..92f724a
--- 1/addons/l10n_br/account.py
--- 2/addons/l10n_br/account.py
+++ b/addons/l10n_br/account.py
@@@ -174,4 -174,5 +174,6 @@@ class wizard_multi_charts_accounts(osv.
              if tax.tax_code_id:
                  obj_acc_tax.write(cr, uid, tax.id, {'domain': tax.tax_code_id.domain,'tax_discount': tax.tax_code_id.tax_discount})
          
- wizard_multi_charts_accounts()
+ wizard_multi_charts_accounts()
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/l10n_ch/report/__init__.py
index 04cc14f,1839cb9..e8703f1
--- 1/addons/l10n_ch/report/__init__.py
--- 2/addons/l10n_ch/report/__init__.py
+++ b/addons/l10n_ch/report/__init__.py
@@@ -29,4 -29,5 +29,6 @@@
  #
  ##############################################################################
  
- import report_webkit_html
+ import report_webkit_html
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/outlook/plugin/openerp-outlook-plugin/eml.py
index fe455c9,f2cd192..47e6668
--- 1/addons/outlook/plugin/openerp-outlook-plugin/eml.py
--- 2/addons/outlook/plugin/openerp-outlook-plugin/eml.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
@@@ -90,4 -90,5 +90,6 @@@ def generateEML(mail)
      if (success == False):\r
          print cemail.lastErrorText()\r
          sys.exit()\r
-     return new_mail, eml_path
+     return new_mail, eml_path
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/procurement/__init__.py
index 3420ef1,cf186f4..4634166
--- 1/addons/procurement/__init__.py
--- 2/addons/procurement/__init__.py
+++ b/addons/procurement/__init__.py
@@@ -22,4 -22,5 +22,6 @@@
  import procurement
  import wizard
  import schedulers
- import company
+ import company
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/purchase/edi/__init__.py
index cfac018,75db9cb..be599e9
--- 1/addons/purchase/edi/__init__.py
--- 2/addons/purchase/edi/__init__.py
+++ b/addons/purchase/edi/__init__.py
@@@ -19,4 -19,5 +19,6 @@@
  #
  ##############################################################################
  
- import purchase_order
+ import purchase_order
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/report_webkit/__init__.py
index a97025f,71aff12..e09f929
--- 1/addons/report_webkit/__init__.py
--- 2/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@@ -34,4 -34,5 +34,6 @@@ import compan
  import report_helper
  import webkit_report
  import ir_report
- import wizard
+ import wizard
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/report_webkit/report_helper.py
index 2b9d8c9,321e126..12651f3
--- 1/addons/report_webkit/report_helper.py
--- 2/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@@ -79,4 -79,5 +79,6 @@@ class WebKitHelper(object)
          """Return HTML embedded logo by name"""
          img, type = self.get_logo_by_name(name)
          return self.embed_image(type, img, width, height)
-         
+         
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/report_webkit/wizard/__init__.py
index f6f7b3c,1d19467..e8ae8b7
--- 1/addons/report_webkit/wizard/__init__.py
--- 2/addons/report_webkit/wizard/__init__.py
+++ b/addons/report_webkit/wizard/__init__.py
@@@ -29,4 -29,5 +29,6 @@@
  #
  ##############################################################################
  
- import report_webkit_actions
+ import report_webkit_actions
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/report_webkit_sample/__init__.py
index 9b406f7,3e7c030..c1d68d5
--- 1/addons/report_webkit_sample/__init__.py
--- 2/addons/report_webkit_sample/__init__.py
+++ b/addons/report_webkit_sample/__init__.py
@@@ -29,4 -29,5 +29,6 @@@
  #
  ##############################################################################
  import wizard
- import report
+ import report
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/report_webkit_sample/report/__init__.py
index 04cc14f,1839cb9..e8703f1
--- 1/addons/report_webkit_sample/report/__init__.py
--- 2/addons/report_webkit_sample/report/__init__.py
+++ b/addons/report_webkit_sample/report/__init__.py
@@@ -29,4 -29,5 +29,6 @@@
  #
  ##############################################################################
  
- import report_webkit_html
+ import report_webkit_html
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/sale/edi/__init__.py
index 566b171,89edae4..40789b6
--- 1/addons/sale/edi/__init__.py
--- 2/addons/sale/edi/__init__.py
+++ b/addons/sale/edi/__init__.py
@@@ -19,4 -19,5 +19,6 @@@
  #
  ##############################################################################
  
- import sale_order
+ import sale_order
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/share/ir_model.py
index 437a0c5,067cebf..0927462
--- 1/addons/share/ir_model.py
--- 2/addons/share/ir_model.py
+++ b/addons/share/ir_model.py
@@@ -43,4 -43,5 +43,6 @@@ class ir_model_access(osv.osv)
                          a.perm_''' + access_mode, (model_name,))
          return [x[0] for x in cr.fetchall()]
  
- ir_model_access()
+ ir_model_access()
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/stock_location/procurement_pull.py
index 7122e5c,92cee8c..0846fe0
--- 1/addons/stock_location/procurement_pull.py
--- 2/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@@ -121,4 -121,5 +121,6 @@@ class procurement_order(osv.osv)
              wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
          return False
  
- procurement_order()
+ procurement_order()
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/wiki/web/widgets/rss/__init__.py
index 464c436,1696c2f..ff95e8b
--- 1/addons/wiki/web/widgets/rss/__init__.py
--- 2/addons/wiki/web/widgets/rss/__init__.py
+++ b/addons/wiki/web/widgets/rss/__init__.py
@@@ -1,1 -1,2 +1,3 @@@
- import feedparser
+ import feedparser
++
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: