diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index 1b64386f6af..36cc1c85b5a 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -23,7 +23,7 @@ import account
 import installer
 import project
 import partner
-import invoice
+import account_invoice
 import account_bank_statement
 import account_bank
 import account_cash_statement
diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 0a75b52213f..19662ea2f33 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -103,8 +103,7 @@ module named account_voucher.
         'account_end_fy.xml',
         'account_invoice_view.xml',
         'partner_view.xml',
-        'data/account_invoice.xml',
-        'data/account_data2.xml',
+        'data/account_data.xml',
         'account_invoice_workflow.xml',
         'project/project_view.xml',
         'project/project_report.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 538f9ed3b4e..4273c4c0288 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -672,32 +672,22 @@ class account_journal(osv.osv):
         return super(account_journal, self).write(cr, uid, ids, vals, context=context)
 
     def create_sequence(self, cr, uid, vals, context=None):
+        """ Create new no_gap entry sequence for every new Joural
         """
-        Create new entry sequence for every new Joural
-        """
-        seq_pool = self.pool.get('ir.sequence')
-        seq_typ_pool = self.pool.get('ir.sequence.type')
-
-        name = vals['name']
-        code = vals['code'].lower()
-
-        types = {
-            'name': name,
-            'code': code
-        }
-        seq_typ_pool.create(cr, uid, types)
+        # in account.journal code is actually the prefix of the sequence
+        # whereas ir.sequence code is a key to lookup global sequences.
+        prefix = vals['code'].upper()
 
         seq = {
-            'name': name,
-            'code': code,
-            'active': True,
-            'prefix': code + "/%(year)s/",
+            'name': vals['name'],
+            'implementation':'no_gap',
+            'prefix': prefix + "/%(year)s/",
             'padding': 4,
             'number_increment': 1
         }
         if 'company_id' in vals:
             seq['company_id'] = vals['company_id']
-        return seq_pool.create(cr, uid, seq)
+        return self.pool.get('ir.sequence').create(cr, uid, seq)
 
     def create(self, cr, uid, vals, context=None):
         if not 'sequence_id' in vals or not vals['sequence_id']:
diff --git a/addons/account/invoice.py b/addons/account/account_invoice.py
similarity index 100%
rename from addons/account/invoice.py
rename to addons/account/account_invoice.py
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data.xml
similarity index 94%
rename from addons/account/data/account_data2.xml
rename to addons/account/data/account_data.xml
index 48630c9899d..e111c453325 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data.xml
@@ -469,66 +469,48 @@
         Account Journal Sequences
         -->
 
-        <record id="sequence_journal_type" model="ir.sequence.type">
-            <field name="name">Account Journal</field>
-            <field name="code">account.journal</field>
-        </record>
-        <record id="sequence_journal" model="ir.sequence">
-            <field name="name">Account Journal</field>
-            <field name="code">account.journal</field>
-            <field name="prefix"/>
-        </record>
         <record id="sequence_sale_journal" model="ir.sequence">
-            <field name="name">Sale Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Sales Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">SAJ/%(year)s/</field>
         </record>
         <record id="sequence_refund_sales_journal" model="ir.sequence">
-            <field name="name">Sales Credit Note Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Sales Credit Note Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">SCNJ/%(year)s/</field>
         </record>
         <record id="sequence_purchase_journal" model="ir.sequence">
-            <field name="name">Purchase Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Expenses Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">EXJ/%(year)s/</field>
         </record>
         <record id="sequence_refund_purchase_journal" model="ir.sequence">
-            <field name="name">Expenses Credit Notes Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Expenses Credit Notes Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">ECNJ/%(year)s/</field>
         </record>
         <record id="sequence_bank_journal" model="ir.sequence">
-            <field name="name">Bank Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Bank Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">BNK/%(year)s/</field>
         </record>
         <record id="sequence_check_journal" model="ir.sequence">
-            <field name="name">Checks Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Checks Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">CHK/%(year)s/</field>
         </record>
         <record id="sequence_cash_journal" model="ir.sequence">
-            <field name="name">Cash Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Cash Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">CSH/%(year)s/</field>
         </record>
         <record id="sequence_opening_journal" model="ir.sequence">
-            <field name="name">Opening Entries Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Opening Entries Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">OPEJ/%(year)s/</field>
         </record>
         <record id="sequence_miscellaneous_journal" model="ir.sequence">
-            <field name="name">Miscellaneous Journal</field>
-            <field name="code">account.journal</field>
+            <field name="name">Account Default Miscellaneous Journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">MISJ/%(year)s/</field>
         </record>
@@ -538,7 +520,7 @@
         -->
 
         <record id="sequence_reconcile" model="ir.sequence.type">
-            <field name="name">Account reconcile sequence</field>
+            <field name="name">Account Reconcile</field>
             <field name="code">account.reconcile</field>
         </record>
         <record id="sequence_reconcile_seq" model="ir.sequence">
@@ -550,7 +532,7 @@
         </record>
 
         <record id="sequence_statement_type" model="ir.sequence.type">
-            <field name="name">Bank Statement</field>
+            <field name="name">Account Bank Statement</field>
             <field name="code">account.bank.statement</field>
         </record>
         <record id="sequence_statement" model="ir.sequence">
@@ -562,7 +544,7 @@
         </record>
 
         <record id="cash_sequence_statement_type" model="ir.sequence.type">
-            <field name="name">Cash Statement</field>
+            <field name="name">Account Cash Statement</field>
             <field name="code">account.cash.statement</field>
         </record>
         <record id="cash_sequence_statement" model="ir.sequence">
@@ -572,5 +554,30 @@
             <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
+
+        <!-- 
+        Sequence for analytic account 
+        -->
+        <record id="seq_type_analytic_account" model="ir.sequence.type">
+            <field name="name">Analytic account</field>
+            <field name="code">account.analytic.account</field>
+        </record>
+        <record id="seq_analytic_account" model="ir.sequence">
+            <field name="name">Analytic account sequence</field>
+            <field name="code">account.analytic.account</field>
+            <field eval="3" name="padding"/>
+            <field eval="2708" name="number_next"/>
+        </record>
+
+        <!--
+        Invoice requests (deprecated)
+        -->
+        <record id="req_link_invoice" model="res.request.link">
+            <field name="name">Invoice</field>
+            <field name="object">account.invoice</field>
+        </record>
+
+
+
     </data>
 </openerp>
diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml
deleted file mode 100644
index 54f5ed6de91..00000000000
--- a/addons/account/data/account_invoice.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="req_link_invoice" model="res.request.link">
-            <field name="name">Invoice</field>
-            <field name="object">account.invoice</field>
-        </record>
-
-        <!--
-        Sequences types for invoices
-        -->
-        <record id="seq_type_out_invoice" model="ir.sequence.type">
-            <field name="name">Account Invoice Out</field>
-            <field name="code">account.invoice.out_invoice</field>
-        </record>
-        <record id="seq_type_in_invoice" model="ir.sequence.type">
-            <field name="name">Account Invoice In</field>
-            <field name="code">account.invoice.in_invoice</field>
-        </record>
-        <record id="seq_type_out_refund" model="ir.sequence.type">
-            <field name="name">Account Refund Out</field>
-            <field name="code">account.invoice.out_refund</field>
-        </record>
-        <record id="seq_type_in_refund" model="ir.sequence.type">
-            <field name="name">Account Refund In</field>
-            <field name="code">account.invoice.in_refund</field>
-        </record>
-        
-        <!--
-        Sequences for invoices
-        -->
-        <record id="seq_out_invoice" model="ir.sequence">
-            <field name="name">Account Invoice Out</field>
-            <field name="code">account.invoice.out_invoice</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        <record id="seq_in_invoice" model="ir.sequence">
-            <field name="name">Account Invoice In</field>
-            <field name="code">account.invoice.in_invoice</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        <record id="seq_out_refund" model="ir.sequence">
-            <field name="name">Account Refund Out</field>
-            <field name="code">account.invoice.out_refund</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        <record id="seq_in_refund" model="ir.sequence">
-            <field name="name">Account Refund In</field>
-            <field name="code">account.invoice.in_refund</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        
-        <!--
-        Sequences types for analytic account 
-        -->
-        <record id="seq_type_analytic_account" model="ir.sequence.type">
-            <field name="name">Analytic account</field>
-            <field name="code">account.analytic.account</field>
-        </record>
-        
-        <!-- 
-        Sequence for analytic account 
-        -->
-        <record id="seq_analytic_account" model="ir.sequence">
-            <field name="name">Analytic account sequence</field>
-            <field name="code">account.analytic.account</field>
-            <field eval="3" name="padding"/>
-            <field eval="2708" name="number_next"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 109b098d6a7..1e24d2ca0e7 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -26,7 +26,6 @@
     code: NEW
     type: situation
     analytic_journal_id: sit
-    sequence_id: sequence_journal
     default_debit_account_id: cash
     default_credit_account_id: cash
     company_id: base.main_company
diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index ac8c714fbca..c755660d950 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -6,7 +6,6 @@
             <field name="code">EXPF</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -17,7 +16,6 @@
             <field name="code">BCHF</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -28,7 +26,6 @@
             <field name="code">BEUR</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -40,7 +37,6 @@
             <field name="code">CAI</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -51,7 +47,6 @@
             <field name="code">OD</field>
             <field name="type">general</field>
             <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -63,7 +58,6 @@
             <field name="type">situation</field>
             <field name="centralisation">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
             <field name="update_posted" eval="True" />
         </record>
         
diff --git a/addons/sale/test/data_test.yml b/addons/sale/test/data_test.yml
index 7064a549335..0be8474754c 100644
--- a/addons/sale/test/data_test.yml
+++ b/addons/sale/test/data_test.yml
@@ -122,7 +122,6 @@
     default_credit_account_id: account_account_purchases0
     default_debit_account_id: account_account_purchases0
     name: Purchase Journal - (test)
-    sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
 - 
@@ -134,7 +133,6 @@
     default_credit_account_id: account_account_sales0
     default_debit_account_id: account_account_sales0
     name: Sale Journal
-    sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
 - 
@@ -146,7 +144,6 @@
     default_credit_account_id: account_account_cash0
     default_debit_account_id: account_account_cash0
     name: Bank Journal
-    sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
 - 
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index bcde818c78a..c0c872e99f2 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -2,12 +2,17 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="stock_journal_sequence" model="ir.sequence">
+            <field name="name">Stock Journal Sequence</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">STJ/%(year)s/</field>
+        </record>
         <record forcecreate="1" id="stock_journal" model="account.journal">
             <field name="name">Stock Journal</field>
             <field name="code">STJ</field>
             <field name="type">general</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_journal"/>
+            <field name="sequence_id" ref="stock_journal_sequence"/>
             <field name="user_id" ref="base.user_root"/>
         </record>