[IMP] analytic: adaptation due to the new Sale module

Major changes:
- Remove reports
- Simplify models

Reason: complete rewrite of the Sale module.

Responsible: fp, dbo, nim

2 files changed, 22 insertions, 175 deletions

diff --git a/addons/analytic/data/analytic_account_demo.xml b/addons/analytic/data/analytic_account_demo.xml
index 678afaf0dc2..09ddaf96846 100644
--- a/addons/analytic/data/analytic_account_demo.xml
+++ b/addons/analytic/data/analytic_account_demo.xml
@@ -1,235 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="analytic_root" model="account.analytic.account">
-            <field name="name" model="res.company" use="name" search="[]"/>
-        </record>
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Leaves</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_our_super_product" model="account.analytic.account">
             <field name="name">Our Super Product</field>
-            <field name="state">open</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_project_1" model="account.analytic.account">
-            <field name="name">Project 1</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_project_2" model="account.analytic.account">
-            <field name="name">Project 2</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_journal_trainings" model="account.analytic.account">
-            <field name="name">Training</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_internal"/>
-        </record>
-        <record id="analytic_in_house" model="account.analytic.account">
-            <field name="name">In House</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_journal_trainings"/>
-        </record>
-        <record id="analytic_online" model="account.analytic.account">
-            <field name="name">Online</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_journal_trainings"/>
-        </record>
-        <record id="analytic_support" model="account.analytic.account">
-            <field name="name">Support</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_partners" model="account.analytic.account">
-            <field name="name">Partners</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_support"/>
-        </record>
-        <record id="analytic_customers" model="account.analytic.account">
-            <field name="name">Customers</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_support"/>
-        </record>
-        <record id="analytic_support_internal" model="account.analytic.account">
-            <field name="name">Internal</field>
-            <field name="type">contract</field>
-            <field name="parent_id" ref="analytic_support"/>
-        </record>
-        <record id="analytic_integration" model="account.analytic.account">
-            <field name="name">Integration</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_consultancy" model="account.analytic.account">
-            <field name="name">Consultancy</field>
-            <field name="type">contract</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_super_product_trainings" model="account.analytic.account">
-            <field name="name">Training</field>
-            <field name="type">contract</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_seagate_p1" model="account.analytic.account">
-            <field name="name">Seagate P1</field>
-            <field name="parent_id" ref="analytic_integration"/>
-            <field name="type">normal</field>
-            <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_integration"/>
-            <field name="state">open</field>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
         </record>
         <record id="analytic_millennium_industries" model="account.analytic.account">
             <field name="name">Millennium Industries</field>
-            <field name="parent_id" ref="analytic_integration"/>
-            <field name="type">normal</field>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_3"/>
+            <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
-            <field name="type">normal</field>
-            <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
-            <field eval="time.strftime('%Y-12-31')" name="date"/>
-            <field name="parent_id" ref="analytic_integration"/>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
-            <field name="state">open</field>
+            <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
             <field name="name">Agrolait</field>
-            <field name="parent_id" ref="analytic_customers"/>
-            <field name="type">normal</field>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_2"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_customers"/>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_1"/>
         </record>
         <record id="analytic_deltapc" model="account.analytic.account">
             <field name="name">Delta PC</field>
-            <field name="parent_id" ref="analytic_customers"/>
-            <field name="type">normal</field>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
         </record>
         <record id="analytic_spark" model="account.analytic.account">
             <field name="name">Spark Systems</field>
-            <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
-            <field eval="time.strftime('%Y-05-08')" name="date"/>
-            <field name="parent_id" ref="analytic_partners"/>
-            <field name="type">normal</field>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_1"/>
-            <field name="state">open</field>
         </record>
         <record id="analytic_nebula" model="account.analytic.account">
             <field name="name">Nebula</field>
-            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
-            <field eval="time.strftime('%Y-07-01')" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
-            <field name="state">open</field>
         </record>
         <record id="analytic_luminous_technologies" model="account.analytic.account">
             <field name="name">Luminous Technologies</field>
-            <field eval="time.strftime('%Y-04-24')" name="date_start"/>
-            <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_3"/>
         </record>
         <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
-            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
-            <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
         </record>
         <record id="analytic_think_big_systems" model="account.analytic.account">
             <field name="name">Think Big Systems</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_18"/>
         </record>
         <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
-            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
-            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
+            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
-            <field name="state">open</field>
-        </record>
-        <record id="analytic_project_2_support" model="account.analytic.account">
-            <field name="name">Support</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_2"/>
-        </record>
-        <record id="analytic_project_2_development" model="account.analytic.account">
-            <field name="name">Development</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_2"/>
-        </record>
-        <record id="analytic_project_1_trainings" model="account.analytic.account">
-            <field name="name">Training</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_1"/>
-        </record>
-        <record id="analytic_project_1_development" model="account.analytic.account">
-            <field name="name">Development</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_administratif" model="account.analytic.account">
             <field name="name">Administrative</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_internal"/>
+            <field name="account_type">normal</field>
         </record>
         <record id="analytic_commercial_marketing" model="account.analytic.account">
             <field name="name">Commercial &amp; Marketing</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_internal"/>
-        </record>
-        <record id="analytic_our_super_product_development" model="account.analytic.account">
-            <field name="name">Our Super Product Development</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_internal"/>
-        </record>
-        <record id="analytic_stable" model="account.analytic.account">
-            <field name="name">Stable</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_our_super_product_development"/>
-        </record>
-        <record id="analytic_trunk" model="account.analytic.account">
-            <field name="name">Trunk</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_our_super_product_development"/>
-        </record>
-        <record id="analytic_paid" model="account.analytic.account">
-            <field name="name">Paid</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_absences"/>
-        </record>
-        <record id="analytic_unpaid" model="account.analytic.account">
-            <field name="name">Unpaid</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_absences"/>
+            <field name="account_type">normal</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/analytic/data/analytic_demo.xml b/addons/analytic/data/analytic_demo.xml
index 5ce34521b45..7b8635d3c1b 100644
--- a/addons/analytic/data/analytic_demo.xml
+++ b/addons/analytic/data/analytic_demo.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="cose_journal_sale" model="account.analytic.journal">
-            <field name="code">SAL</field>
-            <field name="name">Sales</field>
-            <field name="type">sale</field>
-        </record>
-        <record id="sit" model="account.analytic.journal">
-            <field name="code">START</field>
-            <field name="name">Miscellaneous Operation</field>
-            <field name="type">situation</field>
+
+        <record id="tag_contract" model="account.analytic.tag">
+            <field name="name">Contracts</field>
         </record>
+
     </data>
 </openerp>