Modifs

bzr revid: fp@tinyerp.com-20080903094035-thuv8ks4lkvisvve

4 files changed, 27 insertions, 78 deletions

diff --git a/addons/account_analytic_default/__init__.py b/addons/account_analytic_default/__init__.py
index 01e6db6157e..167f89e049a 100644
--- a/addons/account_analytic_default/__init__.py
+++ b/addons/account_analytic_default/__init__.py
@@ -1 +1 @@
-import product_analytic_default
\ No newline at end of file
+import account_analytic_default
diff --git a/addons/account_analytic_default/__terp__.py b/addons/account_analytic_default/__terp__.py
index fd05c44a341..3327219ba38 100644
--- a/addons/account_analytic_default/__terp__.py
+++ b/addons/account_analytic_default/__terp__.py
@@ -16,7 +16,7 @@ Allows to automatically select analytic accounts based on criterions:
     "depends" : ['account'],
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : ["account_analytic_default.xml"],
+    "update_xml" : ["account_analytic_default_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/account_analytic_default/account_analytic_default.xml b/addons/account_analytic_default/account_analytic_default.xml
deleted file mode 100644
index 33d70750676..00000000000
--- a/addons/account_analytic_default/account_analytic_default.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data>
-        <record id="view_account_analytic_default_tree" model="ir.ui.view">
-            <field name="name">account.analytic.default.tree</field>
-            <field name="model">account.analytic.default</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Analytic Defaults" editable="bottom">
-                    <field name="sequence" string="Seq"/>
-                    <field name="analytic_id" select="1"/>
-                    <field name="product_id" select="2"/>
-                    <field name="partner_id" select="2"/>
-                    <field name="user_id" select="2"/>
-                    <field name="company_id" select="2"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_account_analytic_default_form" model="ir.ui.view">
-            <field name="name">account.analytic.default.form</field>
-            <field name="model">account.analytic.default</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Defaults">
-                    <field name="analytic_id" select="1"/>
-                    <field name="sequence"/>
-                    <separator string="Conditions" colspan="4"/>
-                    <field name="product_id" select="2"/>
-                    <field name="partner_id" select="2"/>
-                    <field name="user_id" select="2"/>
-                    <field name="company_id" select="2"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                </form>
-            </field>
-        </record>
-        <record id="action_analytic_default_form" model="ir.actions.act_window">
-            <field name="name">Analytic Defaults</field>
-            <field name="res_model">account.analytic.default</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem 
-            action="action_analytic_default_form" 
-            id="menu_analytic_defaul_form" 
-            parent="account.menu_analytic_account"/>
-
-    </data>
-</terp>
diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__terp__.py
index d01ab399ec2..389835a27e6 100644
--- a/addons/account_analytic_plans/__terp__.py
+++ b/addons/account_analytic_plans/__terp__.py
@@ -2,35 +2,35 @@
 {
     "name" : "Multiple-plans management in analytic accounting",
     "version" : "1.0",
-    "depends" : ["account", "base","product_analytic_default"],
+    "depends" : ["account", "account_analytic_default"],
     "author" : "Tiny",
-    "description": """The goal is to allow several analytic plans, according to the general journal,
-     so that multiple analytic lines are created when the invoice is confirmed.
-     Second goal is to allow creating automatic analytic entries when writing general entries manually
-     through: Finance > Entries > By Journal.
+    "description": """This module allows to use several analytic plans, according to the general journal,
+so that multiple analytic lines are created when the invoice or the entries
+are confirmed.
 
-     For example, the analytic structure:
-        Projects
-        »···Project 1
-        »···»···SubProj 1.1
-        »···»···SubProj 1.2
-        »···Project 2
-        Salesman
-        »···Eric
-        »···Fabien
+For example, you can define the following analytic structure:
+  Projects
+      Project 1
+          SubProj 1.1
+          SubProj 1.2
+      Project 2
+  Salesman
+      Eric
+      Fabien
 
-        Here, we have two plans: Projects and Salesman. An invoice line must
-        be able to write analytic entries in the 2 plans: SubProj 1.1 and
-        Fabien. The amount can also be splitted, example:
+Here, we have two plans: Projects and Salesman. An invoice line must
+be able to write analytic entries in the 2 plans: SubProj 1.1 and
+Fabien. The amount can also be splitted. The following example is for
+an invoice that touches the two subproject and assigned to one salesman:
 
-        Plan1:
-                SubProject 1.1 : 50%
-                SubProject 1.2 : 50%
-        Plan2:
-                Eric: 100%
+Plan1:
+    SubProject 1.1 : 50%
+    SubProject 1.2 : 50%
+Plan2:
+    Eric: 100%
 
-        So when this line of invoice will be confirmed, It must generate 3
-        analytic lines.
+So when this line of invoice will be confirmed, it will generate 3 analytic lines,
+for one account entry.
         """,
     "website" : "http://tinyerp.com/module_account.html",
     "category" : "Generic Modules/Accounting",
@@ -40,7 +40,7 @@
     ],
     "update_xml" : [
         "ir.model.access.csv",
-"model_wizard.xml","account_analytic_plans_view.xml",
+    "model_wizard.xml","account_analytic_plans_view.xml",
     "account_analytic_plans_report.xml"],
 
     "active": False,