Merge lp:~openerp-dev/openobject-addons/trunk-move-account-project-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

    I have done following changes,

     -> merged account/project/project* with analytic/analytic*
     -> renamed report name
         cost_ledger.py -> analytic_cost_ledger.py
         quantity_cost_ledger.py -> analytic_quantity_cost_ledger.py
         inverted_analytic_balance.py -> analytic_inverted_balance.py
     ->when deleting a project IF there are no analytic lines defined on the analytic account of the project also delete the analytic account.
     -> when delete an analytic acccount whene there is project IF the project contains NO taks NOR issues also delete the project (instead of the Warning! Please delete the project linked with this account first.)
     -> merged https://pad.openerp.com/p/openerp-project.task-DZ6WAROGUU task.
Thanks,
cod

[lp:~openerp-dev/openobject-addons/trunk-move-account-project-cod]

9399. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Removed some unused code and improved some file

9400. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved model_id in account analytic view file

Unmerged revisions

9400. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved model_id in account analytic view file

9399. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Removed some unused code and improved some file

9398. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved demo data and yml

9397. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved analytic account demo file

9396. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved hr timesheet demo file

9395. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved some demo and data file and also imporved code whent try to unlink project and try to unlink analytic acccount

9394. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved some report file set proper template

9393. By Chirag Dodiya(OpenERP) on 2014-04-29

[MRG]Merged lp:~openerp-dev/openobject-addons/trunk-improve-visibility-contract-analytic-bth-jar

9392. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Removed some code which is already in account_analytic py and xml file

9391. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved code,removed some code which is already in account_analytic.py

=== modified file 'account/__init__.py'
--- account/__init__.py	2012-11-29 22:26:45 +0000
+++ account/__init__.py	2014-04-29 11:49:43 +0000
@@ -22,7 +22,6 @@
 import partner
 import account
 import installer
-import project
 import account_invoice
 import account_bank_statement
 import account_bank
@@ -38,5 +37,6 @@
 import res_currency
 import edi
 import res_config
+import account_analytic
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/__openerp__.py'
--- account/__openerp__.py	2014-04-29 08:18:08 +0000
+++ account/__openerp__.py	2014-04-29 11:49:43 +0000
@@ -96,24 +96,16 @@
         'wizard/account_automatic_reconcile_view.xml',
         'wizard/account_financial_report_view.xml',
         'wizard/pos_box.xml',
-        'project/wizard/project_account_analytic_line_view.xml',
         'account_end_fy.xml',
         'account_invoice_view.xml',
         'data/account_data.xml',
         'data/data_account_type.xml',
         'data/configurable_account_chart.xml',
         'account_invoice_workflow.xml',
-        'project/project_view.xml',
-        'project/project_report.xml',
-        'project/wizard/account_analytic_balance_report_view.xml',
-        'project/wizard/account_analytic_cost_ledger_view.xml',
-        'project/wizard/account_analytic_inverted_balance_report.xml',
-        'project/wizard/account_analytic_journal_report_view.xml',
-        'project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml',
-        'project/wizard/account_analytic_chart_view.xml',
         'partner_view.xml',
         'product_view.xml',
         'account_assert_test.xml',
+        'account_analytic_view.xml',
         'process/statement_process.xml',
         'process/customer_invoice_process.xml',
         'process/supplier_invoice_process.xml',
@@ -137,11 +129,6 @@
         'views/report_partnerledgerother.xml',
         'views/report_financial.xml',
         'views/report_generalledger.xml',
-        'project/views/report_analyticbalance.xml',
-        'project/views/report_analyticjournal.xml',
-        'project/views/report_analyticcostledgerquantity.xml',
-        'project/views/report_analyticcostledger.xml',
-        'project/views/report_invertedanalyticbalance.xml',
     ],
     'js': [
         'static/src/js/account_move_reconciliation.js',
@@ -158,8 +145,6 @@
     ],
     'demo': [
         'demo/account_demo.xml',
-        'project/project_demo.xml',
-        'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
         'demo/account_invoice_demo.xml',
         'account_unit_test.xml',

=== modified file 'account/account.py'
--- account/account.py	2014-04-15 14:29:34 +0000
+++ account/account.py	2014-04-29 11:49:43 +0000
@@ -734,6 +734,7 @@
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
         'cash_control' : fields.boolean('Cash Control', help='If you want the journal should be control at opening/closing, check this option'),
+        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"),
     }
 
     _defaults = {

=== added file 'account/account_analytic.py'
--- account/account_analytic.py	1970-01-01 00:00:00 +0000
+++ account/account_analytic.py	2014-04-29 11:49:43 +0000
@@ -0,0 +1,1 @@
+# -*- coding: utf-8 -*-

=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2013-10-27 12:31:04 +0000
+++ account/account_analytic_line.py	2014-04-29 11:49:43 +0000
@@ -29,13 +29,14 @@
     _columns = {
         'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'),
         'product_id': fields.many2one('product.product', 'Product'),
-        'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
+        'general_account_id': fields.many2one('account.account', 'Financial Account', required=True, ondelete='restrict'),
         'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
         'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
         'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount Currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+        'partner_id': fields.related('account_id', 'partner_id', type='many2one', relation='res.partner', string='Partner', store=True),
     }
 
     _defaults = {

=== added file 'account/account_analytic_view.xml'
--- account/account_analytic_view.xml	1970-01-01 00:00:00 +0000
+++ account/account_analytic_view.xml	2014-04-29 11:49:43 +0000
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_analytic_line_form_1" model="ir.ui.view">
+            <field name="name">account.analytic.line.form.1</field>
+            <field name="model">account.analytic.line</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <field name="journal_id"/>
+                </xpath>
+                <xpath expr="//field[@name='date']" position="after">
+                    <field name="product_id" string="Product"/>
+                    <field name="ref"/>
+                </xpath>
+                <xpath expr="//field[@name='company_id']" position="after">
+                    <field name="partner_id"/>
+                </xpath>
+                <xpath expr="//field[@name='amount']" position="after">
+                    <label for="amount_currency" groups="base.group_multi_currency"/>
+                    <div groups="base.group_multi_currency">
+                        <field name="amount_currency" class="oe_inline"/>
+                        <field name="currency_id" class="oe_inline"/>
+                    </div>
+                    <field invisible="1" name="general_account_id"/>
+                </xpath>
+                <xpath expr="//group[@string='Product Information']" position="replace">
+                    <group string="Product Information">
+                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+                            <label for="unit_amount"/>
+                            <div>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                            </div>
+                        </group>
+                </xpath>
+                <xpath expr="//group[@string='Product Information']" position="after">
+                    <group string="General Accounting">
+                        <field name="general_account_id"/>
+                        <field name="move_id" readonly="1"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_account_analytic_line_tree_1" model="ir.ui.view">
+            <field name="name">account.analytic.line.tree.1</field>
+            <field name="model">account.analytic.line</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date']" position="after">
+                    <field name="ref" invisible="context.get('to_invoice', False)"/>
+                </xpath>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="partner_id"/>
+                    <field name="journal_id" invisible="context.get('to_invoice', False)"/>
+                </xpath>
+                <xpath expr="//field[@name='amount']" position="after">
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
+                </xpath>
+                <xpath expr="//field[@name='unit_amount']" position="after">
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
+                </xpath>
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_account_analytic_line_filter_1" model="ir.ui.view">
+            <field name="name">account.analytic.line.select.1</field>
+            <field name="model">account.analytic.line</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date']" position="after">
+                    <field name="product_id"/>
+                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
+                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
+                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
+                </xpath>
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                </xpath>
+                <xpath expr="//filter[@string='Analytic Account']" position="after">
+                    <filter string="Financial Account" context="{'group_by':'general_account_id'}"/>
+                    <filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
+                </xpath>
+                <xpath expr="//filter[@string='User']" position="before">
+                    <filter string="Product" context="{'group_by':'product_id'}"/>
+                    <filter string="Partner" context="{'group_by':'partner_id'}"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="analytic.action_account_analytic_journal_open_form"
+            id="account_analytic_journal_entries"
+            parent="menu_finance_entries"/>
+            
+        <record id="view_account_journal_1" model="ir.ui.view">
+            <field name="name">account.journal.form.1</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="analytic_journal_id" groups="analytic.group_analytic_accounting"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.values" id="account_analytic_journal_values">
+            <field name="model_id" ref="analytic.model_account_analytic_journal" />
+            <field name="name">Account Analytic Journal</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('analytic.action_account_analytic_journal'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.journal</field>
+        </record>
+        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
+            name="Analytic" parent="account.menu_finance_generic_reporting"
+            sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="analytic.action_account_analytic_journal"
+            id="account_analytic_journal_print" parent="account.next_id_40"/>
+        <menuitem
+            name="Chart of Analytic Accounts"
+            parent="account.menu_finance_charts"
+            action="analytic.action_account_analytic_chart"
+            id="menu_action_analytic_account_tree2"
+            icon="STOCK_INDENT"
+            groups="analytic.group_analytic_accounting"/>
+        <menuitem action="analytic.action_account_analytic_account_form" id="account_analytic_def_account"
+            parent="menu_analytic_accounting"
+            groups="analytic.group_analytic_accounting"/>
+            
+        <menuitem groups="analytic.group_analytic_accounting" action="analytic.action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
+    </data>
+</openerp>

=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml	2013-10-27 12:31:04 +0000
+++ account/demo/account_minimal.xml	2014-04-29 11:49:43 +0000
@@ -315,7 +315,7 @@
             <field name="sequence_id" ref="sequence_sale_journal"/>
             <field name="default_credit_account_id" ref="a_sale"/>
             <field name="default_debit_account_id" ref="a_sale"/>
-            <field name="analytic_journal_id" ref="cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="refund_sales_journal" model="account.journal">
@@ -325,7 +325,7 @@
             <field name="sequence_id" ref="sequence_refund_sales_journal"/>
             <field name="default_credit_account_id" ref="a_sale"/>
             <field name="default_debit_account_id" ref="a_sale"/>
-            <field name="analytic_journal_id" ref="cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
 
@@ -357,7 +357,7 @@
             <field name="sequence_id" ref="sequence_bank_journal"/>
             <field name="default_debit_account_id" ref="bnk"/>
             <field name="default_credit_account_id" ref="bnk"/>
-            <field name="analytic_journal_id" ref="sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="check_journal" model="account.journal">
@@ -367,7 +367,7 @@
             <field name="sequence_id" ref="sequence_check_journal"/>
             <field name="default_debit_account_id" ref="cash"/>
             <field name="default_credit_account_id" ref="cash"/>
-            <field name="analytic_journal_id" ref="sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="cash_journal" model="account.journal">
@@ -387,7 +387,7 @@
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field name="default_debit_account_id" ref="cash"/>
             <field name="default_credit_account_id" ref="cash"/>
-            <field name="analytic_journal_id" ref="sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="miscellaneous_journal" model="account.journal">
@@ -395,7 +395,7 @@
             <field name="code">TMIS</field>
             <field name="type">general</field>
             <field name="sequence_id" ref="sequence_miscellaneous_journal"/>
-            <field name="analytic_journal_id" ref="sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="opening_journal" model="account.journal">

=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2014-04-21 05:05:34 +0000
+++ account/partner_view.xml	2014-04-29 11:49:43 +0000
@@ -54,8 +54,8 @@
             <field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
             <field name="name">Contracts/Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
-            <field name="view_id" ref="view_account_analytic_account_tree"/>
-            <field name="search_view_id" ref="view_account_analytic_account_search"/>
+            <field name="view_id" ref="analytic.view_account_analytic_account_tree"/>
+            <field name="search_view_id" ref="analytic.view_account_analytic_account_search"/>
         </record>
         <record model="ir.ui.view" id="partner_view_buttons">
             <field name="name">partner.view.buttons</field>

=== removed directory 'account/project'
=== removed file 'account/project/__init__.py'
--- account/project/__init__.py	2011-01-14 00:11:01 +0000
+++ account/project/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import project
-import report
-import wizard
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== removed file 'account/project/project.py'
--- account/project/project.py	2013-10-27 12:31:04 +0000
+++ account/project/project.py	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-
-class account_analytic_journal(osv.osv):
-    _name = 'account.analytic.journal'
-    _description = 'Analytic Journal'
-    _columns = {
-        'name': fields.char('Journal Name', size=64, required=True),
-        'code': fields.char('Journal Code', size=8),
-        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
-        'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
-        'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
-    }
-    _defaults = {
-        'active': True,
-        'type': 'general',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-    }
-
-
-class account_journal(osv.osv):
-    _inherit="account.journal"
-
-    _columns = {
-        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"),
-    }
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'account/project/project_view.xml'
--- account/project/project_view.xml	2013-10-27 12:31:04 +0000
+++ account/project/project_view.xml	1970-01-01 00:00:00 +0000
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_account_analytic_account_list" model="ir.ui.view">
-            <field name="name">account.analytic.account.list</field>
-            <field name="model">account.analytic.account</field>
-            <field eval="8" name="priority"/>
-            <field name="arch" type="xml">
-                <tree toolbar="1" colors="red:state=='pending';grey:state in ('cancelled','close');blue:type=='view'" string="Analytic Accounts">
-                    <field name="complete_name"/>
-                    <field name="partner_id"/>
-                    <field name="code"/>
-                    <field name="date_start"/>
-                    <field name="date"/>
-                    <field name="user_id" invisible="1"/>
-                    <field name="manager_id"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="type" invisible="1"/>
-                    <field name="template_id" invisible="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_account_analytic_account_search" model="ir.ui.view">
-            <field name="name">account.analytic.account.search</field>
-            <field name="model">account.analytic.account</field>
-            <field name="arch" type="xml">
-                <search string="Analytic Account">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
-                    <field name="date"/>
-                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
-                    <field name="manager_id"/>
-                    <field name="parent_id"/>
-                    <field name="user_id"/>
-                    <filter string="Open" domain="[('state','=','open')]" help="Current Accounts"/>
-                    <filter string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Associated Partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Type" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="Template" domain="[]" context="{'group_by':'template_id'}"/>
-                        <filter string="Parent Account" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Status" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="view_account_analytic_account_tree" model="ir.ui.view">
-            <field name="name">account.analytic.account.tree</field>
-            <field name="model">account.analytic.account</field>
-            <field name="field_parent">child_complete_ids</field>
-            <field name="arch" type="xml">
-                <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
-                    <field name="name" invisible="1"/>
-                    <field name="complete_name"/>
-                    <field name="code"/>
-                    <field name="debit"/>
-                    <field name="credit"/>
-                    <field name="balance"/>
-                    <field name="state" invisible="1"/>
-                    <field name="currency_id" groups="base.group_multi_currency"/>
-                    <field name="date" invisible="1"/>
-                    <field name="user_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="type"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="template_id" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record id="action_account_analytic_account_form" model="ir.actions.act_window">
-            <field name="name">Analytic Accounts</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.account</field>
-            <field name="context">{}</field> <!-- repair invalid context by setting empty one -->
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_account_analytic_account_tree"/>
-            <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
-        </record>
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account"
-            parent="menu_analytic_accounting"
-            groups="analytic.group_analytic_accounting"/>
-
-        <record id="act_account_renew_view" model="ir.actions.act_window">
-            <field name="name">Accounts to Renew</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.account</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
-            <field name="name">Chart of Analytic Accounts</field>
-            <field name="res_model">account.analytic.account</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_account_analytic_account_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="help" type="html">
-              <p>
-                Click to add a new analytic account.
-              </p><p>
-                The normal chart of accounts has a structure defined by the
-                legal requirement of the country. The analytic chart of
-                accounts structure should reflect your own business needs in
-                term of costs/revenues reporting.
-              </p><p>
-                They are usually structured by contracts, projects, products or
-                departements. Most of the OpenERP operations (invoices,
-                timesheets, expenses, etc) generate analytic entries on the
-                related account.
-              </p>
-            </field>
-        </record>
-
-
-        <record id="view_account_analytic_line_form" model="ir.ui.view">
-            <field name="name">account.analytic.line.form</field>
-            <field name="model">account.analytic.line</field>
-            <field name="priority">1</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Entry" version="7.0">
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="account_id"/>
-                            <field name="journal_id"/>
-                            <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
-                        </group>
-                        <group>
-                            <field name="date"/>
-                            <field name="ref"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
-                        </group>
-                        <group string="Amount">
-                            <field name="amount"/>
-                            <label for="amount_currency" groups="base.group_multi_currency"/>
-                            <div groups="base.group_multi_currency">
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="Product Information">
-                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
-                            <label for="unit_amount"/>
-                            <div>
-                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
-                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="General Accounting">
-                            <field name="general_account_id"/>
-                            <field name="move_id" readonly="1"/>
-                        </group>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="view_account_analytic_line_tree" model="ir.ui.view">
-            <field name="name">account.analytic.line.tree</field>
-            <field name="model">account.analytic.line</field>
-            <field name="arch" type="xml">
-                <tree string="Analytic Entries">
-                    <field name="date"/>
-                    <field name="ref" invisible="context.get('to_invoice', False)"/>
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="journal_id" invisible="context.get('to_invoice', False)"/>
-                    <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field domain="[('type','=','normal')]" name="account_id"/>
-                    <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_account_analytic_line_filter" model="ir.ui.view">
-            <field name="name">account.analytic.line.select</field>
-            <field name="model">account.analytic.line</field>
-            <field name="arch" type="xml">
-                <search string="Search Analytic Lines">
-                    <field name="name" string="Analytic Line"/>
-                    <field name="date"/>
-                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
-                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
-                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
-                    <separator/>
-                    <filter string="My Entries" domain="[('user_id','=',uid)]"/>
-                    <field name="account_id"/>
-                    <field name="user_id"/>
-                    <group string="Group By..." expand="0">
-                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
-                        <filter string="Fin. Account" context="{'group_by':'general_account_id'}"/>
-                        <filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
-                        <separator/>
-                        <filter string="Product" context="{'group_by':'product_id'}"/>
-                        <filter string="User" context="{'group_by':'user_id'}"/>
-                        <separator/>
-                        <filter string="Tasks Month" context="{'group_by':'date'}" name="group_date" help="Invoice Tasks by Month"/>
-
-                    </group>
-                </search>
-            </field>
-        </record>
-        <record id="action_account_analytic_line_form" model="ir.actions.act_window">
-            <field name="name">Analytic Entries</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="view_id" ref="view_account_analytic_line_tree"/>
-        </record>
-
-        <!-- Entries by Line -->
-
-        <record id="action_account_tree1" model="ir.actions.act_window">
-            <field name="name">Analytic Items</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('account_id','child_of',[active_id])]</field>
-            <field name="context">{'account_id':active_id}</field>
-            <field name="search_view_id" ref="view_account_analytic_line_filter"/>
-        </record>
-        <record id="ir_open_account_analytic_account" model="ir.values">
-            <field eval="'tree_but_open'" name="key2"/>
-            <field eval="'account.analytic.account'" name="model"/>
-            <field name="name">Open Account Tree</field>
-            <field eval="'ir.actions.act_window,%d'%action_account_tree1" name="value"/>
-        </record>
-
-        <record id="account_analytic_line_extended_form" model="ir.ui.view">
-            <field name="name">account.analytic.line.extended_form</field>
-            <field name="model">account.analytic.line</field>
-            <field name="arch" type="xml">
-                <form string="Project line" version="7.0">
-                    <group>
-                       <group>
-                          <field name="name"/>
-                          <field name="account_id"/>
-                          <field name="journal_id"/>
-                       </group>
-                       <group>
-                          <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                          <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                        </group>
-                        <group string="Amount">
-                            <field name="amount"/>
-                            <label for="amount_currency" groups="base.group_multi_currency"/>
-                            <div groups="base.group_multi_currency">
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                            <field invisible="1" name="general_account_id"/>
-                        </group>
-                        <group string="Product Information">
-                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
-                            <label for="unit_amount"/>
-                            <div>
-                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
-                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
-                            </div>
-                        </group>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_account_analytic_account_line_extended_form" model="ir.actions.act_window">
-            <field name="name">account.analytic.line.extended</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="account_analytic_line_extended_form"/>
-        </record>
-
-        #
-        # Analytic Journal
-        #
-
-        <record id="view_account_analytic_journal_tree" model="ir.ui.view">
-            <field name="name">account.analytic.journal.tree</field>
-            <field name="model">account.analytic.journal</field>
-            <field name="arch" type="xml">
-                <tree string="Analytic Journal">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="type"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_analytic_journal_search" model="ir.ui.view">
-            <field name="name">account.analytic.journal.search</field>
-            <field name="model">account.analytic.journal</field>
-            <field name="arch" type="xml">
-                <search string="Analytic Journals">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
-                    <field name="type"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="view_account_analytic_journal_form" model="ir.ui.view">
-            <field name="name">account.analytic.journal.form</field>
-            <field name="model">account.analytic.journal</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Journal" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="type"/>
-                        <field name="active"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_account_analytic_journal_form" model="ir.actions.act_window">
-            <field name="name">Analytic Journals</field>
-            <field name="res_model">account.analytic.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_analytic_journal_search" />
-        </record>
-        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
-
-        #
-        # Open journal entries
-        #
-
-        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
-            <field name="name">Analytic Journal Items</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem groups="analytic.group_analytic_accounting"
-            action="action_account_analytic_journal_open_form"
-            id="account_analytic_journal_entries"
-            parent="menu_finance_entries"/>
-
-        #
-        # Reporting
-        #
-
-
-        <record id="view_account_journal_1" model="ir.ui.view">
-            <field name="name">account.journal.form.1</field>
-            <field name="model">account.journal</field>
-            <field name="inherit_id" ref="account.view_account_journal_form"/>
-            <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <field name="analytic_journal_id" groups="analytic.group_analytic_accounting"/>
-                </field>
-            </field>
-        </record>
-
-    </data>
-</openerp>

=== removed file 'account/project/report/cost_ledger.py'
--- account/project/report/cost_ledger.py	2014-04-02 16:40:53 +0000
+++ account/project/report/cost_ledger.py	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-
-class account_analytic_cost_ledger(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-            'lines_g': self._lines_g,
-            'lines_a': self._lines_a,
-            'account_sum_debit': self._account_sum_debit,
-            'account_sum_credit': self._account_sum_credit,
-            'account_sum_balance': self._account_sum_balance,
-            'sum_debit': self._sum_debit,
-            'sum_credit': self._sum_credit,
-            'sum_balance': self._sum_balance,
-        })
-        self.children = {}      # a memo for the method _get_children
-
-    def _get_children(self, accounts):
-        """ return all children accounts of the given accounts
-            :param accounts: list of browse records of 'account.analytic.account'
-            :return: tuple of account ids
-        """
-        analytic_obj = self.pool.get('account.analytic.account')
-        res = set()
-        for account in accounts:
-            if account.id not in self.children:
-                self.children[account.id] = analytic_obj.search(self.cr, self.uid, [('parent_id', 'child_of', [account.id])])
-            res.update(self.children[account.id])
-        return tuple(res)
-
-    def _lines_g(self, account, date1, date2):
-        self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id \
-                FROM account_account AS aa, account_analytic_line AS aal \
-                WHERE (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
-                GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (self._get_children([account]), date1, date2))
-        res = self.cr.dictfetchall()
-        for r in res:
-            r['debit'] = r['balance'] if r['balance'] > 0 else 0.0
-            r['credit'] = -r['balance'] if r['balance'] < 0 else 0.0
-        return res
-
-    def _lines_a(self, general_account, account, date1, date2):
-        self.cr.execute("SELECT aal.name AS name, aal.code AS code, aal.amount AS balance, aal.date AS date, aaj.code AS cj FROM account_analytic_line AS aal, account_analytic_journal AS aaj \
-                WHERE (aal.general_account_id=%s) AND (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) \
-                AND (aal.journal_id=aaj.id) \
-                ORDER BY aal.date, aaj.code, aal.code", (general_account['id'], self._get_children([account]), date1, date2))
-        res = self.cr.dictfetchall()
-        for r in res:
-            r['debit'] = r['balance'] if r['balance'] > 0 else 0.0
-            r['credit'] = -r['balance'] if r['balance'] < 0 else 0.0
-        return res
-
-    def _account_sum_debit(self, account, date1, date2):
-        return self._sum_debit([account], date1, date2)
-
-    def _account_sum_credit(self, account, date1, date2):
-        return self._sum_credit([account], date1, date2)
-
-    def _account_sum_balance(self, account, date1, date2):
-        debit = self._account_sum_debit(account, date1, date2)
-        credit = self._account_sum_credit(account, date1, date2)
-        return (debit-credit)
-
-    def _sum_debit(self, accounts, date1, date2):
-        self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0",
-            (self._get_children(accounts), date1, date2,))
-        return self.cr.fetchone()[0] or 0.0
-
-    def _sum_credit(self, accounts, date1, date2):
-        self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",
-            (self._get_children(accounts), date1, date2,))
-        return self.cr.fetchone()[0] or 0.0
-
-    def _sum_balance(self, accounts, date1, date2):
-        debit = self._sum_debit(accounts, date1, date2)
-        credit = self._sum_credit(accounts, date1, date2)
-        return (debit-credit)
-
-
-class report_analyticcostledger(osv.AbstractModel):
-    _name = 'report.account.report_analyticcostledger'
-    _inherit = 'report.abstract_report'
-    _template = 'account.report_analyticcostledger'
-    _wrapped_report_class = account_analytic_cost_ledger
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'account/project/report/inverted_analytic_balance.py'
--- account/project/report/inverted_analytic_balance.py	2014-04-02 16:40:53 +0000
+++ account/project/report/inverted_analytic_balance.py	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-class account_inverted_analytic_balance(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-            'lines_g': self._lines_g,
-            'lines_a': self._lines_a,
-            'sum_debit': self._sum_debit,
-            'sum_credit': self._sum_credit,
-            'sum_balance': self._sum_balance,
-            'sum_quantity': self._sum_quantity,
-        })
-
-    def _lines_g(self, accounts, date1, date2):
-        ids = map(lambda x: x.id, accounts)
-        self.cr.execute("SELECT aa.name AS name, aa.code AS code, "
-                        "sum(aal.amount) AS balance, "
-                        "sum(aal.unit_amount) AS quantity, aa.id AS id \
-                FROM account_analytic_line AS aal, account_account AS aa \
-                WHERE (aal.general_account_id=aa.id) "
-                        "AND (aal.account_id IN %s) "
-                        "AND (date>=%s) AND (date<=%s) AND aa.active \
-                GROUP BY aal.general_account_id, aa.name, aa.code, aal.code, aa.id "
-                        "ORDER BY aal.code",
-                        (tuple(ids), date1, date2))
-        res = self.cr.dictfetchall()
-        for r in res:
-            if r['balance'] > 0:
-                r['debit'] = r['balance']
-                r['credit'] = 0.0
-            elif r['balance'] < 0:
-                r['debit'] =  0.0
-                r['credit'] = -r['balance']
-            else:
-                r['debit'] = 0.0
-                r['credit'] = 0.0
-        return res
-
-    def _lines_a(self, accounts, general_account_id, date1, date2):
-        ids = map(lambda x: x.id, accounts)
-        self.cr.execute("SELECT sum(aal.amount) AS balance, "
-                        "sum(aal.unit_amount) AS quantity, "
-                        "aaa.code AS code, aaa.name AS name, account_id \
-                FROM account_analytic_line AS aal, "
-                        "account_analytic_account AS aaa \
-                WHERE aal.account_id=aaa.id AND aal.account_id IN %s "
-                        "AND aal.general_account_id=%s AND aal.date>=%s "
-                        "AND aal.date<=%s \
-                GROUP BY aal.account_id, general_account_id, aaa.code, aaa.name "
-                        "ORDER BY aal.account_id",
-                        (tuple(ids), general_account_id, date1, date2))
-        res = self.cr.dictfetchall()
-
-        aaa_obj = self.pool.get('account.analytic.account')
-        res2 = aaa_obj.read(self.cr, self.uid, ids, ['complete_name'])
-        complete_name = {}
-        for r in res2:
-            complete_name[r['id']] = r['complete_name']
-        for r in res:
-            r['complete_name'] = complete_name[r['account_id']]
-            if r['balance'] > 0:
-                r['debit'] = r['balance']
-                r['credit'] = 0.0
-            elif r['balance'] < 0:
-                r['debit'] = 0.0
-                r['credit'] = -r['balance']
-            else:
-                r['debit'] = 0.0
-                r['credit'] = 0.0
-        return res
-
-    def _sum_debit(self, accounts, date1, date2):
-        ids = map(lambda x: x.id, accounts)
-        self.cr.execute("SELECT sum(amount) \
-                FROM account_analytic_line \
-                WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(ids),date1, date2,))
-        return self.cr.fetchone()[0] or 0.0
-
-    def _sum_credit(self, accounts, date1, date2):
-        ids = map(lambda x: x.id, accounts)
-        self.cr.execute("SELECT -sum(amount) \
-                FROM account_analytic_line \
-                WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(ids),date1, date2,))
-        return self.cr.fetchone()[0] or 0.0
-
-    def _sum_balance(self, accounts, date1, date2):
-        debit = self._sum_debit(accounts, date1, date2)
-        credit = self._sum_credit(accounts, date1, date2)
-        return (debit-credit)
-
-    def _sum_quantity(self, accounts, date1, date2):
-        ids = map(lambda x: x.id, accounts)
-        self.cr.execute("SELECT sum(unit_amount) \
-                FROM account_analytic_line \
-                WHERE account_id IN %s AND date>=%s AND date<=%s", (tuple(ids),date1, date2,))
-        return self.cr.fetchone()[0] or 0.0
-
-
-class report_invertedanalyticbalance(osv.AbstractModel):
-    _name = 'report.account.report_invertedanalyticbalance'
-    _inherit = 'report.abstract_report'
-    _template = 'account.report_invertedanalyticbalance'
-    _wrapped_report_class = account_inverted_analytic_balance
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'account/project/report/quantity_cost_ledger.py'
--- account/project/report/quantity_cost_ledger.py	2014-04-02 16:40:53 +0000
+++ account/project/report/quantity_cost_ledger.py	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-
-class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-            'lines_g': self._lines_g,
-            'lines_a': self._lines_a,
-            'sum_quantity': self._sum_quantity,
-            'account_sum_quantity': self._account_sum_quantity,
-        })
-
-    def _lines_g(self, account_id, date1, date2, journals):
-        if not journals:
-            self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, \
-                        aa.code AS code, aa.name AS name, aa.id AS id \
-                    FROM account_account AS aa, account_analytic_line AS aal \
-                    WHERE (aal.account_id=%s) AND (aal.date>=%s) \
-                        AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
-                        AND aa.active \
-                    GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code",
-                    (account_id, date1, date2))
-        else:
-            journal_ids = journals
-            self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, \
-                        aa.code AS code, aa.name AS name, aa.id AS id \
-                    FROM account_account AS aa, account_analytic_line AS aal \
-                    WHERE (aal.account_id=%s) AND (aal.date>=%s) \
-                        AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
-                        AND aa.active \
-                        AND (aal.journal_id IN %s ) \
-                    GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code",
-                    (account_id, date1, date2, tuple(journal_ids)))
-        res = self.cr.dictfetchall()
-        return res
-
-    def _lines_a(self, general_account_id, account_id, date1, date2, journals):
-        if not journals:
-            self.cr.execute("SELECT aal.name AS name, aal.code AS code, \
-                        aal.unit_amount AS quantity, aal.date AS date, \
-                        aaj.code AS cj \
-                    FROM account_analytic_line AS aal, \
-                        account_analytic_journal AS aaj \
-                    WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) \
-                        AND (aal.date>=%s) AND (aal.date<=%s) \
-                        AND (aal.journal_id=aaj.id) \
-                    ORDER BY aal.date, aaj.code, aal.code",
-                    (general_account_id, account_id, date1, date2))
-        else:
-            journal_ids = journals
-            self.cr.execute("SELECT aal.name AS name, aal.code AS code, \
-                        aal.unit_amount AS quantity, aal.date AS date, \
-                        aaj.code AS cj \
-                    FROM account_analytic_line AS aal, \
-                        account_analytic_journal AS aaj \
-                    WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) \
-                        AND (aal.date>=%s) AND (aal.date<=%s) \
-                        AND (aal.journal_id=aaj.id) AND (aaj.id IN %s) \
-                        ORDER BY aal.date, aaj.code, aal.code",
-                    (general_account_id, account_id, date1, date2,tuple(journal_ids)))
-        res = self.cr.dictfetchall()
-        return res
-
-    def _account_sum_quantity(self, account_id, date1, date2, journals):
-        if not journals:
-            self.cr.execute("SELECT sum(unit_amount) \
-                    FROM account_analytic_line \
-                    WHERE account_id=%s AND date>=%s AND date<=%s",
-                    (account_id, date1, date2))
-        else:
-            journal_ids = journals
-            self.cr.execute("SELECT sum(unit_amount) \
-                    FROM account_analytic_line \
-                    WHERE account_id = %s AND date >= %s AND date <= %s \
-                        AND journal_id IN %s",
-                        (account_id, date1, date2, tuple(journal_ids),))
-        return self.cr.fetchone()[0] or 0.0
-
-    def _sum_quantity(self, accounts, date1, date2, journals):
-        ids = map(lambda x: x.id, accounts)
-        if not ids:
-            return 0.0
-        if not journals:
-            self.cr.execute("SELECT sum(unit_amount) \
-                    FROM account_analytic_line \
-                    WHERE account_id IN %s AND date>=%s AND date<=%s",
-                    (tuple(ids), date1, date2,))
-        else:
-            journal_ids = journals
-            self.cr.execute("SELECT sum(unit_amount) \
-                    FROM account_analytic_line \
-                    WHERE account_id IN %s AND date >= %s AND date <= %s \
-                        AND journal_id IN %s",(tuple(ids), date1, date2, tuple(journal_ids)))
-        return self.cr.fetchone()[0] or 0.0
-
-
-class report_analyticcostledgerquantity(osv.AbstractModel):
-    _name = 'report.account.report_analyticcostledgerquantity'
-    _inherit = 'report.abstract_report'
-    _template = 'account.report_analyticcostledgerquantity'
-    _wrapped_report_class = account_analytic_quantity_cost_ledger
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/report/account_analytic_entries_report.py'
--- account/report/account_analytic_entries_report.py	2014-01-29 16:03:48 +0000
+++ account/report/account_analytic_entries_report.py	2014-04-29 11:49:43 +0000
@@ -33,8 +33,8 @@
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=False),
-        'general_account_id': fields.many2one('account.account', 'General Account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
+        'general_account_id': fields.many2one('account.account', 'Financial Account', required=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True),
         'move_id': fields.many2one('account.move.line', 'Move', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),

=== modified file 'account/report/account_analytic_entries_report_view.xml'
--- account/report/account_analytic_entries_report_view.xml	2014-01-29 16:03:48 +0000
+++ account/report/account_analytic_entries_report_view.xml	2014-04-29 11:49:43 +0000
@@ -14,8 +14,8 @@
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                    <filter string="Analytic Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Financial Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>

=== modified file 'account/security/account_security.xml'
--- account/security/account_security.xml	2013-10-27 12:31:04 +0000
+++ account/security/account_security.xml	2014-04-29 11:49:43 +0000
@@ -64,7 +64,7 @@
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
-        <field name="model_id" ref="model_account_analytic_journal"/>
+        <field name="model_id" ref="analytic.model_account_analytic_journal"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>

=== modified file 'account/security/ir.model.access.csv'
--- account/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ account/security/ir.model.access.csv	2014-04-29 11:49:43 +0000
@@ -24,8 +24,8 @@
 access_account_bank_statement_line,account.bank.statement.line,model_account_bank_statement_line,account.group_account_user,1,1,1,1
 access_account_analytic_line_manager,account.analytic.line manager,model_account_analytic_line,account.group_account_manager,1,0,0,0
 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,base.group_user,1,0,0,0
-access_account_analytic_journal,account.analytic.journal,model_account_analytic_journal,account.group_account_user,1,0,0,0
-access_account_analytic_journal_user,account.analytic.journal,model_account_analytic_journal,base.group_user,1,1,1,0
+access_account_analytic_journal,account.analytic.journal,analytic.model_account_analytic_journal,account.group_account_user,1,0,0,0
+access_account_analytic_journal_user,account.analytic.journal,analytic.model_account_analytic_journal,base.group_user,1,1,1,0
 access_account_invoice_uinvoice,account.invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
 access_account_invoice_line_uinvoice,account.invoice.line,model_account_invoice_line,account.group_account_invoice,1,1,1,1
 access_account_invoice_tax_uinvoice,account.invoice.tax,model_account_invoice_tax,account.group_account_invoice,1,1,1,1
@@ -41,8 +41,7 @@
 access_account_period_manager,account.period,model_account_period,account.group_account_manager,1,1,1,1
 access_account_period_invoice,account.period invoice,model_account_period,account.group_account_invoice,1,0,0,0
 access_account_invoice_group_invoice,account.invoice group invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
-access_account_analytic_journal_manager,account.analytic.journal,model_account_analytic_journal,account.group_account_manager,1,1,1,1
-access_account_fiscalyear,account.fiscalyear,model_account_fiscalyear,account.group_account_manager,1,1,1,1
+access_account_analytic_journal_manager,account.analytic.journal,analytic.model_account_analytic_journal,account.group_account_manager,1,1,1,1access_account_fiscalyear,account.fiscalyear,model_account_fiscalyear,account.group_account_manager,1,1,1,1
 access_account_fiscalyear_invoice,account.fiscalyear.invoice,model_account_fiscalyear,account.group_account_invoice,1,0,0,0
 access_account_fiscalyear_partner_manager,account.fiscalyear.partnermanager,model_account_fiscalyear,base.group_partner_manager,1,0,0,0
 access_account_fiscalyear_employee,account.fiscalyear employee,model_account_fiscalyear,base.group_user,1,0,0,0

=== modified file 'account/test/account_fiscalyear_close.yml'
--- account/test/account_fiscalyear_close.yml	2013-11-27 15:32:57 +0000
+++ account/test/account_fiscalyear_close.yml	2014-04-29 11:49:43 +0000
@@ -34,7 +34,7 @@
     name: End of Year
     code: NEW
     type: situation
-    analytic_journal_id: sit
+    analytic_journal_id: analytic.sit
     default_debit_account_id: cash
     default_credit_account_id: cash
     company_id: base.main_company

=== modified file 'account/test/account_report.yml'
--- account/test/account_report.yml	2014-04-02 16:40:53 +0000
+++ account/test/account_report.yml	2014-04-29 11:49:43 +0000
@@ -135,47 +135,47 @@
 -
   !python {model: account.analytic.account}: |
     ctx={}
-    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root')]})
     data_dict = {}
     from openerp.tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_analytic_balance',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_balance',wiz_data=data_dict, context=ctx, our_module='account')
 
 -
  Print the Cost Ledger Report through the wizard
 -
   !python {model: account.analytic.account}: |
     ctx={}
-    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root'),ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_our_super_product')]})
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root'),ref('analytic.analytic_absences'),ref('analytic.analytic_internal'),ref('analytic.analytic_our_super_product')]})
     data_dict = {}
     from openerp.tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_analytic_cost',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_cost',wiz_data=data_dict, context=ctx, our_module='account')
 
 -
  Print the Cost Ledger(Only Quantities) Report through the wizard
 -
   !python {model: account.analytic.account}: |
     ctx={}
-    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root'),ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_our_super_product')]})
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root'),ref('analytic.analytic_absences'),ref('analytic.analytic_internal'),ref('analytic.analytic_our_super_product')]})
     data_dict = {}
     from openerp.tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_analytic_cost_ledger_journal',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_cost_ledger_journal',wiz_data=data_dict, context=ctx, our_module='account')
 
 -
  Print the Analytic Journal Report through the wizard
 -
   !python {model: account.analytic.journal}: |
     ctx={}
-    ctx.update({'model': 'account.analytic.journal','active_ids': [ref('account.cose_journal_sale'), ref('account.exp'), ref('account.sit')]})
+    ctx.update({'model': 'account.analytic.journal','active_ids': [ref('analytic.cose_journal_sale'), ref('account.exp'), ref('analytic.sit')]})
     data_dict = {}
     from openerp.tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_analytic_journal',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_journal',wiz_data=data_dict, context=ctx, our_module='account')
 
 -
  Print the Inverted Analytic Balance Report through the wizard
 -
   !python {model: account.analytic.account}: |
     ctx={}
-    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root')]})
     data_dict = {}
     from openerp.tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'analytic.action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2014-04-01 12:36:57 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2014-04-29 11:49:43 +0000
@@ -197,7 +197,7 @@
         <record id="view_account_analytic_account_tree_c2c_3" model="ir.ui.view">
             <field name="name">account.analytic.account.list.contract</field>
             <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_list"/>
             <field name="arch" type="xml">
                 <field name="date_start" position="before">
                     <field name="last_invoice_date"/>
@@ -280,7 +280,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False)]</field>
             <field name="context">{'search_default_to_invoice': 1}</field>
-            <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
+            <field name="search_view_id" ref="analytic.view_account_analytic_line_filter"/>
             <field name="help" type="html">
               <p>
                 You will find here timesheets and purchases you did for
@@ -338,6 +338,21 @@
             </field>
         </record>
         <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
+        
+        <record id="account_analytic_analysis_form_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.invoice.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button string="Time &amp; Materials to Invoice"
+                        name="%(action_hr_tree_invoiced_all)d"
+                        type="action"
+                        context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== modified file 'account_analytic_analysis/analytic_account_demo.xml'
--- account_analytic_analysis/analytic_account_demo.xml	2013-10-27 12:31:04 +0000
+++ account_analytic_analysis/analytic_account_demo.xml	2014-04-29 11:49:43 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="account.analytic_consultancy" model="account.analytic.account">
+        <record id="analytic.analytic_consultancy" model="account.analytic.account">
             <field name="partner_id" ref="base.res_partner_15"/>
             <field name="invoice_on_timesheets">True</field>
             <field name="hours_qtt_est">1200</field>
@@ -12,16 +12,16 @@
         </record>
 
         <record id="sale.sale_order_4" model="sale.order">
-            <field name="project_id" ref="account.analytic_consultancy"/>
+            <field name="project_id" ref="analytic.analytic_consultancy"/>
         </record>
         
         <record id="hr_timesheet.working_hours_maintenance" model="hr.analytic.timesheet">
-            <field name="account_id" ref="account.analytic_consultancy"/>
+            <field name="account_id" ref="analytic.analytic_consultancy"/>
             <field name="to_invoice" ref="hr_timesheet_invoice.timesheet_invoice_factor1"/>
             <field name="unit_amount">100</field>
         </record>
 
-        <record id="account.analytic_super_product_trainings" model="account.analytic.account">
+        <record id="analytic.analytic_super_product_trainings" model="account.analytic.account">
             <field name="partner_id" ref="base.res_partner_18"/>
             <field name="invoice_on_timesheets">True</field>
             <field name="hours_qtt_est">500</field>
@@ -32,11 +32,11 @@
         </record>
         
         <record id="sale.sale_order_6" model="sale.order">
-            <field name="project_id" ref="account.analytic_super_product_trainings"/>
+            <field name="project_id" ref="analytic.analytic_super_product_trainings"/>
             <field name="partner_id" ref="base.res_partner_1"/>
         </record>
 
-        <record id="account.analytic_support_internal" model="account.analytic.account">
+        <record id="analytic.analytic_support_internal" model="account.analytic.account">
         	<field name="partner_id" ref="base.res_partner_1"/>
             <field name="use_timesheets">True</field>
             <field name="invoice_on_timesheets">True</field>

=== modified file 'account_analytic_plans/test/acount_analytic_plans_report.yml'
--- account_analytic_plans/test/acount_analytic_plans_report.yml	2014-04-02 16:40:53 +0000
+++ account_analytic_plans/test/acount_analytic_plans_report.yml	2014-04-29 11:49:43 +0000
@@ -5,7 +5,7 @@
     import os, time
     import openerp.report
     from openerp import tools
-    data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'journal_ids':[6,0,(ref('account.cose_journal_sale'))],'ref':ref('account.analytic_root'),'empty_line':True,'id':ref('account.analytic_root'),'context':{}}}
-    data, format = openerp.report.render_report(cr, uid, [ref('account.analytic_root')], 'account_analytic_plans.report_crossoveredanalyticplans', data_dict, {})
+    data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'journal_ids':[6,0,(ref('analytic.cose_journal_sale'))],'ref':ref('analytic.analytic_root'),'empty_line':True,'id':ref('analytic.analytic_root'),'context':{}}}
+    data, format = openerp.report.render_report(cr, uid, [ref('analytic.analytic_root')], 'account_analytic_plans.report_crossoveredanalyticplans', data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account_analytic_plans-crossovered_analyitic.'+format), 'wb+').write(data)

=== modified file 'account_budget/account_budget_demo.xml'
--- account_budget/account_budget_demo.xml	2011-11-01 11:28:40 +0000
+++ account_budget/account_budget_demo.xml	2014-04-29 11:49:43 +0000
@@ -42,7 +42,7 @@
     <!-- Budget lines -->
     <data noupdate="1">
         <record id="crossovered_budget_lines_0" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="analytic_account_id" ref="analytic.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="-500.0" name="planned_amount"/>
@@ -50,7 +50,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-01-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_1" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="analytic_account_id" ref="analytic.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-02-01'" name="date_from"/>
             <field eval="-250.0" name="planned_amount"/>
@@ -58,7 +58,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-02-28'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_2" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="analytic_account_id" ref="analytic.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
             <field eval="500.0" name="planned_amount"/>
@@ -66,7 +66,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-01-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_3" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="analytic_account_id" ref="analytic.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-02-07'" name="date_from"/>
             <field eval="900.0" name="planned_amount"/>
@@ -74,7 +74,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-02-28'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_4" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_consultancy"/>
+            <field name="analytic_account_id" ref="analytic.analytic_consultancy"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-03-01'" name="date_from"/>
             <field eval="300.0" name="planned_amount"/>
@@ -84,7 +84,7 @@
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_5" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
+            <field name="analytic_account_id" ref="analytic.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-03-16'" name="date_from"/>
             <field eval="375.0" name="planned_amount"/>
@@ -93,7 +93,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-03-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_6" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
+            <field name="analytic_account_id" ref="analytic.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-04-01'" name="date_from"/>
             <field eval="-150.0" name="planned_amount"/>
@@ -101,7 +101,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-04-30'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_7" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
+            <field name="analytic_account_id" ref="analytic.analytic_super_product_trainings"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-05-01'" name="date_from"/>
             <field eval="375.0" name="planned_amount"/>
@@ -112,7 +112,7 @@
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_8" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-06-01'" name="date_from"/>
             <field eval="-7500.0" name="planned_amount"/>
@@ -120,7 +120,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-06-15'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_9" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-06-16'" name="date_from"/>
             <field eval="-5000.0" name="planned_amount"/>
@@ -128,7 +128,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-06-30'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_10" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-07-01'" name="date_from"/>
             <field eval="-2000.0" name="planned_amount"/>
@@ -136,7 +136,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-07-15'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_11" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-07-16'" name="date_from"/>
             <field eval="20000.0" name="planned_amount"/>
@@ -144,7 +144,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-07-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_12" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p1"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-08-01'" name="date_from"/>
             <field eval="20000.0" name="planned_amount"/>
@@ -154,7 +154,7 @@
     </data>
     <data noupdate="1">
         <record id="crossovered_budget_lines_13" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-08-16'" name="date_from"/>
             <field eval="-3000.0" name="planned_amount"/>
@@ -162,7 +162,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-08-31'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_14" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_purchase0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
             <field eval="-1000.0" name="planned_amount"/>
@@ -170,7 +170,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-09-15'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_15" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-09-16'" name="date_from"/>
             <field eval="10000.0" name="planned_amount"/>
@@ -178,7 +178,7 @@
             <field eval="str(time.localtime(time.time())[0]+1)+'-09-30'" name="date_to"/>
         </record>
         <record id="crossovered_budget_lines_16" model="crossovered.budget.lines">
-            <field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
+            <field name="analytic_account_id" ref="analytic.analytic_seagate_p2"/>
             <field name="general_budget_id" ref="account_budget_post_sales0"/>
             <field eval="str(time.localtime(time.time())[0]+1)+'-10-01'" name="date_from"/>
             <field eval="10000.0" name="planned_amount"/>

=== modified file 'account_budget/test/account_budget.yml'
--- account_budget/test/account_budget.yml	2011-01-14 00:11:01 +0000
+++ account_budget/test/account_budget.yml	2014-04-29 11:49:43 +0000
@@ -16,12 +16,12 @@
 -
   !record {model: crossovered.budget, id: crossovered_budget_budget0}:
     crossovered_budget_line:
-      - analytic_account_id: account.analytic_consultancy
+      - analytic_account_id: analytic.analytic_consultancy
         date_from: !eval "'%s-01-01' %(datetime.now().year+1)"
         date_to: !eval "'%s-12-31' %(datetime.now().year+1)"
         general_budget_id: account_budget.account_budget_post_purchase0
         planned_amount: 10000.0
-      - analytic_account_id: account.analytic_super_product_trainings
+      - analytic_account_id: analytic.analytic_super_product_trainings
         date_from: !eval "'%s-09-01' %(datetime.now().year+1)"
         date_to: !eval "'%s-09-30' %(datetime.now().year+1)"
         general_budget_id: account_budget.account_budget_post_sales0

=== modified file 'account_budget/test/account_budget_report.yml'
--- account_budget/test/account_budget_report.yml	2014-04-02 16:40:53 +0000
+++ account_budget/test/account_budget_report.yml	2014-04-29 11:49:43 +0000
@@ -2,7 +2,7 @@
   Print the Analytic Budget Report through wizard
 -
   !python {model: account.analytic.account}: |
-    ctx = {'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]}
+    ctx = {'model': 'account.analytic.account','active_ids': [ref('analytic.analytic_root')]}
     from openerp.tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_budget_analytic',wiz_data={}, context=ctx, our_module='account_budget')
 

=== modified file 'account_voucher/test/case1_usd_usd.yml'
--- account_voucher/test/case1_usd_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case1_usd_usd.yml	2014-04-29 11:49:43 +0000
@@ -60,7 +60,7 @@
     name: Bank Journal(USD)
     code: BUSD
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account_cash_usd_id
     default_credit_account_id: account_cash_usd_id

=== modified file 'account_voucher/test/case1_usd_usd_payment_rate.yml'
--- account_voucher/test/case1_usd_usd_payment_rate.yml	2013-05-14 12:03:41 +0000
+++ account_voucher/test/case1_usd_usd_payment_rate.yml	2014-04-29 11:49:43 +0000
@@ -60,7 +60,7 @@
     name: Bank Journal(USD)
     code: BUSD
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account_cash_usd_id
     default_credit_account_id: account_cash_usd_id

=== modified file 'account_voucher/test/case2_usd_eur_debtor_in_eur.yml'
--- account_voucher/test/case2_usd_eur_debtor_in_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_usd_eur_debtor_in_eur.yml	2014-04-29 11:49:43 +0000
@@ -54,7 +54,7 @@
     name: Bank Journal(EUR)
     code: BEUR
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
@@ -66,7 +66,7 @@
     name: Bank Journal(USD)
     code: BUSD
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account_cash_usd_id
     default_credit_account_id: account_cash_usd_id

=== modified file 'account_voucher/test/case2_usd_eur_debtor_in_usd.yml'
--- account_voucher/test/case2_usd_eur_debtor_in_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_usd_eur_debtor_in_usd.yml	2014-04-29 11:49:43 +0000
@@ -54,7 +54,7 @@
     name: Bank Journal(EUR)
     code: BEUR
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
@@ -66,7 +66,7 @@
     name: Bank Journal(USD)
     code: BUSD
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account_cash_usd_id
     default_credit_account_id: account_cash_usd_id

=== modified file 'account_voucher/test/case3_eur_eur.yml'
--- account_voucher/test/case3_eur_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case3_eur_eur.yml	2014-04-29 11:49:43 +0000
@@ -22,7 +22,7 @@
     name: Bank Journal(EUR)
     code: BEUR
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash

=== modified file 'account_voucher/test/case4_cad_chf.yml'
--- account_voucher/test/case4_cad_chf.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case4_cad_chf.yml	2014-04-29 11:49:43 +0000
@@ -55,7 +55,7 @@
     name: Bank Journal(CHF)
     code: BCHF
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account_cash_chf_id
     default_credit_account_id: account_cash_chf_id

=== modified file 'account_voucher/test/case5_suppl_usd_usd.yml'
--- account_voucher/test/case5_suppl_usd_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case5_suppl_usd_usd.yml	2014-04-29 11:49:43 +0000
@@ -41,7 +41,7 @@
     name: Bank Journal(EUR)
     code: BEUR
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
@@ -53,7 +53,7 @@
     name: Bank Journal(USD)
     code: BUSD
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account_cash_usd_id2
     default_credit_account_id: account_cash_usd_id2

=== modified file 'account_voucher/test/case_eur_usd.yml'
--- account_voucher/test/case_eur_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case_eur_usd.yml	2014-04-29 11:49:43 +0000
@@ -39,7 +39,7 @@
     name: Bank Journal Test(USD)
     code: BEUSD
     type: bank
-    analytic_journal_id: account.sit
+    analytic_journal_id: analytic.sit
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account_eur_usd_id
     default_credit_account_id: account_eur_usd_id

=== modified file 'analytic/__init__.py'
--- analytic/__init__.py	2011-01-14 00:11:01 +0000
+++ analytic/__init__.py	2014-04-29 11:49:43 +0000
@@ -19,7 +19,9 @@
 #
 ##############################################################################
 
-import analytic
+import models
+import report
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'analytic/__openerp__.py'
--- analytic/__openerp__.py	2012-12-19 17:32:15 +0000
+++ analytic/__openerp__.py	2014-04-29 11:49:43 +0000
@@ -37,11 +37,27 @@
     'data': [
         'security/analytic_security.xml',
         'security/ir.model.access.csv',
-        'analytic_sequence.xml',
-        'analytic_view.xml',
-        'analytic_data.xml',
-    ],
-    'demo': [],
+        'data/analytic_sequence.xml',
+        'views/analytic_view.xml',
+        'data/analytic_data.xml',
+        'wizard/project_account_analytic_line_view.xml',
+        'analytic_report.xml',
+        'wizard/account_analytic_balance_report_view.xml',
+        'wizard/account_analytic_cost_ledger_view.xml',
+        'wizard/account_analytic_inverted_balance_report.xml',
+        'wizard/account_analytic_journal_report_view.xml',
+        'wizard/account_analytic_cost_ledger_for_journal_report_view.xml',
+        'wizard/account_analytic_chart_view.xml',
+        'views/report_analyticbalance.xml',
+        'views/report_analyticjournal.xml',
+        'views/report_analyticcostledgerquantity.xml',
+        'views/report_analyticcostledger.xml',
+        'views/report_invertedanalyticbalance.xml',
+    ],
+    'demo': [
+        'data/analytic_demo.xml',
+        'data/analytic_account_demo.xml',
+    ],
     'installable': True,
     'auto_install': False,
 }

=== renamed file 'account/project/project_report.xml' => 'analytic/analytic_report.xml'
=== added directory 'analytic/data'
=== renamed file 'account/project/analytic_account_demo.xml' => 'analytic/data/analytic_account_demo.xml'
=== renamed file 'analytic/analytic_data.xml' => 'analytic/data/analytic_data.xml'
=== renamed file 'account/project/project_demo.xml' => 'analytic/data/analytic_demo.xml'
=== renamed file 'analytic/analytic_sequence.xml' => 'analytic/data/analytic_sequence.xml'
=== added directory 'analytic/models'
=== added file 'analytic/models/__init__.py'
--- analytic/models/__init__.py	1970-01-01 00:00:00 +0000
+++ analytic/models/__init__.py	2014-04-29 11:49:43 +0000
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import analytic
\ No newline at end of file

=== renamed file 'analytic/analytic.py' => 'analytic/models/analytic.py'
--- analytic/analytic.py	2014-04-01 12:36:57 +0000
+++ analytic/models/analytic.py	2014-04-29 11:49:43 +0000
@@ -321,7 +321,7 @@
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
-
+        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
     }
 
     def _get_default_date(self, cr, uid, context=None):
@@ -349,4 +349,21 @@
         (_check_no_view, 'You cannot create analytic line on view account.', ['account_id']),
     ]
 
+class account_analytic_journal(osv.osv):
+    _name = 'account.analytic.journal'
+    _description = 'Analytic Journal'
+    _columns = {
+        'name': fields.char('Journal Name', size=64, required=True),
+        'code': fields.char('Journal Code', size=8),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
+        'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
+    }
+    _defaults = {
+        'active': True,
+        'type': 'general',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed directory 'account/project/report' => 'analytic/report'
=== modified file 'analytic/report/__init__.py'
--- account/project/report/__init__.py	2011-01-14 00:11:01 +0000
+++ analytic/report/__init__.py	2014-04-29 11:49:43 +0000
@@ -21,9 +21,9 @@
 
 import analytic_journal
 import analytic_balance
-import inverted_analytic_balance
-import cost_ledger
-import quantity_cost_ledger
+import analytic_inverted_balance
+import analytic_cost_ledger
+import analytic_quantity_cost_ledger
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'analytic/report/analytic_balance.py'
--- account/project/report/analytic_balance.py	2014-04-02 16:40:53 +0000
+++ analytic/report/analytic_balance.py	2014-04-29 11:49:43 +0000
@@ -151,7 +151,7 @@
 class report_analyticbalance(osv.AbstractModel):
     _name = 'report.account.report_analyticbalance'
     _inherit = 'report.abstract_report'
-    _template = 'account.report_analyticbalance'
+    _template = 'analytic.report_analyticbalance'
     _wrapped_report_class = account_analytic_balance
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'analytic/report/analytic_cost_ledger.py'
--- analytic/report/analytic_cost_ledger.py	1970-01-01 00:00:00 +0000
+++ analytic/report/analytic_cost_ledger.py	2014-04-29 11:49:43 +0000
@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from openerp.osv import osv
+from openerp.report import report_sxw
+
+
+class account_analytic_cost_ledger(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'time': time,
+            'lines_g': self._lines_g,
+            'lines_a': self._lines_a,
+            'account_sum_debit': self._account_sum_debit,
+            'account_sum_credit': self._account_sum_credit,
+            'account_sum_balance': self._account_sum_balance,
+            'sum_debit': self._sum_debit,
+            'sum_credit': self._sum_credit,
+            'sum_balance': self._sum_balance,
+        })
+        self.children = {}      # a memo for the method _get_children
+
+    def _get_children(self, accounts):
+        """ return all children accounts of the given accounts
+            :param accounts: list of browse records of 'account.analytic.account'
+            :return: tuple of account ids
+        """
+        analytic_obj = self.pool.get('account.analytic.account')
+        res = set()
+        for account in accounts:
+            if account.id not in self.children:
+                self.children[account.id] = analytic_obj.search(self.cr, self.uid, [('parent_id', 'child_of', [account.id])])
+            res.update(self.children[account.id])
+        return tuple(res)
+
+    def _lines_g(self, account, date1, date2):
+        self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id \
+                FROM account_account AS aa, account_analytic_line AS aal \
+                WHERE (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
+                GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (self._get_children([account]), date1, date2))
+        res = self.cr.dictfetchall()
+        for r in res:
+            r['debit'] = r['balance'] if r['balance'] > 0 else 0.0
+            r['credit'] = -r['balance'] if r['balance'] < 0 else 0.0
+        return res
+
+    def _lines_a(self, general_account, account, date1, date2):
+        self.cr.execute("SELECT aal.name AS name, aal.code AS code, aal.amount AS balance, aal.date AS date, aaj.code AS cj FROM account_analytic_line AS aal, account_analytic_journal AS aaj \
+                WHERE (aal.general_account_id=%s) AND (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) \
+                AND (aal.journal_id=aaj.id) \
+                ORDER BY aal.date, aaj.code, aal.code", (general_account['id'], self._get_children([account]), date1, date2))
+        res = self.cr.dictfetchall()
+        for r in res:
+            r['debit'] = r['balance'] if r['balance'] > 0 else 0.0
+            r['credit'] = -r['balance'] if r['balance'] < 0 else 0.0
+        return res
+
+    def _account_sum_debit(self, account, date1, date2):
+        return self._sum_debit([account], date1, date2)
+
+    def _account_sum_credit(self, account, date1, date2):
+        return self._sum_credit([account], date1, date2)
+
+    def _account_sum_balance(self, account, date1, date2):
+        debit = self._account_sum_debit(account, date1, date2)
+        credit = self._account_sum_credit(account, date1, date2)
+        return (debit-credit)
+
+    def _sum_debit(self, accounts, date1, date2):
+        self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0",
+            (self._get_children(accounts), date1, date2,))
+        return self.cr.fetchone()[0] or 0.0
+
+    def _sum_credit(self, accounts, date1, date2):
+        self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",
+            (self._get_children(accounts), date1, date2,))
+        return self.cr.fetchone()[0] or 0.0
+
+    def _sum_balance(self, accounts, date1, date2):
+        debit = self._sum_debit(accounts, date1, date2)
+        credit = self._sum_credit(accounts, date1, date2)
+        return (debit-credit)
+
+
+class report_analyticcostledger(osv.AbstractModel):
+    _name = 'report.account.report_analyticcostledger'
+    _inherit = 'report.abstract_report'
+    _template = 'analytic.report_analyticcostledger'
+    _wrapped_report_class = account_analytic_cost_ledger
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'analytic/report/analytic_inverted_balance.py'
--- analytic/report/analytic_inverted_balance.py	1970-01-01 00:00:00 +0000
+++ analytic/report/analytic_inverted_balance.py	2014-04-29 11:49:43 +0000
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from openerp.osv import osv
+from openerp.report import report_sxw
+
+class account_inverted_analytic_balance(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'time': time,
+            'lines_g': self._lines_g,
+            'lines_a': self._lines_a,
+            'sum_debit': self._sum_debit,
+            'sum_credit': self._sum_credit,
+            'sum_balance': self._sum_balance,
+            'sum_quantity': self._sum_quantity,
+        })
+
+    def _lines_g(self, accounts, date1, date2):
+        ids = map(lambda x: x.id, accounts)
+        self.cr.execute("SELECT aa.name AS name, aa.code AS code, "
+                        "sum(aal.amount) AS balance, "
+                        "sum(aal.unit_amount) AS quantity, aa.id AS id \
+                FROM account_analytic_line AS aal, account_account AS aa \
+                WHERE (aal.general_account_id=aa.id) "
+                        "AND (aal.account_id IN %s) "
+                        "AND (date>=%s) AND (date<=%s) AND aa.active \
+                GROUP BY aal.general_account_id, aa.name, aa.code, aal.code, aa.id "
+                        "ORDER BY aal.code",
+                        (tuple(ids), date1, date2))
+        res = self.cr.dictfetchall()
+        for r in res:
+            if r['balance'] > 0:
+                r['debit'] = r['balance']
+                r['credit'] = 0.0
+            elif r['balance'] < 0:
+                r['debit'] =  0.0
+                r['credit'] = -r['balance']
+            else:
+                r['debit'] = 0.0
+                r['credit'] = 0.0
+        return res
+
+    def _lines_a(self, accounts, general_account_id, date1, date2):
+        ids = map(lambda x: x.id, accounts)
+        self.cr.execute("SELECT sum(aal.amount) AS balance, "
+                        "sum(aal.unit_amount) AS quantity, "
+                        "aaa.code AS code, aaa.name AS name, account_id \
+                FROM account_analytic_line AS aal, "
+                        "account_analytic_account AS aaa \
+                WHERE aal.account_id=aaa.id AND aal.account_id IN %s "
+                        "AND aal.general_account_id=%s AND aal.date>=%s "
+                        "AND aal.date<=%s \
+                GROUP BY aal.account_id, general_account_id, aaa.code, aaa.name "
+                        "ORDER BY aal.account_id",
+                        (tuple(ids), general_account_id, date1, date2))
+        res = self.cr.dictfetchall()
+
+        aaa_obj = self.pool.get('account.analytic.account')
+        res2 = aaa_obj.read(self.cr, self.uid, ids, ['complete_name'])
+        complete_name = {}
+        for r in res2:
+            complete_name[r['id']] = r['complete_name']
+        for r in res:
+            r['complete_name'] = complete_name[r['account_id']]
+            if r['balance'] > 0:
+                r['debit'] = r['balance']
+                r['credit'] = 0.0
+            elif r['balance'] < 0:
+                r['debit'] = 0.0
+                r['credit'] = -r['balance']
+            else:
+                r['debit'] = 0.0
+                r['credit'] = 0.0
+        return res
+
+    def _sum_debit(self, accounts, date1, date2):
+        ids = map(lambda x: x.id, accounts)
+        self.cr.execute("SELECT sum(amount) \
+                FROM account_analytic_line \
+                WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(ids),date1, date2,))
+        return self.cr.fetchone()[0] or 0.0
+
+    def _sum_credit(self, accounts, date1, date2):
+        ids = map(lambda x: x.id, accounts)
+        self.cr.execute("SELECT -sum(amount) \
+                FROM account_analytic_line \
+                WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(ids),date1, date2,))
+        return self.cr.fetchone()[0] or 0.0
+
+    def _sum_balance(self, accounts, date1, date2):
+        debit = self._sum_debit(accounts, date1, date2)
+        credit = self._sum_credit(accounts, date1, date2)
+        return (debit-credit)
+
+    def _sum_quantity(self, accounts, date1, date2):
+        ids = map(lambda x: x.id, accounts)
+        self.cr.execute("SELECT sum(unit_amount) \
+                FROM account_analytic_line \
+                WHERE account_id IN %s AND date>=%s AND date<=%s", (tuple(ids),date1, date2,))
+        return self.cr.fetchone()[0] or 0.0
+
+
+class report_invertedanalyticbalance(osv.AbstractModel):
+    _name = 'report.account.report_invertedanalyticbalance'
+    _inherit = 'report.abstract_report'
+    _template = 'analytic.report_invertedanalyticbalance'
+    _wrapped_report_class = account_inverted_analytic_balance
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'analytic/report/analytic_journal.py'
--- account/project/report/analytic_journal.py	2014-04-02 16:40:53 +0000
+++ analytic/report/analytic_journal.py	2014-04-29 11:49:43 +0000
@@ -62,7 +62,7 @@
 class report_analyticjournal(osv.AbstractModel):
     _name = 'report.account.report_analyticjournal'
     _inherit = 'report.abstract_report'
-    _template = 'account.report_analyticjournal'
+    _template = 'analytic.report_analyticjournal'
     _wrapped_report_class = account_analytic_journal
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'analytic/report/analytic_quantity_cost_ledger.py'
--- analytic/report/analytic_quantity_cost_ledger.py	1970-01-01 00:00:00 +0000
+++ analytic/report/analytic_quantity_cost_ledger.py	2014-04-29 11:49:43 +0000
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from openerp.osv import osv
+from openerp.report import report_sxw
+
+
+class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'time': time,
+            'lines_g': self._lines_g,
+            'lines_a': self._lines_a,
+            'sum_quantity': self._sum_quantity,
+            'account_sum_quantity': self._account_sum_quantity,
+        })
+
+    def _lines_g(self, account_id, date1, date2, journals):
+        if not journals:
+            self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, \
+                        aa.code AS code, aa.name AS name, aa.id AS id \
+                    FROM account_account AS aa, account_analytic_line AS aal \
+                    WHERE (aal.account_id=%s) AND (aal.date>=%s) \
+                        AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
+                        AND aa.active \
+                    GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code",
+                    (account_id, date1, date2))
+        else:
+            journal_ids = journals
+            self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, \
+                        aa.code AS code, aa.name AS name, aa.id AS id \
+                    FROM account_account AS aa, account_analytic_line AS aal \
+                    WHERE (aal.account_id=%s) AND (aal.date>=%s) \
+                        AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
+                        AND aa.active \
+                        AND (aal.journal_id IN %s ) \
+                    GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code",
+                    (account_id, date1, date2, tuple(journal_ids)))
+        res = self.cr.dictfetchall()
+        return res
+
+    def _lines_a(self, general_account_id, account_id, date1, date2, journals):
+        if not journals:
+            self.cr.execute("SELECT aal.name AS name, aal.code AS code, \
+                        aal.unit_amount AS quantity, aal.date AS date, \
+                        aaj.code AS cj \
+                    FROM account_analytic_line AS aal, \
+                        account_analytic_journal AS aaj \
+                    WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) \
+                        AND (aal.date>=%s) AND (aal.date<=%s) \
+                        AND (aal.journal_id=aaj.id) \
+                    ORDER BY aal.date, aaj.code, aal.code",
+                    (general_account_id, account_id, date1, date2))
+        else:
+            journal_ids = journals
+            self.cr.execute("SELECT aal.name AS name, aal.code AS code, \
+                        aal.unit_amount AS quantity, aal.date AS date, \
+                        aaj.code AS cj \
+                    FROM account_analytic_line AS aal, \
+                        account_analytic_journal AS aaj \
+                    WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) \
+                        AND (aal.date>=%s) AND (aal.date<=%s) \
+                        AND (aal.journal_id=aaj.id) AND (aaj.id IN %s) \
+                        ORDER BY aal.date, aaj.code, aal.code",
+                    (general_account_id, account_id, date1, date2,tuple(journal_ids)))
+        res = self.cr.dictfetchall()
+        return res
+
+    def _account_sum_quantity(self, account_id, date1, date2, journals):
+        if not journals:
+            self.cr.execute("SELECT sum(unit_amount) \
+                    FROM account_analytic_line \
+                    WHERE account_id=%s AND date>=%s AND date<=%s",
+                    (account_id, date1, date2))
+        else:
+            journal_ids = journals
+            self.cr.execute("SELECT sum(unit_amount) \
+                    FROM account_analytic_line \
+                    WHERE account_id = %s AND date >= %s AND date <= %s \
+                        AND journal_id IN %s",
+                        (account_id, date1, date2, tuple(journal_ids),))
+        return self.cr.fetchone()[0] or 0.0
+
+    def _sum_quantity(self, accounts, date1, date2, journals):
+        ids = map(lambda x: x.id, accounts)
+        if not ids:
+            return 0.0
+        if not journals:
+            self.cr.execute("SELECT sum(unit_amount) \
+                    FROM account_analytic_line \
+                    WHERE account_id IN %s AND date>=%s AND date<=%s",
+                    (tuple(ids), date1, date2,))
+        else:
+            journal_ids = journals
+            self.cr.execute("SELECT sum(unit_amount) \
+                    FROM account_analytic_line \
+                    WHERE account_id IN %s AND date >= %s AND date <= %s \
+                        AND journal_id IN %s",(tuple(ids), date1, date2, tuple(journal_ids)))
+        return self.cr.fetchone()[0] or 0.0
+
+
+class report_analyticcostledgerquantity(osv.AbstractModel):
+    _name = 'report.account.report_analyticcostledgerquantity'
+    _inherit = 'report.abstract_report'
+    _template = 'analytic.report_analyticcostledgerquantity'
+    _wrapped_report_class = account_analytic_quantity_cost_ledger
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed directory 'account/project/views' => 'analytic/views'
=== renamed file 'analytic/analytic_view.xml' => 'analytic/views/analytic_view.xml'
--- analytic/analytic_view.xml	2014-04-01 12:36:57 +0000
+++ analytic/views/analytic_view.xml	2014-04-29 11:49:43 +0000
@@ -62,5 +62,320 @@
                 </form>
             </field>
         </record>
+        
+        <record id="view_account_analytic_account_list" model="ir.ui.view">
+            <field name="name">account.analytic.account.list</field>
+            <field name="model">account.analytic.account</field>
+            <field eval="8" name="priority"/>
+            <field name="arch" type="xml">
+                <tree toolbar="1" colors="red:state=='pending';grey:state in ('cancelled','close');blue:type=='view'" string="Analytic Accounts">
+                    <field name="complete_name"/>
+                    <field name="partner_id"/>
+                    <field name="code"/>
+                    <field name="date_start"/>
+                    <field name="date"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="manager_id"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <field name="template_id" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_account_search" model="ir.ui.view">
+            <field name="name">account.analytic.account.search</field>
+            <field name="model">account.analytic.account</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Account">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
+                    <field name="date"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                    <field name="manager_id"/>
+                    <field name="parent_id"/>
+                    <field name="user_id"/>
+                    <filter string="Open" domain="[('state','=','open')]" help="Current Accounts"/>
+                    <filter string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Associated Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Template" domain="[]" context="{'group_by':'template_id'}"/>
+                        <filter string="Parent Account" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_account_tree" model="ir.ui.view">
+            <field name="name">account.analytic.account.tree</field>
+            <field name="model">account.analytic.account</field>
+            <field name="field_parent">child_complete_ids</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
+                    <field name="name" invisible="1"/>
+                    <field name="complete_name"/>
+                    <field name="code"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
+                    <field name="balance"/>
+                    <field name="state" invisible="1"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
+                    <field name="date" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="template_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="action_account_analytic_account_form" model="ir.actions.act_window">
+            <field name="name">Analytic Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="context">{}</field> <!-- repair invalid context by setting empty one -->
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_account_analytic_account_tree"/>
+            <field name="search_view_id" ref="analytic.view_account_analytic_account_search"/>
+        </record>
+
+        <record id="act_account_renew_view" model="ir.actions.act_window">
+            <field name="name">Accounts to Renew</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('date','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
+            <field name="filter" eval="True"/>
+        </record>
+
+        <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
+            <field name="name">Chart of Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_analytic_account_tree"/>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="help" type="html">
+              <p>
+                Click to add a new analytic account.
+              </p><p>
+                The normal chart of accounts has a structure defined by the
+                legal requirement of the country. The analytic chart of
+                accounts structure should reflect your own business needs in
+                term of costs/revenues reporting.
+              </p><p>
+                They are usually structured by contracts, projects, products or
+                departements. Most of the OpenERP operations (invoices,
+                timesheets, expenses, etc) generate analytic entries on the
+                related account.
+              </p>
+            </field>
+        </record>
+
+
+        <record id="view_account_analytic_line_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="priority">1</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Entry" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="account_id"/>
+                            <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
+                        </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group string="Amount">
+                            <field name="amount"/>
+                        </group>
+                        <group string="Product Information">
+                            <label for="unit_amount"/>
+                            <div>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                            </div>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="view_account_analytic_line_tree" model="ir.ui.view">
+            <field name="name">account.analytic.line.tree</field>
+            <field name="model">account.analytic.line</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Entries">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity"/>
+                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_account_analytic_line_filter" model="ir.ui.view">
+            <field name="name">account.analytic.line.select</field>
+            <field name="model">account.analytic.line</field>
+            <field name="arch" type="xml">
+                <search string="Search Analytic Lines">
+                    <field name="name" string="Description"/>
+                    <field name="date"/>
+                    <separator/>
+                    <filter string="My Entries" domain="[('user_id','=',uid)]"/>
+                    <field name="account_id" filter_domain="[('account_id','child_of',self)]"/>
+                    <field name="user_id"/>
+                    <group string="Group By..." expand="0">
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                        <separator/>
+                        <filter string="User" context="{'group_by':'user_id'}"/>
+                        <separator/>
+                        <filter string="Tasks Month" context="{'group_by':'date'}" name="group_date" help="Invoice Tasks by Month"/>
+
+                    </group>
+                </search>
+            </field>
+        </record>
+        <record id="action_account_analytic_line_form" model="ir.actions.act_window">
+            <field name="name">Analytic Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="view_id" ref="view_account_analytic_line_tree"/>
+        </record>
+
+        <!-- Entries by Line -->
+
+        <record id="action_account_tree1" model="ir.actions.act_window">
+            <field name="name">Analytic Items</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('account_id','child_of',[active_id])]</field>
+            <field name="context">{'account_id':active_id}</field>
+            <field name="search_view_id" ref="view_account_analytic_line_filter"/>
+        </record>
+        <record id="ir_open_account_analytic_account" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'account.analytic.account'" name="model"/>
+            <field name="name">Open Account Tree</field>
+            <field eval="'ir.actions.act_window,%d'%action_account_tree1" name="value"/>
+        </record>
+
+        <record id="account_analytic_line_extended_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.extended_form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="arch" type="xml">
+                <form string="Project line" version="7.0">
+                    <group>
+                       <group>
+                          <field name="name"/>
+                          <field name="account_id"/>
+                       </group>
+                       <group>
+                          <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                          <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                        </group>
+                        <group string="Amount">
+                            <field name="amount"/>
+                        </group>
+                        <group string="Product Information">
+                            <label for="unit_amount"/>
+                            <div>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                            </div>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_account_analytic_account_line_extended_form" model="ir.actions.act_window">
+            <field name="name">account.analytic.line.extended</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_account_analytic_line_form"/>
+        </record>
+
+        #
+        # Analytic Journal
+        #
+
+        <record id="view_account_analytic_journal_tree" model="ir.ui.view">
+            <field name="name">account.analytic.journal.tree</field>
+            <field name="model">account.analytic.journal</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Journal">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="type"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_analytic_journal_search" model="ir.ui.view">
+            <field name="name">account.analytic.journal.search</field>
+            <field name="model">account.analytic.journal</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Journals">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
+                    <field name="type"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_journal_form" model="ir.ui.view">
+            <field name="name">account.analytic.journal.form</field>
+            <field name="model">account.analytic.journal</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Journal" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="type"/>
+                        <field name="active"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_account_analytic_journal_form" model="ir.actions.act_window">
+            <field name="name">Analytic Journals</field>
+            <field name="res_model">account.analytic.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_analytic_journal_search" />
+        </record>
+
+        #
+        # Open journal entries
+        #
+
+        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+            <field name="name">Analytic Journal Items</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        #
+        # Reporting
+        #
+
+
      </data>
 </openerp>

=== renamed directory 'account/project/wizard' => 'analytic/wizard'
=== modified file 'analytic/wizard/account_analytic_chart.py'
--- account/project/wizard/account_analytic_chart.py	2013-10-27 12:31:04 +0000
+++ analytic/wizard/account_analytic_chart.py	2014-04-29 11:49:43 +0000
@@ -35,7 +35,7 @@
         result_context = {}
         if context is None:
             context = {}
-        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_analytic_account_tree2')
+        result = mod_obj.get_object_reference(cr, uid, 'analytic', 'action_account_analytic_account_tree2')
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
         data = self.read(cr, uid, ids, [])[0]

=== modified file 'analytic/wizard/account_analytic_chart_view.xml'
--- account/project/wizard/account_analytic_chart_view.xml	2014-02-10 05:26:55 +0000
+++ analytic/wizard/account_analytic_chart_view.xml	2014-04-29 11:49:43 +0000
@@ -31,13 +31,5 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem
-            name="Chart of Analytic Accounts"
-            parent="account.menu_finance_charts"
-            action="action_account_analytic_chart"
-            id="menu_action_analytic_account_tree2"
-            icon="STOCK_INDENT"
-            groups="analytic.group_analytic_accounting"/>
-
     </data>
 </openerp>

=== modified file 'analytic/wizard/account_analytic_journal_report_view.xml'
--- account/project/wizard/account_analytic_journal_report_view.xml	2012-11-29 22:26:45 +0000
+++ analytic/wizard/account_analytic_journal_report_view.xml	2014-04-29 11:49:43 +0000
@@ -32,20 +32,13 @@
         </record>
 
         <record model="ir.values" id="account_analytic_journal_values">
-            <field name="model_id" ref="account.model_account_analytic_journal" />
+            <field name="model_id" ref="analytic.model_account_analytic_journal" />
             <field name="name">Account Analytic Journal</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_journal'))" />
             <field name="key">action</field>
             <field name="model">account.analytic.journal</field>
         </record>
-        
-        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
-            name="Analytic" parent="account.menu_finance_generic_reporting"
-            sequence="4"/>
-        <menuitem groups="analytic.group_analytic_accounting"
-            action="account.action_account_analytic_journal"
-            id="account_analytic_journal_print" parent="account.next_id_40"/>
 
     </data>
 </openerp>

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2014-03-10 14:36:00 +0000
+++ hr_expense/hr_expense.py	2014-04-29 11:49:43 +0000
@@ -141,6 +141,8 @@
 
     def expense_confirm(self, cr, uid, ids, context=None):
         for expense in self.browse(cr, uid, ids):
+            if not expense.line_ids:
+                raise osv.except_osv(_('Error!'),_('You cannot submit an expense that has no expense line to the manager.'))
             if expense.employee_id and expense.employee_id.parent_id.user_id:
                 self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
         return self.write(cr, uid, ids, {'state': 'confirm', 'date_confirm': time.strftime('%Y-%m-%d')}, context=context)

=== modified file 'hr_expense/hr_expense_demo.xml'
--- hr_expense/hr_expense_demo.xml	2014-01-09 15:45:50 +0000
+++ hr_expense/hr_expense_demo.xml	2014-04-29 11:49:43 +0000
@@ -45,7 +45,7 @@
         <record id="expenses_line0" model="hr.expense.line">
             <field name="name">Travel Expenses</field>
             <field name="date_value" eval="time.strftime('%Y-08-10')"/>
-            <field name="analytic_account" ref="account.analytic_consultancy"/>
+            <field name="analytic_account" ref="analytic.analytic_consultancy"/>
             <field name="expense_id" ref="expenses0"/>
             <field eval="200.0" name="unit_amount"/>
             <field name="uom_id" ref="product.product_uom_unit"/>
@@ -61,7 +61,7 @@
         <record id="travel_by_air_sep" model="hr.expense.line">
             <field name="name">Travel by Air</field>
             <field name="date_value" eval="time.strftime('%Y-09-03')"/>
-            <field name="analytic_account" ref="account.analytic_consultancy"/>
+            <field name="analytic_account" ref="analytic.analytic_consultancy"/>
             <field name="product_id" ref="air_ticket"/>
             <field name="expense_id" ref="sep_expenses"/>
             <field eval="700.0" name="unit_amount"/>
@@ -72,7 +72,7 @@
         <record id="hotel_bill_sep" model="hr.expense.line">
             <field name="name">Hotel Expenses - Thymbra</field>
             <field name="date_value" eval="time.strftime('%Y-09-20')"/>
-            <field name="analytic_account" ref="account.analytic_nebula"/>
+            <field name="analytic_account" ref="analytic.analytic_nebula"/>
             <field name="product_id" ref="hotel_rent"/>
             <field name="expense_id" ref="sep_expenses"/>
             <field eval="400.0" name="unit_amount"/>
@@ -83,7 +83,7 @@
         <record id="car_travel_sep" model="hr.expense.line">
                 <field name="name">Bruxelles - Paris</field>
                 <field name="date_value" eval="time.strftime('%Y-09-15')"/>
-                <field name="analytic_account" ref="account.analytic_nebula"/>
+                <field name="analytic_account" ref="analytic.analytic_nebula"/>
                 <field name="product_id" ref="car_travel"/>
                 <field name="expense_id" ref="sep_expenses"/>
                 <field eval="0.30" name="unit_amount"/>

=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2014-04-11 13:18:42 +0000
+++ hr_expense/hr_expense_view.xml	2014-04-29 11:49:43 +0000
@@ -66,8 +66,8 @@
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
-                    <button name="action_view_move" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice"/>
+                    <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice,account.group_account_user" class="oe_highlight"/>
+                    <button name="action_view_move" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice,account.group_account_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done,paid" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>

=== modified file 'hr_expense/hr_expense_workflow.xml'
--- hr_expense/hr_expense_workflow.xml	2013-10-27 12:31:04 +0000
+++ hr_expense/hr_expense_workflow.xml	2014-04-29 11:49:43 +0000
@@ -84,7 +84,6 @@
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_done"/>
             <field name="signal">done</field>
-            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t10" model="workflow.transition">

=== modified file 'hr_timesheet/hr_timesheet_demo.xml'
--- hr_timesheet/hr_timesheet_demo.xml	2013-10-27 12:31:04 +0000
+++ hr_timesheet/hr_timesheet_demo.xml	2014-04-29 11:49:43 +0000
@@ -12,16 +12,16 @@
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
-        <record id="account.analytic_administratif" model="account.analytic.account">
-            <field name="use_timesheets">True</field>
-        </record>
-         <record id="account.analytic_partners" model="account.analytic.account">
-            <field name="use_timesheets">True</field>
-        </record>
-        <record id="account.analytic_consultancy" model="account.analytic.account">
-            <field name="use_timesheets">True</field>
-        </record>
-        <record id="account.analytic_super_product_trainings" model="account.analytic.account">
+        <record id="analytic.analytic_administratif" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+         <record id="analytic.analytic_partners" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+        <record id="analytic.analytic_consultancy" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+        <record id="analytic.analytic_super_product_trainings" model="account.analytic.account">
             <field name="use_timesheets">True</field>
         </record>
 
@@ -32,7 +32,7 @@
             <field eval="2.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="product_uom_id" ref="product.product_uom_hour"/>
-            <field name="account_id" ref="account.analytic_administratif"></field>
+            <field name="account_id" ref="analytic.analytic_administratif"></field>
             <field eval="-60.00" name="amount"/>
             <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -45,7 +45,7 @@
             <field eval="1.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="product_uom_id" ref="product.product_uom_hour"/>
-            <field name="account_id" ref="account.analytic_administratif"></field>
+            <field name="account_id" ref="analytic.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -58,7 +58,7 @@
             <field eval="03.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="product_uom_id" ref="product.product_uom_hour"/>
-            <field name="account_id" ref="account.analytic_administratif"></field>
+            <field name="account_id" ref="analytic.analytic_administratif"></field>
             <field eval="-90.00" name="amount"/>
             <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -71,7 +71,7 @@
             <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="product_uom_id" ref="product.product_uom_hour"/>
-            <field name="account_id" ref="account.analytic_administratif"></field>
+            <field name="account_id" ref="analytic.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -84,7 +84,7 @@
             <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="product_uom_id" ref="product.product_uom_hour"/>
-            <field name="account_id" ref="account.analytic_administratif"></field>
+            <field name="account_id" ref="analytic.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>

=== modified file 'hr_timesheet/test/hr_timesheet_demo.yml'
--- hr_timesheet/test/hr_timesheet_demo.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet/test/hr_timesheet_demo.yml	2014-04-29 11:49:43 +0000
@@ -7,5 +7,5 @@
   !record {model: hr.analytic.timesheet, id: working_hours_coding, view: False}:
     user_id: base.user_demo
     date: !eval time.strftime('%Y-%m-%d')
-    account_id: account.analytic_administratif
+    account_id: analytic.analytic_administratif
     unit_amount: 1.0

=== modified file 'hr_timesheet/test/test_hr_timesheet.yml'
--- hr_timesheet/test/test_hr_timesheet.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet/test/test_hr_timesheet.yml	2014-04-29 11:49:43 +0000
@@ -42,7 +42,7 @@
     import time
     from datetime import datetime, date, timedelta
     uid = ref('base.user_demo')
-    new_id = self.create(cr, uid, {'account_id': ref('account.analytic_nebula'),'analytic_amount': 7.0,
+    new_id = self.create(cr, uid, {'account_id': ref('analytic.analytic_nebula'),'analytic_amount': 7.0,
     'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S') ,
     'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module',
     'name': 'Gilles Gravie', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'present'})
@@ -55,7 +55,7 @@
     import time
     from datetime import datetime, date, timedelta
     uid = ref('base.user_demo')
-    new_id = self.create(cr, uid, {'account_id': ref('account.analytic_spark'), 'analytic_amount': 7.0,
+    new_id = self.create(cr, uid, {'account_id': ref('analytic.analytic_spark'), 'analytic_amount': 7.0,
     'date': (datetime.now()+timedelta(2)).strftime('%Y-%m-%d %H:%M:%S'),
     'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module',
     'name': 'Gilles Gravie', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'absent'})

=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_demo.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_demo.xml	2012-12-08 13:21:56 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_demo.xml	2014-04-29 11:49:43 +0000
@@ -11,13 +11,13 @@
             <field name="customer_name">Offered developments</field>
             <field name="factor">100.0</field>
         </record>
-        <record id="account.analytic_spark" model="account.analytic.account">
-            <field name="to_invoice" ref="timesheet_invoice_factor1"/>
-        </record>
-        <record id="account.analytic_nebula" model="account.analytic.account">
-            <field name="to_invoice" ref="timesheet_invoice_factor1"/>
-        </record>
-        <record id="account.analytic_partners_camp_to_camp" model="account.analytic.account">
+        <record id="analytic.analytic_spark" model="account.analytic.account">
+            <field name="to_invoice" ref="timesheet_invoice_factor1"/>
+        </record>
+        <record id="analytic.analytic_nebula" model="account.analytic.account">
+            <field name="to_invoice" ref="timesheet_invoice_factor1"/>
+        </record>
+        <record id="analytic.analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
     </data>

=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml	2014-02-05 16:03:47 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml	2014-04-29 11:49:43 +0000
@@ -80,9 +80,9 @@
         <record id="view_account_analytic_line_search_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.search.to_invoice</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <xpath expr="//filter[@name='others']" position="after">
+                <xpath expr="//field[@name='date']" position="after">
                     <separator/>
                     <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                     <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
@@ -107,7 +107,7 @@
         <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.to_invoice</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="after">
                     <field name="to_invoice"/>
@@ -117,7 +117,7 @@
           <record id="view_account_analytic_line_form_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.form.to_invoice</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="amount" position="before">
                     <field name="to_invoice"/>

=== modified file 'hr_timesheet_invoice/report/hr_timesheet_invoice_report.py'
--- hr_timesheet_invoice/report/hr_timesheet_invoice_report.py	2013-10-27 12:31:04 +0000
+++ hr_timesheet_invoice/report/hr_timesheet_invoice_report.py	2014-04-29 11:49:43 +0000
@@ -35,7 +35,7 @@
         'cost': fields.float('Cost', readonly=True),
         'product_id': fields.many2one('product.product', 'Product',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'general_account_id': fields.many2one('account.account', 'General Account', readonly=True),
+        'general_account_id': fields.many2one('account.account', 'Financial Account', readonly=True),
         'invoice_id': fields.many2one('account.invoice', 'Invoiced', readonly=True),
         'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),

=== modified file 'hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml'
--- hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml	2014-04-29 11:49:43 +0000
@@ -4,7 +4,7 @@
   I create an account analytic line.
 -
   !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0 }:
-    account_id: account.analytic_agrolait
+    account_id: analytic.analytic_agrolait
     amount: -1.0
     general_account_id: account.a_expense
     journal_id: hr_timesheet.analytic_journal
@@ -16,20 +16,20 @@
 -
   Assign partner name and price list in analytic account.
 -
-  !record {model: account.analytic.account, id: account.analytic_agrolait}:
+  !record {model: account.analytic.account, id: analytic.analytic_agrolait}:
     partner_id: base.res_partner_2
     pricelist_id: product.list0
 -
   I open this account and make the state as pending.
 -
   !python {model: account.analytic.account}: |
-    self.set_open(cr, uid, [ref('account.analytic_agrolait')], None)
-    self.set_pending(cr, uid, [ref('account.analytic_agrolait')], None)
+    self.set_open(cr, uid, [ref('analytic.analytic_agrolait')], None)
+    self.set_pending(cr, uid, [ref('analytic.analytic_agrolait')], None)
 -
   I assign account on analytic account line.
 -
   !python {model: hr.analytic.timesheet}: |
-    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')], ref('account.analytic_agrolait'))
+    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')], ref('analytic.analytic_agrolait'))
 
 -
   I create a Tax Codes

=== modified file 'hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml'
--- hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml	2014-04-29 11:49:43 +0000
@@ -4,7 +4,7 @@
   I create an account analytic line.
 -
   !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule1 }:
-    account_id: account.analytic_agrolait
+    account_id: analytic.analytic_agrolait
     amount: -1.0
     general_account_id: account.a_expense
     journal_id: hr_timesheet.analytic_journal
@@ -16,20 +16,20 @@
 -
   Assign partner name and price list in analytic account.
 -
-  !record {model: account.analytic.account, id: account.analytic_agrolait}:
+  !record {model: account.analytic.account, id: analytic.analytic_agrolait}:
     partner_id: base.res_partner_2
     pricelist_id: product.list0
 -
   I open this account and make the state as pending.
 -
   !python {model: account.analytic.account}: |
-    self.set_open(cr, uid, [ref('account.analytic_agrolait')], None)
-    self.set_pending(cr, uid, [ref('account.analytic_agrolait')], None)
+    self.set_open(cr, uid, [ref('analytic.analytic_agrolait')], None)
+    self.set_pending(cr, uid, [ref('analytic.analytic_agrolait')], None)
 -
   I assign account on analytic account line.
 -
   !python {model: hr.analytic.timesheet}: |
-    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule1')], ref('account.analytic_agrolait'))
+    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule1')], ref('analytic.analytic_agrolait'))
 -
   I create a Tax Code
 -

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report.py'
--- hr_timesheet_sheet/report/hr_timesheet_report.py	2014-01-27 13:03:51 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report.py	2014-04-29 11:49:43 +0000
@@ -33,7 +33,7 @@
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product',readonly=True),
         'journal_id' : fields.many2one('account.analytic.journal', 'Journal',readonly=True),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+        'general_account_id' : fields.many2one('account.account', 'Financial Account', readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2014-01-30 13:17:37 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2014-04-29 11:49:43 +0000
@@ -32,7 +32,7 @@
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Financial Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Date (day)" context="{'group_by':'date:day'}" help="Group by day of date"/>
                         <filter string="Date (month)" context="{'group_by':'date:month'}" help="Group by month of date"/>

=== modified file 'hr_timesheet_sheet/report/timesheet_report.py'
--- hr_timesheet_sheet/report/timesheet_report.py	2013-11-27 15:32:57 +0000
+++ hr_timesheet_sheet/report/timesheet_report.py	2014-04-29 11:49:43 +0000
@@ -35,7 +35,7 @@
         'date': fields.date('Date', readonly=True),
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product'),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+        'general_account_id' : fields.many2one('account.account', 'Financial Account', readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),

=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml	2014-01-30 13:20:07 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml	2014-04-29 11:49:43 +0000
@@ -41,7 +41,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
                         <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Financial Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>

=== modified file 'hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml'
--- hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml	2014-04-29 11:49:43 +0000
@@ -45,7 +45,7 @@
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     timesheet_ids:
-      - account_id: account.analytic_agrolait
+      - account_id: analytic.analytic_agrolait
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
         user_id: base.user_demo
@@ -74,7 +74,7 @@
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     timesheet_ids:
-      - account_id: account.analytic_agrolait
+      - account_id: analytic.analytic_agrolait
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
         unit_amount: 2.00

=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml	2014-01-09 15:26:21 +0000
+++ multi_company/multi_company_demo.xml	2014-04-29 11:49:43 +0000
@@ -144,7 +144,7 @@
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
             <field name="default_credit_account_id" ref="account.a_sale"/>
             <field name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
         </record>
@@ -156,7 +156,7 @@
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field name="default_credit_account_id" ref="account.a_sale"/>
             <field name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
         </record>
@@ -192,7 +192,7 @@
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
         </record>
@@ -204,7 +204,7 @@
             <field name="sequence_id" ref="account.sequence_check_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
         </record>
@@ -216,7 +216,7 @@
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
         </record>
@@ -229,7 +229,7 @@
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
             <field name="default_credit_account_id" ref="account.a_sale"/>
             <field name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
@@ -241,7 +241,7 @@
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field name="default_credit_account_id" ref="account.a_sale"/>
             <field name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
@@ -277,7 +277,7 @@
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
@@ -289,7 +289,7 @@
             <field name="sequence_id" ref="account.sequence_check_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
@@ -301,7 +301,7 @@
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
@@ -315,7 +315,7 @@
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
             <field name="default_credit_account_id" ref="account.a_sale"/>
             <field name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
         </record>
@@ -327,7 +327,7 @@
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field name="default_credit_account_id" ref="account.a_sale"/>
             <field name="default_debit_account_id" ref="account.a_sale"/>
-            <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
+            <field name="analytic_journal_id" ref="analytic.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
         </record>
@@ -363,7 +363,7 @@
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
         </record>
@@ -375,7 +375,7 @@
             <field name="sequence_id" ref="account.sequence_check_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
         </record>
@@ -387,7 +387,7 @@
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
             <field name="default_debit_account_id" ref="account.cash"/>
             <field name="default_credit_account_id" ref="account.cash"/>
-            <field name="analytic_journal_id" ref="account.sit"/>
+            <field name="analytic_journal_id" ref="analytic.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
         </record>

=== modified file 'project/project.py'
--- project/project.py	2014-04-07 16:33:18 +0000
+++ project/project.py	2014-04-29 11:49:43 +0000
@@ -166,6 +166,7 @@
     def unlink(self, cr, uid, ids, context=None):
         alias_ids = []
         mail_alias = self.pool.get('mail.alias')
+        analytic_account_obj = self.pool.get('account.analytic.account')
         for proj in self.browse(cr, uid, ids, context=context):
             if proj.tasks:
                 raise osv.except_osv(_('Invalid Action!'),
@@ -174,6 +175,9 @@
                 alias_ids.append(proj.alias_id.id)
         res = super(project, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
+        analytic_account = proj.analytic_account_id
+        if not analytic_account.line_ids:
+            analytic_account_obj.unlink(cr, uid, [analytic_account.id], context=context)
         return res
 
     def _get_attached_docs(self, cr, uid, ids, field_name, arg, context):
@@ -1257,9 +1261,13 @@
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
-        analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])
-        if analytic_ids:
-            raise osv.except_osv(_('Warning!'), _('Please delete the project linked with this account first.'))
+        proj_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])
+        if proj_ids:
+            project = project_obj.browse(cr, uid, proj_ids, context=None)[0]
+            if not project.task_ids:
+                project_obj.unlink(cr, uid, proj_ids, context=None)
+            else:
+                raise osv.except_osv(_('Warning!'), _('Please delete the project linked with this account first.'))
         return super(account_analytic_account, self).unlink(cr, uid, ids, *args, **kwargs)
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):

=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2014-04-07 16:33:18 +0000
+++ project_issue/project_issue.py	2014-04-29 11:49:43 +0000
@@ -543,6 +543,16 @@
         res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or (vals.get('use_issues') and not 'project_creation_in_progress' in context)
 
+def unlink(self, cr, uid, ids, *args, **kwargs):
+        project_obj = self.pool.get('project.project')
+        proj_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])
+        if proj_ids:
+            project = project_obj.browse(cr, uid, proj_ids, context=None)[0]
+            if not project.task_ids and not project.issue_ids:
+                project_obj.unlink(cr, uid, proj_ids, context=None)
+            else:
+                raise osv.except_osv(_('Warning!'), _('Please delete the project linked with this account first.'))
+        return super(account_analytic_account, self).unlink(cr, uid, ids, *args, **kwargs)
 
 class project_project(osv.Model):
     _inherit = 'project.project'

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2013-10-27 12:31:04 +0000
+++ project_timesheet/project_timesheet_view.xml	2014-04-29 11:49:43 +0000
@@ -48,7 +48,7 @@
         <record id="view_account_analytic_line_search_account_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.search.account_id</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
                  <field name="account_id" position="replace">
                      <field name="account_id" string="Analytic account/project"/>
@@ -58,7 +58,7 @@
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
             <field name="name">account.analytic.line.form.account_id</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
                    <field name="account_id" string="Analytic Account/Project" on_change="on_change_account_id(account_id)"/>
@@ -68,7 +68,7 @@
        <record id="view_account_analytic_line_tree_inherit_account_id" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.account_id</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
                     <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>