[IMP] base, ir_sequence: removed ir.sequence.type object, added test …

…for ir.sequence.date_range, refactored ir.sequence and ir.sequence.date_range implementation
odoo · Dec 18, 2014 · d6e9abd · d6e9abd
1 parent 69500b6
commit d6e9abd
Show file tree

Hide file tree

Showing 32 changed files with 290 additions and 470 deletions.
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
@@ -111,10 +111,6 @@
         <!--
         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>
@@ -123,10 +119,6 @@
             <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>
@@ -135,10 +127,6 @@
             <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>

diff --git a/addons/account_bank_statement_extensions/data/account_bank_statement_extensions_data.xml b/addons/account_bank_statement_extensions/data/account_bank_statement_extensions_data.xml
@@ -3,10 +3,6 @@
   <data noupdate="1">
 
     <!-- Globalisation Level Sequence-->
-    <record id="sequence_reconcile" model="ir.sequence.type">
-      <field name="name">Statement Line Globalisation sequence</field>
-      <field name="code">statement.line.global</field>
-    </record>
     <record id="sequence_reconcile_seq" model="ir.sequence">
       <field name="name">Statement Line Globalisation sequence</field>
       <field name="code">statement.line.global</field>

diff --git a/addons/account_check_writing/account_check_writing_data.xml b/addons/account_check_writing/account_check_writing_data.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record forcecreate="1" id="sequence_type_check_number" model="ir.sequence.type">
-            <field name="name">Check Number</field>
-            <field name="code">check.number</field>
-        </record>
-
         <record id="sequence_check_number" model="ir.sequence">
             <field name="name">Check Number</field>
             <field name="code">check.number</field>

diff --git a/addons/account_payment/account_payment_sequence.xml b/addons/account_payment/account_payment_sequence.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record forcecreate="1" id="seq_type_payment_order" model="ir.sequence.type">
-            <field name="name">Payment order</field>
-            <field name="code">payment.order</field>
-        </record>
-
         <record forcecreate="1" id="seq_payment_order" model="ir.sequence">
             <field name="name">Payment order</field>
             <field name="code">payment.order</field>
             <field eval="3" name="padding"/>
             <field name="prefix">%(year)s/</field>
         </record>
 
-        <record forcecreate="1" id="seq_type_payment_line" model="ir.sequence.type">
-            <field name="name">Payment Line</field>
-            <field name="code">payment.line</field>
-        </record>
-
         <record forcecreate="1" id="seq_payment_line" model="ir.sequence">
             <field name="name">Payment Line</field>
             <field name="code">payment.line</field>

diff --git a/addons/account_sequence/account_sequence_data.xml b/addons/account_sequence/account_sequence_data.xml
@@ -4,11 +4,6 @@
 
         <!--Account Journal Internal Number of account move line-->
 
-	<record id="sequence_journal" model="ir.sequence.type">
-	    <field name="name">Account Journal</field>
-	    <field name="code">account.journal</field>
-	</record>
-
 	<record id="sequence_journal_seq" model="ir.sequence">
 	    <field name="name">Account journal sequence</field>
 	    <field name="code">account.journal</field>

diff --git a/addons/account_voucher/account_voucher_sequence.xml b/addons/account_voucher/account_voucher_sequence.xml
@@ -5,39 +5,6 @@
             <field name="name">Voucher</field>
             <field name="object">account.voucher</field>
         </record>
-        <!--
-        Sequences types for vouchers
-        -->
-        <record model="ir.sequence.type" id="seq_type_cash_rec_voucher">
-            <field name="name">Cash Receipt</field>
-            <field name="code">rec_voucher</field>
-        </record>
-
-        <record model="ir.sequence.type" id="seq_type_cash_pay_voucher">
-            <field name="name">Cash Payment</field>
-            <field name="code">pay_voucher</field>
-        </record>
-        <record model="ir.sequence.type" id="seq_type_bank_rec_voucher">
-            <field name="name">Bank Receipt</field>
-            <field name="code">bank_rec_voucher</field>
-        </record>
-        <record model="ir.sequence.type" id="seq_type_bank_pay_voucher">
-            <field name="name">Bank Payment</field>
-            <field name="code">bank_pay_voucher</field>
-        </record>
-        <record model="ir.sequence.type" id="seq_type_contra_voucher">
-            <field name="name">Contra Entry</field>
-            <field name="code">cont_voucher</field>
-        </record>
-        <record model="ir.sequence.type" id="seq_type_jou_sale_voucher">
-            <field name="name">Sales Entry</field>
-            <field name="code">journal_sale_vou</field>
-        </record>
-        <record model="ir.sequence.type" id="seq_type_jou_pur_voucher">
-            <field name="name">Purchase Entry</field>
-            <field name="code">journal_pur_vou</field>
-        </record>
-
         <!--
         Sequences for vouchers
         -->

diff --git a/addons/analytic/data/analytic_sequence.xml b/addons/analytic/data/analytic_sequence.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    <record id="seq_type_analytic_account_main" model="ir.sequence.type">
-            <field name="name">Analytic account</field>
-            <field name="code">account.analytic.account</field>
-        </record>
         <record id="seq_analytic_account_base" model="ir.sequence">
             <field name="name">Analytic account sequence</field>
             <field name="code">account.analytic.account</field>

diff --git a/addons/hr_expense/hr_expense_sequence.xml b/addons/hr_expense/hr_expense_sequence.xml
@@ -2,11 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="seq_type_hr_expense_invoice" model="ir.sequence.type">
-            <field name="name">Expense invoice</field>
-            <field name="code">hr.expense.invoice</field>
-        </record>
-
         <record id="seq_hr_expense_invoice" model="ir.sequence">
             <field name="name">Expense invoice</field>
             <field name="code">hr.expense.invoice</field>

diff --git a/addons/hr_payroll/hr_payroll_sequence.xml b/addons/hr_payroll/hr_payroll_sequence.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="seq_type_salary_slip" model="ir.sequence.type">
-            <field name="name">Salary Slip</field>
-            <field name="code">salary.slip</field>
-        </record>
         <record id="seq_salary_slip" model="ir.sequence">
             <field name="name">Salary Slip</field>
             <field name="code">salary.slip</field>

diff --git a/addons/l10n_be/l10n_be_sequence.xml b/addons/l10n_be/l10n_be_sequence.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
-
         <!--
     Sequences for declarantnum will be used in wizard for "Listing of VAT Customers"..in creating xml file
         -->
-    <record model="ir.sequence.type" id="seq_type_declarantnum">
-        <field name="name">Declarantnum</field>
-        <field name="code">declarantnum</field>
-    </record>
     <record model="ir.sequence" id="seq_declarantnum">
         <field name="name">Declarantnum</field>
         <field name="code">declarantnum</field>

diff --git a/addons/l10n_do/__openerp__.py b/addons/l10n_do/__openerp__.py
@@ -48,7 +48,6 @@
     'depends': ['account', 'base_iban'],
     'data': [
         # basic accounting data
-        'data/ir_sequence_type.xml',
         'data/ir_sequence.xml',
         'data/account_journal.xml',
         'data/account.account.type.csv',

diff --git a/addons/l10n_do/data/ir_sequence_type.xml b/addons/l10n_do/data/ir_sequence_type.xml
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -2,16 +2,11 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="seq_type_payment_advice" model="ir.sequence.type">
-            <field name="name">Payment Advice</field>
-            <field name="code">payment.advice</field>
-        </record>
-
         <record id="seq_payment_advice" model="ir.sequence">
             <field name="name">Payment Advice</field>
             <field name="code">payment.advice</field>
             <field name="padding">3</field>
         </record>
 
     </data>
-</openerp>
+</openerp>
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
@@ -13,11 +13,6 @@ This application supports complete integration and production scheduling for sto
 <p>From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</p>]]></field>
         </record>
 
-        <record id="sequence_mrp_prod_type" model="ir.sequence.type">
-            <field name="name">Production order</field>
-            <field name="code">mrp.production</field>
-        </record>
-
         <record id="sequence_mrp_prod" model="ir.sequence">
             <field name="name">Production order</field>
             <field name="code">mrp.production</field>

diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
@@ -44,7 +44,6 @@
     'data': [
         'security/ir.model.access.csv',
         'security/mrp_repair_security.xml',
-        'mrp_repair_data.xml',
         'mrp_repair_sequence.xml',
         'wizard/mrp_repair_cancel_view.xml',
         'wizard/mrp_repair_make_invoice_view.xml',

diff --git a/addons/mrp_repair/mrp_repair_data.xml b/addons/mrp_repair/mrp_repair_data.xml
diff --git a/addons/mrp_repair/mrp_repair_sequence.xml b/addons/mrp_repair/mrp_repair_sequence.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="seq_type_mrp_repair" model="ir.sequence.type">
-            <field name="name">Repair Order</field>
-            <field name="code">mrp.repair</field>
-        </record>
         <record id="seq_mrp_repair" model="ir.sequence">
             <field name="name">Repair Order</field>
             <field name="code">mrp.repair</field>

diff --git a/addons/point_of_sale/point_of_sale_sequence.xml b/addons/point_of_sale/point_of_sale_sequence.xml
@@ -6,21 +6,6 @@
     # Sequences for pos.order
     #
 
-    <record model="ir.sequence.type" id="seq_type_pos_order">
-        <field name="name">POS Order</field>
-        <field name="code">pos.order</field>
-    </record>
-
-    <record model="ir.sequence.type" id="seq_type_pos_order_line">
-        <field name="name">POS order line</field>
-        <field name="code">pos.order.line</field>
-    </record>
-
-    <record model="ir.sequence.type" id="seq_type_pos_session">
-        <field name="name">POS Session</field>
-        <field name="code">pos.session</field>
-    </record>
-
     <record model="ir.sequence" id="seq_pos_session">
         <field name="name">POS Session</field>
         <field name="code">pos.session</field>

diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml
@@ -15,11 +15,6 @@
             <field eval="'(True,)'" name="args"/>
         </record>
 
-        <record id="sequence_proc_group_type" model="ir.sequence.type">
-            <field name="name">Procurement Group</field>
-            <field name="code">procurement.group</field>
-        </record>
-
         <record id="sequence_proc_group" model="ir.sequence">
             <field name="name">Procurement Group</field>
             <field name="code">procurement.group</field>

diff --git a/addons/purchase/purchase_sequence.xml b/addons/purchase/purchase_sequence.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
         <!-- Sequences for purchase.order --> 
-        <record id="seq_type_purchase_order" model="ir.sequence.type">
-            <field name="name">Purchase Order</field>
-            <field name="code">purchase.order</field>
-        </record>
         <record id="seq_purchase_order" model="ir.sequence">
             <field name="name">Purchase Order</field>
             <field name="code">purchase.order</field>

diff --git a/addons/purchase_requisition/purchase_requisition_sequence.xml b/addons/purchase_requisition/purchase_requisition_sequence.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
         <!-- Sequences for purchase.order --> 
-        <record id="seq_type_purchase_requisition" model="ir.sequence.type">
-            <field name="name">Purchase Requisition Order</field>
-            <field name="code">purchase.order.requisition</field>
-        </record>
         <record id="seq_purchase_requisition" model="ir.sequence">
             <field name="name">Purchase Requisition Order</field>
             <field name="code">purchase.order.requisition</field>

diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml
@@ -3,11 +3,6 @@
     <data noupdate="1">
 
         <!-- Sequences for sale.order -->
-        <record id="seq_type_sale_order" model="ir.sequence.type">
-            <field name="name">Sales Order</field>
-            <field name="code">sale.order</field>
-        </record>
-
         <record id="seq_sale_order" model="ir.sequence">
             <field name="name">Sales Order</field>
             <field name="code">sale.order</field>

diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
@@ -150,11 +150,6 @@ watch your stock valuation, and track production lots (based on serial numbers).
             <field name="code">WH</field>
         </record>
 
-        <record id="sequence_mrp_op_type" model="ir.sequence.type">
-            <field name="name">Stock orderpoint</field>
-            <field name="code">stock.orderpoint</field>
-        </record>
-
         <record id="sequence_mrp_op" model="ir.sequence">
             <field name="name">Stock orderpoint</field>
             <field name="code">stock.orderpoint</field>