[MERGE] merge with latest stable

[odoo/odoo.git] / addons / auction / auction_data.xml

diff --git a/addons/auction/auction_data.xml b/addons/auction/auction_data.xml
index 32cc0bc..632219b 100644 (file)
--- a/addons/auction/auction_data.xml
+++ b/addons/auction/auction_data.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
-       <record model="account.account" id="auction_income_view">
-               <field name="name">Auction Adjudications</field>
-               <field name="code">0</field>
-               <field name="type">view</field>
-               <field name="currency_id" search="[('name','=','EUR')]"/>
-               <field name="parent_id" eval="0">
-                       <value search="[('type','=','view')]" model="account.account"/>
-               </field>
-               <field name="user_type" ref="account.account_type_root"/>
-       </record>
+<data noupdate="1">
+       
        
        <!-- Auction lots category data -->
        
@@ -217,7 +208,6 @@
         <field name="code">CSHW</field>
         <field name="parent_id" ref="aie_category_con_view"/>
     </record>  
-
     
     <record model="aie.category" id="aie_category_jew_view">
         <field name="name">Jewelry</field>
@@ -276,83 +266,7 @@
     
     <!-- End Of Auction Lots Category -->
 
-       <record model="account.account" id="auction_expense_view">
-               <field name="name">Auction Adjudication Expenses</field>
-               <field name="code">1</field>
-               <field name="type">view</field>
-               <field name="currency_id" search="[('name','=','EUR')]"/>
-               <field name="parent_id" eval="0">
-                       <value search="[('type','=','view')]" model="account.account"/>
-               </field>
-               <field name="user_type" ref="account.account_type_asset"/>
-       </record>
-
-       <record model="account.account" id="auction_income">
-               <field name="name">Auction Adjudications</field>
-               <field name="code">7x*</field>
-               <!-- <field name="type">income</field> -->
-               <field name="type">other</field>
-               <field name="currency_id" search="[('name','=','EUR')]"/>
-               <field name="parent_id" eval="auction_income_view"/>
-               <field name="user_type" ref="account.account_type_root"/>
-       </record>
-       <record model="account.account" id="auction_expense">
-               <field name="name">Auction Adjudication Expenses</field>
-               <field name="code">6x*</field>
-               <field name="type">other</field>
-               <field name="currency_id" search="[('name','=','EUR')]"/>
-               <field name="parent_id" eval="auction_expense_view"/>
-               <field name="user_type" ref="account.account_type_root"/>
-       </record>
-
-       <record model="account.account" id="auction_income_costs">
-               <field name="name">Auction Buyer Costs</field>
-               <field name="code">8x*</field>
-               <field name="type">payable</field>
-               <field name="currency_id" search="[('name','=','EUR')]"/>
-               <field name="parent_id" eval="auction_income_view"/>
-               <field name="user_type" ref="account.account_type_root"/>
-       </record>
-       <record model="account.account" id="auction_expense_costs">
-               <field name="name">Auction Seller Costs</field>
-               <field name="code">9x*</field>
-               <field name="type">receivable</field>
-               <field name="currency_id" search="[('name','=','EUR')]"/>
-               <field name="parent_id" eval="auction_expense_view"/>
-               <field name="user_type" ref="account.account_type_root"/>
-       </record>
-
-       <record model="account.tax" id="tax_buyer_author">
-               <field name="name">Author rights (4%)</field>
-               <field name="type">percent</field>
-               <field name="applicable_type">code</field>
-               <field name="amount">0.04</field>
-               <field name="domain">sabam</field>
-               <field name="account_collected_id" ref="auction_income_costs"/>
-               <field name="account_paid_id" ref="auction_income_costs"/>
-               <field name="python_applicable">result = (price_unit&gt;=1250)</field>
-       </record>
-       <record model="account.tax" id="tax_buyer">
-               <field name="name">Buyer Costs (20%)</field>
-               <field name="type">percent</field>
-               <field name="amount">0.20</field>
-               <field name="domain">auction</field>
-               <field name="account_collected_id" ref="auction_income_costs"/>
-               <field name="account_paid_id" ref="auction_income_costs"/>
-       </record>
-       <record model="account.tax" id="tax_seller">
-               <field name="name">Seller Costs (12%)</field>
-               <field name="type">percent</field>
-               <field name="amount">-0.12</field>
-               <field name="domain">auction</field>
-               <field name="account_collected_id" ref="auction_expense_costs"/>
-               <field name="account_paid_id" ref="auction_expense_costs"/>
-       </record>
        
-       <record id="product.product_product_pc2" model="product.product">
-               <field name="list_price">770.0</field>
-               <field name="standard_price">700.0</field>
-       </record>
 
 </data>
 </openerp>