[IMP] Remove account sequence code madness

bzr revid: al@openerp.com-20111001093437-hplwdkq57wcspcv9

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 0a75b52..19662ea 100644 (file)
--- 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 538f9ed..4273c4c 100644 (file)
--- 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/data/account_data.xml b/addons/account/data/account_data.xml
new file mode 100644 (file)
index 0000000..0de4966
--- /dev/null
+++ b/addons/account/data/account_data.xml
@@ -0,0 +1,583 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="analytic_journal_sale" model="account.analytic.journal">
+            <field name="name">Sales</field>
+            <field name="type">sale</field>
+        </record>
+
+        <!--
+        Payment term
+        -->
+        <record id="account_payment_term" model="account.payment.term">
+            <field name="name">30 Days End of Month</field>
+            <field name="note">30 Days End of Month</field>
+        </record>
+        <record id="account_payment_term_line" model="account.payment.term.line">
+            <field name="name">30 Days End of Month</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="-1" name="days2"/>
+            <field eval="account_payment_term" name="payment_id"/>
+        </record>
+        <record forcecreate="True" id="decimal_payment" model="decimal.precision">
+            <field name="name">Payment Term</field>
+            <field name="digits">6</field>
+        </record>
+
+        <record id="account_payment_term_net" model="account.payment.term">
+            <field name="name">30 Net Days</field>
+            <field name="note">30 Net Days</field>
+        </record>
+        <record id="account_payment_term_line_net" model="account.payment.term.line">
+            <field name="name">30 Net Days</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_net" name="payment_id"/>
+        </record>
+
+        <record id="account_payment_term_advance" model="account.payment.term">
+            <field name="name">30% Advance End 30 Days</field>
+            <field name="note">30% Advance End 30 Days</field>
+        </record>
+        <record id="account_payment_term_line_advance1" model="account.payment.term.line">
+            <field name="name">30% Advance</field>
+            <field name="value">procent</field>
+            <field eval="3" name="sequence"/>
+            <field eval="0.300000" name="value_amount"/>
+            <field eval="0" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
+        <record id="account_payment_term_line_advance2" model="account.payment.term.line">
+            <field name="name">Remaining Balance</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="-1" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
+
+        <!--
+        Account Journal View
+        -->
+        <record id="account_journal_bank_view" model="account.journal.view">
+            <field name="name">Bank/Cash Journal View</field>
+        </record>
+        <record id="bank_col1" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="bank_col2" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Journal Entry</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="bank_col7" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="7" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="bank_col4" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Statement</field>
+            <field name="field">statement_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="bank_col6" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="bank_col5" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="6" name="sequence"/>
+        </record>
+        <record id="bank_col9" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="bank_col10" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="bank_col3" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="bank_col23" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="19" name="sequence"/>
+        </record>
+        <record id="bank_col20" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Reconcile</field>
+            <field name="field">reconcile_id</field>
+            <field eval="20" name="sequence"/>
+        </record>
+
+
+        <record id="account_journal_bank_view_multi" model="account.journal.view">
+            <field name="name">Bank/Cash Journal (Multi-Currency) View</field>
+        </record>
+        <record id="bank_col1_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="bank_col2_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Journal Entry</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="bank_col7_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="7" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="bank_col4_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Statement</field>
+            <field name="field">statement_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="bank_col6_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="bank_col5_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="6" name="sequence"/>
+        </record>
+        <record id="bank_col17_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Currency Amt.</field>
+            <field name="field">amount_currency</field>
+            <field eval="9" name="sequence"/>
+        </record>
+        <record id="bank_col18_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Currency</field>
+            <field name="field">currency_id</field>
+            <field eval="10" name="sequence"/>
+        </record>
+        <record id="bank_col9_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="bank_col10_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="bank_col3_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="bank_col23_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="19" name="sequence"/>
+        </record>
+        <record id="bank_col20_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Reconcile</field>
+            <field name="field">reconcile_id</field>
+            <field eval="20" name="sequence"/>
+        </record>
+
+
+        <record id="account_journal_view" model="account.journal.view">
+            <field name="name">Journal View</field>
+        </record>
+        <record id="journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Journal Entry</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="journal_col4" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="6" name="sequence"/>
+        </record>
+        <record id="journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="7" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="journal_col8" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="journal_col9" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="14" name="sequence"/>
+        </record>
+        <record id="journal_col24" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="19" name="sequence"/>
+        </record>
+
+
+        <record id="account_sp_journal_view" model="account.journal.view">
+            <field name="name">Sale/Purchase Journal View</field>
+        </record>
+        <record id="sp_journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="sp_journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Journal Entry</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="sp_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="sp_journal_col4" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="6" name="sequence"/>
+        </record>
+        <record id="sp_journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="sp_journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="7" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="sp_journal_col7" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Due Date</field>
+            <field name="field">date_maturity</field>
+            <field eval="8" name="sequence"/>
+        </record>
+        <record id="sp_journal_col8" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="sp_journal_col9" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="sp_journal_col10" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="13" name="sequence"/>
+        </record>
+        <record id="sp_journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="14" name="sequence"/>
+        </record>
+        <record id="sp_journal_col24" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="19" name="sequence"/>
+        </record>
+        <record id="sp_journal_col20" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Reconcile</field>
+            <field name="field">reconcile_id</field>
+            <field eval="20" name="sequence"/>
+        </record>
+
+        <record id="account_sp_refund_journal_view" model="account.journal.view">
+            <field name="name">Sale/Purchase Refund Journal View</field>
+        </record>
+        <record id="sp_refund_journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Journal Entry</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col4" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="6" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="7" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="sp_refund_journal_col7" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Due Date</field>
+            <field name="field">date_maturity</field>
+            <field eval="8" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col8" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col9" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col10" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="13" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="14" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col24" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="19" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col20" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Reconcile</field>
+            <field name="field">reconcile_id</field>
+            <field eval="20" name="sequence"/>
+        </record>
+
+        <!--
+        Account Journal Sequences
+        -->
+
+        <record id="sequence_sale_journal" model="ir.sequence">
+            <field name="name">Account Default Sale 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">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">Account Default Purchase 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">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">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">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">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">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">Account Default Miscellaneous Journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">MISJ/%(year)s/</field>
+        </record>
+
+        <!--
+        Account Statement Sequences
+        -->
+
+        <record id="sequence_reconcile" model="ir.sequence.type">
+            <field name="name">Account Reconcile</field>
+            <field name="code">account.reconcile</field>
+        </record>
+        <record id="sequence_reconcile_seq" model="ir.sequence">
+            <field name="name">Account reconcile sequence</field>
+            <field name="code">account.reconcile</field>
+            <field name="prefix">A</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+        </record>
+
+        <record id="sequence_statement_type" model="ir.sequence.type">
+            <field name="name">Account Bank Statement</field>
+            <field name="code">account.bank.statement</field>
+        </record>
+        <record id="sequence_statement" model="ir.sequence">
+            <field name="name">Account Bank Statement</field>
+            <field name="code">account.bank.statement</field>
+            <field name="prefix">St. %(month)s/%(day)s/</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+        </record>
+
+        <record id="cash_sequence_statement_type" model="ir.sequence.type">
+            <field name="name">Account Cash Statement</field>
+            <field name="code">account.cash.statement</field>
+        </record>
+        <record id="cash_sequence_statement" model="ir.sequence">
+            <field name="name">Account Cash Statement</field>
+            <field name="code">account.cash.statement</field>
+            <field name="prefix">Cr. %(month)s/%(day)s/</field>
+            <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_data2.xml b/addons/account/data/account_data2.xml
deleted file mode 100644 (file)
index 48630c9..0000000
--- a/addons/account/data/account_data2.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <record id="analytic_journal_sale" model="account.analytic.journal">
-            <field name="name">Sales</field>
-            <field name="type">sale</field>
-        </record>
-
-        <!--
-        Payment term
-        -->
-        <record id="account_payment_term" model="account.payment.term">
-            <field name="name">30 Days End of Month</field>
-            <field name="note">30 Days End of Month</field>
-        </record>
-        <record id="account_payment_term_line" model="account.payment.term.line">
-            <field name="name">30 Days End of Month</field>
-            <field name="value">balance</field>
-            <field eval="30" name="days"/>
-            <field eval="-1" name="days2"/>
-            <field eval="account_payment_term" name="payment_id"/>
-        </record>
-        <record forcecreate="True" id="decimal_payment" model="decimal.precision">
-            <field name="name">Payment Term</field>
-            <field name="digits">6</field>
-        </record>
-
-        <record id="account_payment_term_net" model="account.payment.term">
-            <field name="name">30 Net Days</field>
-            <field name="note">30 Net Days</field>
-        </record>
-        <record id="account_payment_term_line_net" model="account.payment.term.line">
-            <field name="name">30 Net Days</field>
-            <field name="value">balance</field>
-            <field eval="30" name="days"/>
-            <field eval="0" name="days2"/>
-            <field eval="account_payment_term_net" name="payment_id"/>
-        </record>
-
-        <record id="account_payment_term_advance" model="account.payment.term">
-            <field name="name">30% Advance End 30 Days</field>
-            <field name="note">30% Advance End 30 Days</field>
-        </record>
-        <record id="account_payment_term_line_advance1" model="account.payment.term.line">
-            <field name="name">30% Advance</field>
-            <field name="value">procent</field>
-            <field eval="3" name="sequence"/>
-            <field eval="0.300000" name="value_amount"/>
-            <field eval="0" name="days"/>
-            <field eval="0" name="days2"/>
-            <field eval="account_payment_term_advance" name="payment_id"/>
-        </record>
-        <record id="account_payment_term_line_advance2" model="account.payment.term.line">
-            <field name="name">Remaining Balance</field>
-            <field name="value">balance</field>
-            <field eval="30" name="days"/>
-            <field eval="-1" name="days2"/>
-            <field eval="account_payment_term_advance" name="payment_id"/>
-        </record>
-
-        <!--
-        Account Journal View
-        -->
-        <record id="account_journal_bank_view" model="account.journal.view">
-            <field name="name">Bank/Cash Journal View</field>
-        </record>
-        <record id="bank_col1" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="bank_col2" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="bank_col7" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="bank_col4" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Statement</field>
-            <field name="field">statement_id</field>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="bank_col6" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="bank_col5" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="bank_col9" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="bank_col10" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="bank_col3" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="bank_col23" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">State</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="bank_col20" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-
-        <record id="account_journal_bank_view_multi" model="account.journal.view">
-            <field name="name">Bank/Cash Journal (Multi-Currency) View</field>
-        </record>
-        <record id="bank_col1_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="bank_col2_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="bank_col7_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="bank_col4_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Statement</field>
-            <field name="field">statement_id</field>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="bank_col6_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="bank_col5_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="bank_col17_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Currency Amt.</field>
-            <field name="field">amount_currency</field>
-            <field eval="9" name="sequence"/>
-        </record>
-        <record id="bank_col18_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Currency</field>
-            <field name="field">currency_id</field>
-            <field eval="10" name="sequence"/>
-        </record>
-        <record id="bank_col9_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="bank_col10_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="bank_col3_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="bank_col23_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">State</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="bank_col20_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-
-        <record id="account_journal_view" model="account.journal.view">
-            <field name="name">Journal View</field>
-        </record>
-        <record id="journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="journal_col2" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="journal_col4" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="journal_col6" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="journal_col8" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="journal_col9" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="journal_col11" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="14" name="sequence"/>
-        </record>
-        <record id="journal_col24" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">State</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-
-
-        <record id="account_sp_journal_view" model="account.journal.view">
-            <field name="name">Sale/Purchase Journal View</field>
-        </record>
-        <record id="sp_journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="sp_journal_col2" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="sp_journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="sp_journal_col4" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="sp_journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="sp_journal_col6" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="sp_journal_col7" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Due Date</field>
-            <field name="field">date_maturity</field>
-            <field eval="8" name="sequence"/>
-        </record>
-        <record id="sp_journal_col8" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="sp_journal_col9" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="sp_journal_col10" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="13" name="sequence"/>
-        </record>
-        <record id="sp_journal_col11" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="14" name="sequence"/>
-        </record>
-        <record id="sp_journal_col24" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">State</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="sp_journal_col20" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-        <record id="account_sp_refund_journal_view" model="account.journal.view">
-            <field name="name">Sale/Purchase Refund Journal View</field>
-        </record>
-        <record id="sp_refund_journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col2" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col4" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col6" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="sp_refund_journal_col7" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Due Date</field>
-            <field name="field">date_maturity</field>
-            <field eval="8" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col8" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col9" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col10" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="13" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col11" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="14" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col24" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">State</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col20" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-        <!--
-        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 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 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 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 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 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 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 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 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 eval="3" name="padding"/>
-            <field name="prefix">MISJ/%(year)s/</field>
-        </record>
-
-        <!--
-        Account Statement Sequences
-        -->
-
-        <record id="sequence_reconcile" model="ir.sequence.type">
-            <field name="name">Account reconcile sequence</field>
-            <field name="code">account.reconcile</field>
-        </record>
-        <record id="sequence_reconcile_seq" model="ir.sequence">
-            <field name="name">Account reconcile sequence</field>
-            <field name="code">account.reconcile</field>
-            <field name="prefix">A</field>
-            <field eval="1" name="number_next"/>
-            <field eval="1" name="number_increment"/>
-        </record>
-
-        <record id="sequence_statement_type" model="ir.sequence.type">
-            <field name="name">Bank Statement</field>
-            <field name="code">account.bank.statement</field>
-        </record>
-        <record id="sequence_statement" model="ir.sequence">
-            <field name="name">Account Bank Statement</field>
-            <field name="code">account.bank.statement</field>
-            <field name="prefix">St. %(month)s/%(day)s/</field>
-            <field eval="1" name="number_next"/>
-            <field eval="1" name="number_increment"/>
-        </record>
-
-        <record id="cash_sequence_statement_type" model="ir.sequence.type">
-            <field name="name">Cash Statement</field>
-            <field name="code">account.cash.statement</field>
-        </record>
-        <record id="cash_sequence_statement" model="ir.sequence">
-            <field name="name">Account Cash Statement</field>
-            <field name="code">account.cash.statement</field>
-            <field name="prefix">Cr. %(month)s/%(day)s/</field>
-            <field eval="1" name="number_next"/>
-            <field eval="1" name="number_increment"/>
-        </record>
-    </data>
-</openerp>

diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml
deleted file mode 100644 (file)
index 54f5ed6..0000000
--- 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 109b098..1e24d2c 100644 (file)
--- 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