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

[Thibault Delavallée (OpenERP)]

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

Please use commit messages that explain why you do a change; improved code is not a usefull commit message and won't help developers to undersatnd your code. Thanks !

Thibault.

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

9289. By Chirag Dodiya(OpenERP) on 2014-04-04

[IMP]Improved code

[Chirag Dodiya(OpenERP) (chirag.dodiya-openerp)]

Hello @tde,

Sorry for inconvenience, I will take care of it from next time.
Details of commits:
    Rev No. 9287 :
     > [IMP] Moved view of account analytic line in analytic module.

    Rev No, 9288 :
     > [IMP] Improved code for filter and replace filter with the field

    Rev No. 9289 :
     > [IMP] Improved xpath for replace filter with the field.

Thanks.

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

9290. By Chirag Dodiya(OpenERP) on 2014-04-04

[MRG]Merge with lp:openobject-addons

9291. By Chirag Dodiya(OpenERP) on 2014-04-09

[MRG]Merged lp:~openerp-dev/openobject-addons/trunk-improve-visibility-contract-analytic-bth-jar, for Merge the task -> Visibility: contracts/analytic accounts

9292. By Chirag Dodiya(OpenERP) on 2014-04-09

[MRG]Merged with lp:openobject-addons and resolved some conflicts

9293. By Chirag Dodiya(OpenERP) on 2014-04-09

[IMP]Improved openerp py file:removed project report view file.

9294. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved py file for analytic report, improved tempate id

9295. By Chirag Dodiya(OpenERP) on 2014-04-10

[MRG]Merged with lp:openobject-addons

9296. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved yml test case of account analytic plans

9297. By Chirag Dodiya(OpenERP) on 2014-04-25

[MRG]Merged with lp:openobject-addons

9298. By Chirag Dodiya(OpenERP) on 2014-04-28

[MRG]Merged with lp:openobject-addons

Unmerged revisions

9298. By Chirag Dodiya(OpenERP) on 2014-04-28

[MRG]Merged with lp:openobject-addons

9297. By Chirag Dodiya(OpenERP) on 2014-04-25

[MRG]Merged with lp:openobject-addons

9296. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved yml test case of account analytic plans

9295. By Chirag Dodiya(OpenERP) on 2014-04-10

[MRG]Merged with lp:openobject-addons

9294. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved py file for analytic report, improved tempate id

9293. By Chirag Dodiya(OpenERP) on 2014-04-09

[IMP]Improved openerp py file:removed project report view file.

9292. By Chirag Dodiya(OpenERP) on 2014-04-09

[MRG]Merged with lp:openobject-addons and resolved some conflicts

9291. By Chirag Dodiya(OpenERP) on 2014-04-09

[MRG]Merged lp:~openerp-dev/openobject-addons/trunk-improve-visibility-contract-analytic-bth-jar, for Merge the task -> Visibility: contracts/analytic accounts

9290. By Chirag Dodiya(OpenERP) on 2014-04-04

[MRG]Merge with lp:openobject-addons

9289. By Chirag Dodiya(OpenERP) on 2014-04-04

[IMP]Improved code

=== modified file 'account/__init__.py'
--- account/__init__.py	2012-11-29 22:26:45 +0000
+++ account/__init__.py	2014-04-28 09:41:45 +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-03 09:18:18 +0000
+++ account/__openerp__.py	2014-04-28 09:41:45 +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',
@@ -124,7 +116,6 @@
         'account_bank_view.xml',
         'res_config_view.xml',
         'account_pre_install.yml',
-
         'views/report_vat.xml',
         'views/report_invoice.xml',
         'views/report_trialbalance.xml',
@@ -139,11 +130,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',
@@ -160,8 +146,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',
 
=== added file 'account/account_analytic.py'
--- account/account_analytic.py	1970-01-01 00:00:00 +0000
+++ account/account_analytic.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,37 @@
+# -*- 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_journal(osv.osv):
+    _inherit="account.journal"
+
+    _columns = {
+        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"),
+    }
+    
+class account_analytic_journal(osv.osv):
+    _inherit="account.analytic.journal"
+    
+    _columns = {
+        'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
+    }
 
=== 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-28 09:41:45 +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-28 09:41:45 +0000
@@ -0,0 +1,159 @@
+<?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>
+                </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>
+        <record id="account_analytic_line_extended_form_1" model="ir.ui.view">
+            <field name="name">account.analytic.line.extended_form.1</field>
+            <field name="model">account.analytic.line</field>
+            <field name="inherit_id" ref="analytic.account_analytic_line_extended_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <field name="journal_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="after">
+                    <group string="General Accounting">
+                        <field name="general_account_id"/>
+                        <field name="move_id" readonly="1"/>
+                    </group>
+                </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="account.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-28 09:41:45 +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	2013-10-27 12:31:04 +0000
+++ account/partner_view.xml	2014-04-28 09:41:45 +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/analytic_account_demo.xml'
--- account/project/analytic_account_demo.xml	2012-12-21 16:48:08 +0000
+++ account/project/analytic_account_demo.xml	1970-01-01 00:00:00 +0000
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="analytic_root" model="account.analytic.account">
-            <field name="name" model="res.company" use="name" search="[]"/>
-        </record>
-        <record id="analytic_absences" model="account.analytic.account">
-            <field name="name">Leaves</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_internal" model="account.analytic.account">
-            <field name="name">Internal</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_our_super_product" model="account.analytic.account">
-            <field name="name">Our Super Product</field>
-            <field name="state">open</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_project_1" model="account.analytic.account">
-            <field name="name">Project 1</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_project_2" model="account.analytic.account">
-            <field name="name">Project 2</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_root"/>
-        </record>
-        <record id="analytic_journal_trainings" model="account.analytic.account">
-            <field name="name">Training</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_internal"/>
-        </record>
-        <record id="analytic_in_house" model="account.analytic.account">
-            <field name="name">In House</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_journal_trainings"/>
-        </record>
-        <record id="analytic_online" model="account.analytic.account">
-            <field name="name">Online</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_journal_trainings"/>
-        </record>
-        <record id="analytic_support" model="account.analytic.account">
-            <field name="name">Support</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_partners" model="account.analytic.account">
-            <field name="name">Partners</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_support"/>
-        </record>
-        <record id="analytic_customers" model="account.analytic.account">
-            <field name="name">Customers</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_support"/>
-        </record>
-        <record id="analytic_support_internal" model="account.analytic.account">
-            <field name="name">Internal</field>
-            <field name="type">contract</field>
-            <field name="parent_id" ref="analytic_support"/>
-        </record>
-        <record id="analytic_integration" model="account.analytic.account">
-            <field name="name">Integration</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_consultancy" model="account.analytic.account">
-            <field name="name">Consultancy</field>
-            <field name="type">contract</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_super_product_trainings" model="account.analytic.account">
-            <field name="name">Training</field>
-            <field name="type">contract</field>
-            <field name="parent_id" ref="analytic_our_super_product"/>
-        </record>
-        <record id="analytic_seagate_p1" model="account.analytic.account">
-            <field name="name">Seagate P1</field>
-            <field name="parent_id" ref="analytic_integration"/>
-            <field name="type">normal</field>
-            <field name="state">open</field>
-            <field name="partner_id" ref="base.res_partner_19"/>
-        </record>
-        <record id="analytic_seagate_p2" model="account.analytic.account">
-            <field name="name">Seagate P2</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_integration"/>
-            <field name="state">open</field>
-            <field name="partner_id" ref="base.res_partner_19"/>
-        </record>
-        <record id="analytic_millennium_industries" model="account.analytic.account">
-            <field name="name">Millennium Industries</field>
-            <field name="parent_id" ref="analytic_integration"/>
-            <field name="type">normal</field>
-            <field name="partner_id" ref="base.res_partner_15"/>
-        </record>
-        <record id="analytic_integration_c2c" model="account.analytic.account">
-            <field name="name">CampToCamp</field>
-            <field name="type">normal</field>
-            <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
-            <field eval="time.strftime('%Y-12-31')" name="date"/>
-            <field name="parent_id" ref="analytic_integration"/>
-            <field name="partner_id" ref="base.res_partner_12"/>
-            <field name="state">open</field>
-        </record>
-        <record id="analytic_agrolait" model="account.analytic.account">
-            <field name="name">Agrolait</field>
-            <field name="parent_id" ref="analytic_customers"/>
-            <field name="type">normal</field>
-            <field name="partner_id" ref="base.res_partner_2"/>
-        </record>
-        <record id="analytic_asustek" model="account.analytic.account">
-            <field name="name">Asustek</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_customers"/>
-            <field name="partner_id" ref="base.res_partner_1"/>
-        </record>
-        <record id="analytic_deltapc" model="account.analytic.account">
-            <field name="name">Delta PC</field>
-            <field name="parent_id" ref="analytic_customers"/>
-            <field name="type">normal</field>
-            <field name="partner_id" ref="base.res_partner_4"/>
-        </record>
-        <record id="analytic_spark" model="account.analytic.account">
-            <field name="name">Spark Systems</field>
-            <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
-            <field eval="time.strftime('%Y-05-08')" name="date"/>
-            <field name="parent_id" ref="analytic_partners"/>
-            <field name="type">normal</field>
-            <field name="partner_id" ref="base.res_partner_16"/>
-            <field name="state">open</field>
-        </record>
-        <record id="analytic_nebula" model="account.analytic.account">
-            <field name="name">Nebula</field>
-            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
-            <field eval="time.strftime('%Y-07-01')" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
-            <field name="partner_id" ref="base.res_partner_17"/>
-            <field name="state">open</field>
-        </record>
-        <record id="analytic_luminous_technologies" model="account.analytic.account">
-            <field name="name">Luminous Technologies</field>
-            <field eval="time.strftime('%Y-04-24')" name="date_start"/>
-            <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
-            <field name="partner_id" ref="base.res_partner_11"/>
-        </record>
-        <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
-            <field name="name">Desertic - Hispafuentes</field>
-            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
-            <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
-            <field name="partner_id" ref="base.res_partner_12"/>
-        </record>
-        <record id="analytic_think_big_systems" model="account.analytic.account">
-            <field name="name">Think Big Systems</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
-            <field name="partner_id" ref="base.res_partner_18"/>
-        </record>
-        <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
-            <field name="name">Camp to Camp</field>
-            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
-            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_partners"/>
-            <field name="partner_id" ref="base.res_partner_12"/>
-            <field name="state">open</field>
-        </record>
-        <record id="analytic_project_2_support" model="account.analytic.account">
-            <field name="name">Support</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_2"/>
-        </record>
-        <record id="analytic_project_2_development" model="account.analytic.account">
-            <field name="name">Development</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_2"/>
-        </record>
-        <record id="analytic_project_1_trainings" model="account.analytic.account">
-            <field name="name">Training</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_1"/>
-        </record>
-        <record id="analytic_project_1_development" model="account.analytic.account">
-            <field name="name">Development</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_project_1"/>
-        </record>
-        <record id="analytic_administratif" model="account.analytic.account">
-            <field name="name">Administrative</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_internal"/>
-        </record>
-        <record id="analytic_commercial_marketing" model="account.analytic.account">
-            <field name="name">Commercial &amp; Marketing</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_internal"/>
-        </record>
-        <record id="analytic_our_super_product_development" model="account.analytic.account">
-            <field name="name">Our Super Product Development</field>
-            <field name="type">view</field>
-            <field name="parent_id" ref="analytic_internal"/>
-        </record>
-        <record id="analytic_stable" model="account.analytic.account">
-            <field name="name">Stable</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_our_super_product_development"/>
-        </record>
-        <record id="analytic_trunk" model="account.analytic.account">
-            <field name="name">Trunk</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_our_super_product_development"/>
-        </record>
-        <record id="analytic_paid" model="account.analytic.account">
-            <field name="name">Paid</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_absences"/>
-        </record>
-        <record id="analytic_unpaid" model="account.analytic.account">
-            <field name="name">Unpaid</field>
-            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_absences"/>
-        </record>
-    </data>
-</openerp>
 
=== 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_demo.xml'
--- account/project/project_demo.xml	2013-12-10 15:29:57 +0000
+++ account/project/project_demo.xml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="cose_journal_sale" model="account.analytic.journal">
-            <field name="code">SAL</field>
-            <field name="name">Sales</field>
-            <field name="type">sale</field>
-        </record>
-        <record id="sit" model="account.analytic.journal">
-            <field name="code">START</field>
-            <field name="name">Miscellaneous Operation</field>
-            <field name="type">situation</field>
-        </record>
-    </data>
-</openerp>
 
=== removed file 'account/project/project_report.xml'
--- account/project/project_report.xml	2014-03-27 18:25:20 +0000
+++ account/project/project_report.xml	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <report 
-            id="action_account_analytic_account_inverted_balance"
-            model="account.analytic.account"
-            string="Inverted Analytic Balance"
-            report_type="qweb-pdf"
-            name="account.report_invertedanalyticbalance"
-            file="account.report_invertedanalyticbalance"
-            menu="False"
-        />
-
-        <report 
-            id="action_report_analytic_journal"
-            model="account.analytic.journal"
-            string="Analytic Journal"
-            report_type="qweb-pdf"
-            name="account.report_analyticjournal"
-            file="account.report_analyticjournal"
-            menu="False"
-        />
-
-         <report
-            id="action_report_analytic_balance"
-            model="account.analytic.account"
-            string="Analytic Balance"
-            report_type="qweb-pdf"
-            name="account.report_analyticbalance"
-            file="account.report_analyticbalance"
-            menu="False"
-        />
-
-        <report
-            id="action_report_cost_ledger"
-            model="account.analytic.account"
-            report_type="qweb-pdf"
-            string="Cost Ledger"
-            name="account.report_analyticcostledger"
-            file="account.report_analyticcostledger"
-            menu="False"
-        />
-
-        <report
-            id="action_report_cost_ledgerquantity"
-            model="account.analytic.account"
-            report_type="qweb-pdf"
-            string="Cost Ledger (Only quantities)"
-            name="account.report_analyticcostledgerquantity"
-            file="account.report_analyticcostledgerquantity"
-            menu="False"
-        />
-    </data>
-</openerp>
 
=== 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 directory 'account/project/report'
=== removed file 'account/project/report/__init__.py'
--- account/project/report/__init__.py	2011-01-14 00:11:01 +0000
+++ account/project/report/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,29 +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 analytic_journal
-import analytic_balance
-import inverted_analytic_balance
-import cost_ledger
-import quantity_cost_ledger
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
 
=== removed file 'account/project/report/analytic_balance.py'
--- account/project/report/analytic_balance.py	2014-04-02 16:40:53 +0000
+++ account/project/report/analytic_balance.py	1970-01-01 00:00:00 +0000
@@ -1,157 +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_balance(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_analytic_balance, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-            'get_objects': self._get_objects,
-            'lines_g': self._lines_g,
-            'move_sum': self._move_sum,
-            'sum_all': self._sum_all,
-            'sum_balance': self._sum_balance,
-            'move_sum_balance': self._move_sum_balance,
-        })
-        self.acc_ids = []
-        self.read_data = []
-        self.empty_acc = False
-        self.acc_data_dict = {}# maintains a relation with an account with its successors.
-        self.acc_sum_list = []# maintains a list of all ids
-
-    def get_children(self, ids):
-        read_data = self.pool.get('account.analytic.account').read(self.cr, self.uid, ids,['child_ids','code','complete_name','balance'])
-        for data in read_data:
-            if (data['id'] not in self.acc_ids):
-                inculde_empty =  True
-                if (not self.empty_acc) and data['balance'] == 0.00:
-                    inculde_empty = False
-                if inculde_empty:
-                    self.acc_ids.append(data['id'])
-                    self.read_data.append(data)
-                    if data['child_ids']:
-                        self.get_children(data['child_ids'])
-        return True
-
-    def _get_objects(self, empty_acc):
-        if self.read_data:
-            return self.read_data
-        self.empty_acc = empty_acc
-        self.read_data = []
-        self.get_children(self.ids)
-        return self.read_data
-
-    def _lines_g(self, account_id, date1, date2):
-        account_analytic_obj = self.pool.get('account.analytic.account')
-        ids = account_analytic_obj.search(self.cr, self.uid,
-                [('parent_id', 'child_of', [account_id])])
-        self.cr.execute("SELECT aa.name AS name, aa.code AS code, \
-                    sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity \
-                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 \
-                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['balance'] == 0
-                r['debit'] = 0.0
-                r['credit'] = 0.0
-        return res
-
-    def _move_sum(self, account_id, date1, date2, option):
-        if account_id not in self.acc_data_dict:
-            account_analytic_obj = self.pool.get('account.analytic.account')
-            ids = account_analytic_obj.search(self.cr, self.uid,[('parent_id', 'child_of', [account_id])])
-            self.acc_data_dict[account_id] = ids
-        else:
-            ids = self.acc_data_dict[account_id]
-
-        query_params = (tuple(ids), date1, date2)
-        if option == "credit":
-            self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
-                    WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
-        elif option == "debit":
-            self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
-                    WHERE account_id IN %s\
-                        AND date>=%s AND date<=%s AND amount>0",query_params)
-        elif option == "quantity":
-            self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
-                WHERE account_id IN %s\
-                    AND date>=%s AND date<=%s",query_params)
-        return self.cr.fetchone()[0] or 0.0
-
-    def _move_sum_balance(self, account_id, date1, date2):
-        debit = self._move_sum(account_id, date1, date2, 'debit')
-        credit = self._move_sum(account_id, date1, date2, 'credit')
-        return (debit-credit)
-
-    def _sum_all(self, accounts, date1, date2, option):
-        account_analytic_obj = self.pool.get('account.analytic.account')
-        ids = map(lambda x: x['id'], accounts)
-        if not ids:
-            return 0.0
-
-        if not self.acc_sum_list:
-            ids2 = account_analytic_obj.search(self.cr, self.uid,[('parent_id', 'child_of', ids)])
-            self.acc_sum_list = ids2
-        else:
-            ids2 = self.acc_sum_list
-
-        query_params = (tuple(ids2), date1, date2)
-        if option == "debit":
-            self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
-                    WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0",query_params)
-        elif option == "credit":
-            self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
-                    WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
-        elif option == "quantity":
-            self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
-                    WHERE account_id IN %s AND date>=%s AND date<=%s",query_params)
-        return self.cr.fetchone()[0] or 0.0
-
-    def _sum_balance(self, accounts, date1, date2):
-        debit = self._sum_all(accounts, date1, date2, 'debit') or 0.0
-        credit = self._sum_all(accounts, date1, date2, 'credit') or 0.0
-        return (debit-credit)
-
-
-class report_analyticbalance(osv.AbstractModel):
-    _name = 'report.account.report_analyticbalance'
-    _inherit = 'report.abstract_report'
-    _template = 'account.report_analyticbalance'
-    _wrapped_report_class = account_analytic_balance
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/report/analytic_journal.py'
--- account/project/report/analytic_journal.py	2014-04-02 16:40:53 +0000
+++ account/project/report/analytic_journal.py	1970-01-01 00:00:00 +0000
@@ -1,68 +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
-
-
-#
-# Use period and Journal for selection or resources
-#
-class account_analytic_journal(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_analytic_journal, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-            'lines': self._lines,
-            'lines_a': self._lines_a,
-            'sum_general': self._sum_general,
-            'sum_analytic': self._sum_analytic,
-        })
-
-    def _lines(self, journal_id, date1, date2):
-        self.cr.execute('SELECT DISTINCT move_id FROM account_analytic_line WHERE (date>=%s) AND (date<=%s) AND (journal_id=%s) AND (move_id is not null)', (date1, date2, journal_id,))
-        ids = map(lambda x: x[0], self.cr.fetchall())
-        return self.pool.get('account.move.line').browse(self.cr, self.uid, ids)
-
-    def _lines_a(self, move_id, journal_id, date1, date2):
-        ids = self.pool.get('account.analytic.line').search(self.cr, self.uid, [('move_id','=',move_id), ('journal_id','=',journal_id), ('date','>=',date1), ('date','<=',date2)])
-        if not ids:
-            return []
-        return self.pool.get('account.analytic.line').browse(self.cr, self.uid, ids)
-        
-    def _sum_general(self, journal_id, date1, date2):
-        self.cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE id IN (SELECT move_id FROM account_analytic_line WHERE (date>=%s) AND (date<=%s) AND (journal_id=%s) AND (move_id is not null))', (date1, date2, journal_id,))
-        return self.cr.fetchall()[0][0] or 0
-
-    def _sum_analytic(self, journal_id, date1, date2):
-        self.cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE date>=%s AND date<=%s AND journal_id=%s", (date1, date2, journal_id))
-        res = self.cr.dictfetchone()
-        return res['sum'] or 0
-
-
-class report_analyticjournal(osv.AbstractModel):
-    _name = 'report.account.report_analyticjournal'
-    _inherit = 'report.abstract_report'
-    _template = 'account.report_analyticjournal'
-    _wrapped_report_class = account_analytic_journal
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== 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:
 
=== removed directory 'account/project/views'
=== removed file 'account/project/views/report_analyticbalance.xml'
--- account/project/views/report_analyticbalance.xml	2014-04-02 16:40:53 +0000
+++ account/project/views/report_analyticbalance.xml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticbalance">
-    <t t-call="report.html_container">
-        <t t-call="report.internal_layout">
-            <div class="page">
-                <h2>Analytic Balance - <span t-esc="res_company.currency_id.name"/></h2>
-
-                <table class="table table-condensed">
-                    <thead>
-                        <tr>
-                            <th>Code</th>
-                            <th>Account Name</th>
-                            <th>Debit</th>
-                            <th>Credit</th>
-                            <th>Balance</th>
-                            <th>Quantity</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td colspan="2">Total</td>
-                            <td>
-                                <span t-esc="formatLang(sum_all(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2'], 'debit'))"/>
-                            </td>
-                            <td>
-                                <span t-esc="formatLang(sum_all(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2'], 'credit'))"/>
-                            </td>
-                            <td>
-                                <span t-esc="formatLang(sum_balance(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2']),currency_obj=res_company.currency_id)"/>
-                            </td>
-                            <td>
-                                <span t-esc="formatLang(sum_all(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2'], 'quantity'))"/>
-                            </td>
-                        </tr>
-                        <t t-foreach="get_objects(data['form']['empty_acc'])" t-as="o">
-                            <tr>
-                                <td><span t-esc="o['code']"/></td>
-                                <td><span t-esc="o['complete_name']"/></td>
-                                <td><span t-esc="formatLang(move_sum(o['id'], data['form']['date1'], data['form']['date2'], 'debit'))"/></td>
-                                <td><span t-esc="formatLang(move_sum(o['id'], data['form']['date1'], data['form']['date2'], 'credit'))"/></td>
-                                <td><span t-esc="formatLang(move_sum_balance(o['id'], data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/></td>
-                                <td><span t-esc="formatLang(move_sum(o['id'], data['form']['date1'], data['form']['date2'], 'quantity'))"/></td>
-                            </tr>
-                            <tr t-foreach="lines_g(o['id'], data['form']['date1'], data['form']['date2'])" t-as="move_g">
-                                <td><span t-esc="move_g['code']"/></td>
-                                <td><span t-esc="move_g['name']"/></td>
-                                <td><span t-esc="formatLang(move_g['debit'])"/></td>
-                                <td><span t-esc="formatLang(move_g['credit'])"/></td>
-                                <td><span t-esc="formatLang(move_g['balance'], currency_obj=res_company.currency_id)"/></td>
-                                <td><span t-esc="formatLang(move_g['quantity'])"/></td>
-                            </tr>    
-                        </t>
-                    </tbody>
-                </table> 
-            </div>
-        </t>
-    </t>
-</template>
-</data>
-</openerp>
 
=== removed file 'account/project/views/report_analyticcostledger.xml'
--- account/project/views/report_analyticcostledger.xml	2014-04-02 16:40:53 +0000
+++ account/project/views/report_analyticcostledger.xml	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticcostledger">
-    <t t-call="report.html_container">
-        <t t-call="report.internal_layout">
-            <div class="page">
-                <h2>Cost Ledger</h2>
-            
-                <div class="row mt32 mb32">
-                    <div class="col-xs-3">
-                        <strong>Period From:</strong>
-                        <p t-esc="formatLang(data['form']['date1'], date=True)"/>
-                    </div>
-                    <div class="col-xs-3">
-                        <strong>Period To:</strong>
-                        <p t-esc="formatLang(data['form']['date2'], date=True)"/>
-                    </div>
-                    <div class="col-xs-3">
-                        <strong>Printing Date:</strong>
-                        <p t-esc="formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time=True)" />
-                    </div>
-                </div>
-
-                <table class="table table-condensed">
-                    <thead>
-                        <tr>
-                            <th>Date/Code</th>
-                            <th>J.C. /Move</th>
-                            <th>Name</th>
-                            <th>Debit</th>
-                            <th>Credit</th>
-                            <th>Balance</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr style="font-weight: bold;">
-                            <td>Total:</td>
-                            <td></td>
-                            <td></td>
-                            <td><span t-esc="formatLang(sum_debit(docs, data['form']['date1'], data['form']['date2']))"/></td>
-                            <td><span t-esc="formatLang(sum_credit(docs,data['form']['date1'],data['form']['date2']))"/></td>
-                            <td>
-                                <span t-esc="formatLang(sum_debit(docs, data['form']['date1'], data['form']['date2']) - sum_credit(docs, data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/>
-                            </td>
-                        </tr>
-                
-                        <t t-foreach="docs" t-as="account">
-                            <tr style="font-weight: bold;">
-                                <td><span t-esc="account.code"/></td>
-                                <td></td>
-                                <td><span t-esc="account.complete_name"/></td>
-                                <td><span t-esc="formatLang(sum_debit([account], data['form']['date1'], data['form']['date2']))"/></td>
-                                <td><span t-esc="formatLang(sum_credit([account], data['form']['date1'], data['form']['date2']))"/></td>
-                                <td><span t-esc="formatLang(sum_debit([account], data['form']['date1'], data['form']['date2']) - sum_credit([account], data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/></td>
-                            </tr>
-
-                            <t t-foreach="lines_g(account, data['form']['date1'], data['form']['date2'])" t-as="move_g">
-                                <tr>
-                                    <td><span t-esc="move_g['code']"/></td>
-                                    <td></td>
-                                    <td><span t-esc="move_g['name']"/></td>
-                                    <td><span t-esc="move_g['debit']"/></td>
-                                    <td><span t-esc="move_g['credit']"/></td>
-                                    <td>
-                                        <span t-esc="formatLang(move_g['balance'], currency_obj=res_company.currency_id)"/>
-                                    </td>
-                                </tr>
-                                <tr t-foreach="lines_a(move_g, account, data['form']['date1'], data['form']['date2'])" t-as="move_a">
-                                    <td>
-                                        <t t-esc="formatLang(move_a['date'], date=True)"></t> 
-                                    </td>
-                                    <td><span t-esc="move_a['cj']"/></td>
-                                    <td><span t-esc="move_a['name']"/></td>
-                                    <td><span t-esc="move_a['debit']"/></td>
-                                    <td><span t-esc="move_a['credit']"/></td>
-                                    <td>
-                                        <span t-esc="formatLang(move_a['balance'], currency_obj=res_company.currency_id)"/>
-                                    </td> 
-                                </tr>
-                            </t>
-                        </t>
-                    </tbody>
-                </table>
-            </div>
-        </t>
-    </t>
-</template>
-</data>
-</openerp>
 \ No newline at end of file
 
=== removed file 'account/project/views/report_analyticcostledgerquantity.xml'
--- account/project/views/report_analyticcostledgerquantity.xml	2014-04-02 16:40:53 +0000
+++ account/project/views/report_analyticcostledgerquantity.xml	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticcostledgerquantity">
-    <t t-call="report.html_container">
-        <t t-call="report.internal_layout">
-            <div class="page">
-                <h2>Cost Ledger</h2>
-
-                <div class="row mt32 mb32">
-                    <div class="col-xs-3">
-                        <strong>Period From:</strong>
-                        <p t-esc="formatLang(data['form']['date1'], date=True)"/>
-                    </div>
-                    <div class="col-xs-3">
-                        <strong>Period To:</strong>
-                        <p t-esc="formatLang(data['form']['date2'], date=True)"/>
-                    </div>
-                    <div class="col-xs-3">
-                        <strong>Printing Date:</strong>
-                        <p t-esc="formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time=True)" />
-                    </div>
-                </div>
-
-                <table class="table table-condensed">
-                    <thead>
-                        <tr>
-                            <th>Date/Code</th>
-                            <th>J.C./Move</th>
-                            <th>Name</th>
-                            <th>Quantity</th>
-                            <th>Total</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr style="font-weight:bold;">
-                            <td>Total:</td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td>
-                                <span t-esc="sum_quantity(docs, data['form']['date1'], data['form']['date2'], data['form']['journal'])"/>
-                            </td>
-                        </tr>
-                
-                        <t t-foreach="docs" t-as="account">
-                            <tr style="font-weight:bold;">
-                                <td><span t-esc="account.code"/></td>
-                                <td><span t-esc="account.complete_name"/></td>
-                                <td></td>
-                                <td>
-                                    <p t-if="account.quantity_max">
-                                        Max quantity : <span t-esc="formatLang(account.quantity_max)"/>
-                                    </p>
-                                </td>
-                                <td>
-                                    <span t-esc="account_sum_quantity(account.id, data['form']['date1'], data['form']['date2'], data['form']['journal'])"/>
-                                </td>
-                            </tr>
-
-                            <t t-foreach="lines_g(account.id, data['form']['date1'], data['form']['date2'], data['form']['journal'])" t-as="move_g">
-                                <tr style="font-weight:bold;">
-                                    <td><span t-esc="move_g['code']"/></td>
-                                    <td colspan="2"><span t-esc="move_g['name']"/></td>
-                                    <td></td>
-                                    <td class="text-right"><span t-esc="move_g['quantity']"/></td>
-                                </tr>
-                        
-                                <t t-foreach="lines_a(move_g['id'], account.id, data['form']['date1'], data['form']['date2'], data['form']['journal'])" t-as="move_a">
-                                    <tr style="font-weight:normal;">
-                                        <td><span t-esc="formatLang(move_a['date'], date=True)"/></td>
-                                        <td><span t-esc="move_a['cj']"/></td>
-                                        <td><span t-esc="move_a['name']"/></td>
-                                        <td></td>
-                                        <td class="text-right"><span t-esc="move_a['quantity']"/></td> 
-                                    </tr>
-                                </t> 
-                            </t> 
-                        </t>
-                    </tbody>
-                </table>
-            </div>
-        </t>
-    </t>
-</template>
-</data>
-</openerp>
 \ No newline at end of file
 
=== removed file 'account/project/views/report_analyticjournal.xml'
--- account/project/views/report_analyticjournal.xml	2014-04-02 16:40:53 +0000
+++ account/project/views/report_analyticjournal.xml	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticjournal">
-    <t t-call="report.html_container">
-        <t t-foreach="docs" t-as="o">
-            <t t-call="report.internal_layout">
-                <div class="page">
-                    <h2>Analytic Journal</h2>
-
-                    <div class="row mt32 mb32">
-                        <div class="col-xs-3">
-                            <strong>Period From:</strong>
-                            <p t-esc="formatLang(data['form']['date1'], date=True)"/>
-                        </div>
-                        <div class="col-xs-3">
-                            <strong>Period To:</strong>
-                            <p t-esc="formatLang(data['form']['date2'], date=True)"/>
-                        </div>
-                        <div class="col-xs-3">
-                            <strong>Currency:</strong>
-                            <p t-field="res_company.currency_id" />
-                        </div>
-                    </div>
-
-                    <table class="table table-condensed">
-                        <thead>
-                            <tr>
-                                <th>Date</th>
-                                <th>Code</th>
-                                <th>Move Name</th>
-                                <th>Account n°</th>
-                                <th>General</th>
-                                <th>Analytic</th>
-                            </tr>
-                            <tr>
-                                <th colspan="4"><t t-if="o.code"><span t-esc="o.code"/></t> - <span t-esc="o.name"/></th>
-                                <th><span t-esc="formatLang(sum_general(o.id, data['form']['date1'], data['form']['date2']))"/></th>
-                                <th><span t-esc="formatLang(sum_analytic(o.id, data['form']['date1'], data['form']['date2']))"/></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <t t-foreach="lines(o.id, data['form']['date1'], data['form']['date2'])" t-as="move">
-                                <tr>
-                                    <td></td>
-                                    <td></td>
-                                    <td>
-                                        <span t-esc="move.name"/>
-                                    </td>
-                                    <td>
-                                        <span t-esc="move.account_id.code"/>
-                                        <span t-esc="move.account_id.name"/>
-                                    </td>
-                                    <td>
-                                        <span t-esc="formatLang(move.debit-move.credit)"/>
-                                    </td>
-                                    <td></td>
-                                </tr>
-                                <tr t-foreach="lines_a(move.id, o.id, data['form']['date1'], data['form']['date2'])" t-as="move_a">
-                                    <td>
-                                        <span t-esc="formatLang(move_a.date,date = True)"/>
-                                    </td>
-                                    <td>
-                                        <p t-if="move_a.code"><span t-esc="move_a.code"/></p>
-                                    </td>
-                                    <td>
-                                        <span t-esc="move_a.name"/>
-                                    </td>
-                                    <td><span t-esc="move_a.account_id.code"/> - <span t-esc="move_a.account_id.name"/></td>
-                                    <td></td>
-                                    <td><span t-esc="formatLang(move_a.amount)"/></td>
-                                </tr>
-                            </t>
-                            <tr t-foreach="lines_a(False, o.id, data['form']['date1'], data['form']['date2'])" t-as="move_a">
-                                <td><span t-esc="formatLang(move_a.date,date = True)"/></td>
-                                <td><p t-if="move_a.code"><span t-esc="move_a.code"/></p></td>
-                                <td><span t-esc="move_a.name"/></td>
-                                <td><span t-esc="move_a.account_id.code"/> - <span t-esc="move_a.account_id.name"/></td>
-                                <td></td>
-                                <td><span t-esc="formatLang(move_a.amount)"/></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </t>
-        </t>
-    </t>
-</template>
-</data>
-</openerp>
 
=== removed file 'account/project/views/report_invertedanalyticbalance.xml'
--- account/project/views/report_invertedanalyticbalance.xml	2014-04-02 16:40:53 +0000
+++ account/project/views/report_invertedanalyticbalance.xml	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_invertedanalyticbalance">
-    <t t-call="report.html_container">
-        <t t-call="report.internal_layout">
-            <div class="page">
-                <h2>Inverted Analytic Balance - <span t-esc="res_company.currency_id.name"/></h2>
-
-                <table class="table table-condensed">
-                    <thead>
-                        <tr>
-                            <th>Code</th>
-                            <th>Account Name</th>
-                            <th>Debit</th>
-                            <th>Credit</th>
-                            <th>Balance</th>
-                            <th>Quantity</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><strong>Total</strong></td>
-                            <td></td>
-                            <td><strong t-esc="formatLang(sum_debit(docs, data['form']['date1'], data['form']['date2']))"/></td>
-                            <td><strong t-esc="formatLang(sum_credit(docs, data['form']['date1'], data['form']['date2']))"/></td>
-                            <td>
-                                <strong t-esc="formatLang(sum_balance(docs, data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/>
-                            </td>
-                            <td><strong><span t-esc="formatLang(sum_quantity(docs, data['form']['date1'], data['form']['date2']))"/></strong></td>
-                        </tr>
-                        <t t-foreach="lines_g(docs, data['form']['date1'], data['form']['date2'])" t-as="move_g">
-                            <tr>
-                                <td>
-                                    <strong t-esc="move_g['code']"/>
-                                </td>
-                                <td>
-                                    <strong t-esc="move_g['name']"/>
-                                </td>
-                                <td class="text-right">
-                                    <strong>
-                                        <span t-esc="formatLang(move_g['debit'])"/>
-                                    </strong>
-                                </td>
-                                <td class="text-right">
-                                    <strong>
-                                        <span t-esc="formatLang(move_g['credit'])"/>
-                                    </strong>
-                                </td>
-                                <td class="text-right">
-                                    <strong>
-                                        <span t-esc="formatLang(move_g['balance'], currency_obj = res_company.currency_id)"/>
-                                    </strong>
-                                </td>
-                                <td class="text-right">
-                                    <strong>
-                                        <span t-esc="formatLang(move_g['quantity'])"/>
-                                    </strong>
-                                </td>
-                            </tr>
-                            <t t-foreach="lines_a(docs, move_g['id'], data['form']['date1'], data['form']['date2'])" t-as="move_a">
-                                <tr>
-                                    <td>
-                                        <span t-esc="move_a['code']"/>
-                                    </td>
-                                    <td>
-                                        <span t-esc="move_a['complete_name']"/>
-                                    </td>
-                                    <td class="text-right">
-                                        <span t-esc="formatLang(move_a['debit'])"/>
-                                    </td>
-                                    <td class="text-right">
-                                        <span t-esc="formatLang(move_a['credit'])"/>
-                                    </td>
-                                    <td class="text-right">
-                                        <span t-esc="formatLang(move_a['balance'], currency_obj = res_company.currency_id)"/>
-                                    </td>
-                                    <td class="text-right">
-                                        <span t-esc="formatLang(move_a['quantity'])"/>
-                                    </td>
-                                </tr>
-                            </t>
-                        </t>
-                    </tbody>
-                </table> 
-            </div>
-        </t>
-    </t>
-</template>
-</data>
-</openerp>
 
=== removed directory 'account/project/wizard'
=== removed file 'account/project/wizard/__init__.py'
--- account/project/wizard/__init__.py	2011-01-14 00:11:01 +0000
+++ account/project/wizard/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,30 +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 account_analytic_journal_report
-import account_analytic_balance_report
-import account_analytic_inverted_balance_report
-import account_analytic_cost_ledger_report
-import account_analytic_cost_ledger_for_journal_report
-import project_account_analytic_line
-import account_analytic_chart
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/account_analytic_balance_report.py'
--- account/project/wizard/account_analytic_balance_report.py	2014-03-27 18:25:20 +0000
+++ account/project/wizard/account_analytic_balance_report.py	1970-01-01 00:00:00 +0000
@@ -1,55 +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 fields, osv
-
-
-class account_analytic_balance(osv.osv_memory):
-    _name = 'account.analytic.balance'
-    _description = 'Account Analytic Balance'
-
-    _columns = {
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
-        'empty_acc': fields.boolean('Empty Accounts ? ', help='Check if you want to display Accounts with 0 balance too.'),
-    }
-
-    _defaults = {
-        'date1': lambda *a: time.strftime('%Y-01-01'),
-        'date2': lambda *a: time.strftime('%Y-%m-%d')
-    }
-
-    def check_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids)[0]
-        datas = {
-            'ids': context.get('active_ids', []),
-            'model': 'account.analytic.account',
-            'form': data
-        }
-
-        datas['form']['active_ids'] = context.get('active_ids', False)
-
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticbalance', data=datas, context=context)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/account_analytic_balance_report_view.xml'
--- account/project/wizard/account_analytic_balance_report_view.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/account_analytic_balance_report_view.xml	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_analytic_balance_view" model="ir.ui.view">
-            <field name="name">Account Analytic Balance</field>
-            <field name="model">account.analytic.balance</field>
-            <field name="arch" type="xml">
-            <form string="Select Period" version="7.0">
-                <header>
-                    <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <group col="4">
-                    <field name="date1"/>
-                    <field name="date2"/>
-                    <newline/>
-                    <field name="empty_acc"/>
-                </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_balance" model="ir.actions.act_window">
-            <field name="name">Analytic Balance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.balance</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_analytic_balance_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="account_analytic_balance_values">
-            <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="name">Account Analytic Balance</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_balance'))" />
-            <field name="key">action</field>
-            <field name="model">account.analytic.account</field>
-        </record>
-
-    </data>
-</openerp>
-
 
=== removed file 'account/project/wizard/account_analytic_chart.py'
--- account/project/wizard/account_analytic_chart.py	2013-10-27 12:31:04 +0000
+++ account/project/wizard/account_analytic_chart.py	1970-01-01 00:00:00 +0000
@@ -1,49 +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/>.
-#
-##############################################################################
-from openerp.osv import fields, osv
-
-class account_analytic_chart(osv.osv_memory):
-    _name = 'account.analytic.chart'
-    _description = 'Account Analytic Chart'
-
-    _columns = {
-        'from_date': fields.date('From'),
-        'to_date': fields.date('To'),
-    }
-
-    def analytic_account_chart_open_window(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-        result_context = {}
-        if context is None:
-            context = {}
-        result = mod_obj.get_object_reference(cr, uid, 'account', '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]
-        if data['from_date']:
-            result_context.update({'from_date': data['from_date']})
-        if data['to_date']:
-            result_context.update({'to_date': data['to_date']})
-        result['context'] = str(result_context)
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/account_analytic_chart_view.xml'
--- account/project/wizard/account_analytic_chart_view.xml	2014-02-10 05:26:55 +0000
+++ account/project/wizard/account_analytic_chart_view.xml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_analytic_chart_view" model="ir.ui.view">
-            <field name="name">Chart of Analytic Accounts</field>
-            <field name="model">account.analytic.chart</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Account Charts" version="7.0">
-                    <group string="Select the Period for Analysis" col="4">
-                        <field name="from_date"/>
-                        <field name="to_date"/>
-                        <label string="(Keep empty to open the current situation)" colspan="4"/>
-                    </group>
-                    <footer>
-                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_chart" model="ir.actions.act_window">
-            <field name="name">Chart of Analytic Accounts</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.chart</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_analytic_chart_view"/>
-            <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>
 
=== removed file 'account/project/wizard/account_analytic_cost_ledger_for_journal_report.py'
--- account/project/wizard/account_analytic_cost_ledger_for_journal_report.py	2014-04-02 16:40:53 +0000
+++ account/project/wizard/account_analytic_cost_ledger_for_journal_report.py	1970-01-01 00:00:00 +0000
@@ -1,54 +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 fields, osv
-
-
-class account_analytic_cost_ledger_journal_report(osv.osv_memory):
-    _name = 'account.analytic.cost.ledger.journal.report'
-    _description = 'Account Analytic Cost Ledger For Journal Report'
-
-    _columns = {
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
-        'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'journal_id', 'Journals'),
-    }
-
-    _defaults = {
-        'date1': lambda *a: time.strftime('%Y-01-01'),
-        'date2': lambda *a: time.strftime('%Y-%m-%d')
-    }
-
-    def check_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids)[0]
-        datas = {
-            'ids': context.get('active_ids', []),
-            'model': 'account.analytic.account',
-            'form': data
-        }
-
-        datas['form']['active_ids'] = context.get('active_ids', False)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledgerquantity', data=datas, context=context)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml'
--- account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_analytic_cost_ledger_journal_view" model="ir.ui.view">
-            <field name="name">Account Analytic Cost Ledger Journal</field>
-            <field name="model">account.analytic.cost.ledger.journal.report</field>
-            <field name="arch" type="xml">
-                <form string="Select period" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group string="Cost Ledger for Period" col="4">
-                        <field name="date1"/>
-                        <field name="date2"/>
-                        <field name="journal" colspan="4"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_cost_ledger_journal" model="ir.actions.act_window">
-            <field name="name">Cost Ledger (Only quantities)</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.cost.ledger.journal.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_analytic_cost_ledger_journal_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="account_analytic_cost_ledger_journal_values">
-            <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="name">Account Analytic Cost Ledger Journal</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost_ledger_journal'))" />
-            <field name="key">action</field>
-            <field name="model">account.analytic.account</field>
-        </record>
-
-    </data>
-</openerp>
 
=== removed file 'account/project/wizard/account_analytic_cost_ledger_report.py'
--- account/project/wizard/account_analytic_cost_ledger_report.py	2014-03-27 18:25:20 +0000
+++ account/project/wizard/account_analytic_cost_ledger_report.py	1970-01-01 00:00:00 +0000
@@ -1,54 +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, fields
-
-
-class account_analytic_cost_ledger(osv.osv_memory):
-    _name = 'account.analytic.cost.ledger'
-    _description = 'Account Analytic Cost Ledger'
-
-    _columns = {
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
-    }
-
-    _defaults = {
-        'date1': lambda *a: time.strftime('%Y-01-01'),
-        'date2': lambda *a: time.strftime('%Y-%m-%d')
-    }
-
-    def check_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids)[0]
-        datas = {
-            'ids': context.get('active_ids',[]),
-            'model': 'account.analytic.account',
-            'form': data
-        }
-
-        datas['form']['active_ids'] = context.get('active_ids', False)
-
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledger', data=datas, context=context)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/account_analytic_cost_ledger_view.xml'
--- account/project/wizard/account_analytic_cost_ledger_view.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/account_analytic_cost_ledger_view.xml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_analytic_cost_view" model="ir.ui.view">
-            <field name="name">Account Analytic Check</field>
-            <field name="model">account.analytic.cost.ledger</field>
-            <field name="arch" type="xml">
-            <form string="Select Period" version="7.0">
-                <header>
-                     <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                     or
-                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <group col="4">
-                    <field name="date1"/>
-                    <field name="date2"/>
-                </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_cost" model="ir.actions.act_window">
-            <field name="name">Cost Ledger</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.cost.ledger</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_analytic_cost_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="account_analytic_cost_values">
-            <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="name">Account Analytic Cost</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost'))" />
-            <field name="key">action</field>
-            <field name="model">account.analytic.account</field>
-        </record>
-
-    </data>
-</openerp>
 
=== removed file 'account/project/wizard/account_analytic_inverted_balance_report.py'
--- account/project/wizard/account_analytic_inverted_balance_report.py	2014-04-02 16:40:53 +0000
+++ account/project/wizard/account_analytic_inverted_balance_report.py	1970-01-01 00:00:00 +0000
@@ -1,52 +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 fields, osv
-
-
-class account_analytic_inverted_balance(osv.osv_memory):
-    _name = 'account.analytic.inverted.balance'
-    _description = 'Account Analytic Inverted Balance'
-
-    _columns = {
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
-    }
-
-    _defaults = {
-        'date1': lambda *a: time.strftime('%Y-01-01'),
-        'date2': lambda *a: time.strftime('%Y-%m-%d')
-    }
-
-    def check_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids)[0]
-        datas = {
-            'ids': context.get('active_ids', []),
-            'model': 'account.analytic.account',
-            'form': data
-        }
-        datas['form']['active_ids'] = context.get('active_ids', False)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_invertedanalyticbalance', data=datas, context=context)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/account_analytic_inverted_balance_report.xml'
--- account/project/wizard/account_analytic_inverted_balance_report.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/account_analytic_inverted_balance_report.xml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_analytic_invert_balance_view" model="ir.ui.view">
-            <field name="name">Account Analytic Inverted Balance</field>
-            <field name="model">account.analytic.inverted.balance</field>
-            <field name="arch" type="xml">
-                <form string="Select Period" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="4">
-                        <field name="date1"/>
-                        <field name="date2"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
-            <field name="name">Inverted Analytic Balance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.inverted.balance</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_analytic_invert_balance_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="account_analytic_invert_balance_values">
-            <field name="model_id" ref="analytic.model_account_analytic_account" />
-            <field name="name">Account Analytic Inverted Balance</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
-            <field name="key">action</field>
-            <field name="model">account.analytic.account</field>
-        </record>
-
-    </data>
-</openerp>
 
=== removed file 'account/project/wizard/account_analytic_journal_report.py'
--- account/project/wizard/account_analytic_journal_report.py	2014-04-03 15:48:56 +0000
+++ account/project/wizard/account_analytic_journal_report.py	1970-01-01 00:00:00 +0000
@@ -1,74 +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 fields, osv
-
-
-class account_analytic_journal_report(osv.osv_memory):
-    _name = 'account.analytic.journal.report'
-    _description = 'Account Analytic Journal'
-
-    _columns = {
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
-        'analytic_account_journal_id': fields.many2many('account.analytic.journal', 'account_analytic_journal_name', 'journal_line_id', 'journal_print_id', 'Analytic Journals', required=True),
-    }
-
-    _defaults = {
-        'date1': lambda *a: time.strftime('%Y-01-01'),
-        'date2': lambda *a: time.strftime('%Y-%m-%d')
-    }
-
-    def check_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids)[0]
-        ids_list = []
-        if context.get('active_id',False):
-            ids_list.append(context.get('active_id',False))
-        else:
-            record = self.browse(cr,uid,ids[0],context=context)
-            for analytic_record in record.analytic_account_journal_id:
-                ids_list.append(analytic_record.id)
-        datas = {
-            'ids': ids_list,
-            'model': 'account.analytic.journal',
-            'form': data
-        }
-        context2 = context.copy()
-        context2['active_model'] = 'account.analytic.journal'
-        context2['active_ids'] = ids_list
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticjournal', data=datas, context=context2)
-
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
-        if not context.has_key('active_ids'):
-            journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
-        else:
-            journal_ids = context.get('active_ids')
-        if 'analytic_account_journal_id' in fields:
-            res.update({'analytic_account_journal_id': journal_ids})
-        return res
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/account_analytic_journal_report_view.xml'
--- account/project/wizard/account_analytic_journal_report_view.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/account_analytic_journal_report_view.xml	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_analytic_journal_view" model="ir.ui.view">
-            <field name="name">Account Analytic Journal</field>
-            <field name="model">account.analytic.journal.report</field>
-            <field name="arch" type="xml">
-                <form string="Select Period" version="7.0">
-                    <group col="4">
-                        <field name="date1"/>
-                        <field name="date2"/>
-                        <field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1" colspan="4"/>
-                    </group>
-                    <footer>
-                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_journal" model="ir.actions.act_window">
-            <field name="name">Analytic Journal</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.journal.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_analytic_journal_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="account_analytic_journal_values">
-            <field name="model_id" ref="account.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>
 
=== removed file 'account/project/wizard/project_account_analytic_line.py'
--- account/project/wizard/project_account_analytic_line.py	2013-10-27 12:31:04 +0000
+++ account/project/wizard/project_account_analytic_line.py	1970-01-01 00:00:00 +0000
@@ -1,57 +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/>.
-#
-##############################################################################
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-class project_account_analytic_line(osv.osv_memory):
-    _name = "project.account.analytic.line"
-    _description = "Analytic Entries by line"
-    _columns = {
-        'from_date': fields.date('From'),
-         'to_date': fields.date('To'),
-    }
-
-    def action_open_window(self, cr, uid, ids, context=None):
-        mod_obj =self.pool.get('ir.model.data')
-        domain = []
-        data = self.read(cr, uid, ids, [])[0]
-        from_date = data['from_date']
-        to_date = data['to_date']
-        if from_date and to_date:
-            domain = [('date','>=',from_date), ('date','<=',to_date)]
-        elif from_date:
-            domain = [('date','>=',from_date)]
-        elif to_date:
-            domain = [('date','<=',to_date)]
-        result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
-        id = result and result[1] or False
-        return {
-              'name': _('Analytic Entries by line'),
-              'view_type': 'form',
-              "view_mode": 'tree,form',
-              'res_model': 'account.analytic.line',
-              'type': 'ir.actions.act_window',
-              'domain': domain,
-              'search_view_id': id['res_id'],
-              }
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'account/project/wizard/project_account_analytic_line_view.xml'
--- account/project/wizard/project_account_analytic_line_view.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/project_account_analytic_line_view.xml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_project_account_analytic_line_form" model="ir.ui.view">
-            <field name="name">project.account.analytic.line.form</field>
-            <field name="model">project.account.analytic.line</field>
-            <field name="arch" type="xml">
-                <form string="View Account Analytic Lines" version="7.0">
-                    <header>
-                        <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="4">
-                        <field name="from_date"/>
-                        <field name="to_date"/>
-                    </group>
-                    <label string ="(Keep empty to open the current situation)" />
-                </form>
-            </field>
-        </record>
-
-        <record id="action_project_account_analytic_line_form" model="ir.actions.act_window">
-            <field name="name">Entries By Line</field>
-            <field name="res_model">project.account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_project_account_analytic_line_form"/>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
 
=== 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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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,7 +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_analytic_journal_manager,account.analytic.journal,analytic.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_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
 
=== 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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +0000
@@ -5,7 +5,8 @@
     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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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_suppl_usd_eur.yml'
--- account_voucher/test/case2_suppl_usd_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_suppl_usd_eur.yml	2014-04-28 09:41:45 +0000
@@ -17,7 +17,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
@@ -30,7 +30,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
     default_credit_account_id: account.cash
 
=== 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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +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-28 09:41:45 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import analytic
-
+import project
+import report
 # 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-28 09:41:45 +0000
@@ -40,8 +40,25 @@
         'analytic_sequence.xml',
         'analytic_view.xml',
         'analytic_data.xml',
-    ],
-    'demo': [],
+        'project/wizard/project_account_analytic_line_view.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',
+        'report/report_analyticbalance.xml',
+        'report/report_analyticjournal.xml',
+        'report/report_analyticcostledgerquantity.xml',
+        'report/report_analyticcostledger.xml',
+        'report/report_invertedanalyticbalance.xml',
+    ],
+    'demo': [
+        'project/project_demo.xml',
+        'project/analytic_account_demo.xml',
+    ],
     'installable': True,
     'auto_install': False,
 }
 
=== added directory 'analytic/project'
=== added file 'analytic/project/__init__.py'
--- analytic/project/__init__.py	1970-01-01 00:00:00 +0000
+++ analytic/project/__init__.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,27 @@
+# -*- 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 wizard
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'analytic/project/analytic_account_demo.xml'
--- analytic/project/analytic_account_demo.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/analytic_account_demo.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="analytic_root" model="account.analytic.account">
+            <field name="name" model="res.company" use="name" search="[]"/>
+        </record>
+        <record id="analytic_absences" model="account.analytic.account">
+            <field name="name">Leaves</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_root"/>
+        </record>
+        <record id="analytic_internal" model="account.analytic.account">
+            <field name="name">Internal</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_root"/>
+        </record>
+        <record id="analytic_our_super_product" model="account.analytic.account">
+            <field name="name">Our Super Product</field>
+            <field name="state">open</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_root"/>
+        </record>
+        <record id="analytic_project_1" model="account.analytic.account">
+            <field name="name">Project 1</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_root"/>
+        </record>
+        <record id="analytic_project_2" model="account.analytic.account">
+            <field name="name">Project 2</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_root"/>
+        </record>
+        <record id="analytic_journal_trainings" model="account.analytic.account">
+            <field name="name">Training</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_internal"/>
+        </record>
+        <record id="analytic_in_house" model="account.analytic.account">
+            <field name="name">In House</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_journal_trainings"/>
+        </record>
+        <record id="analytic_online" model="account.analytic.account">
+            <field name="name">Online</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_journal_trainings"/>
+        </record>
+        <record id="analytic_support" model="account.analytic.account">
+            <field name="name">Support</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_our_super_product"/>
+        </record>
+        <record id="analytic_partners" model="account.analytic.account">
+            <field name="name">Partners</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_support"/>
+        </record>
+        <record id="analytic_customers" model="account.analytic.account">
+            <field name="name">Customers</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_support"/>
+        </record>
+        <record id="analytic_support_internal" model="account.analytic.account">
+            <field name="name">Internal</field>
+            <field name="type">contract</field>
+            <field name="parent_id" ref="analytic_support"/>
+        </record>
+        <record id="analytic_integration" model="account.analytic.account">
+            <field name="name">Integration</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_our_super_product"/>
+        </record>
+        <record id="analytic_consultancy" model="account.analytic.account">
+            <field name="name">Consultancy</field>
+            <field name="type">contract</field>
+            <field name="parent_id" ref="analytic_our_super_product"/>
+        </record>
+        <record id="analytic_super_product_trainings" model="account.analytic.account">
+            <field name="name">Training</field>
+            <field name="type">contract</field>
+            <field name="parent_id" ref="analytic_our_super_product"/>
+        </record>
+        <record id="analytic_seagate_p1" model="account.analytic.account">
+            <field name="name">Seagate P1</field>
+            <field name="parent_id" ref="analytic_integration"/>
+            <field name="type">normal</field>
+            <field name="state">open</field>
+            <field name="partner_id" ref="base.res_partner_19"/>
+        </record>
+        <record id="analytic_seagate_p2" model="account.analytic.account">
+            <field name="name">Seagate P2</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_integration"/>
+            <field name="state">open</field>
+            <field name="partner_id" ref="base.res_partner_19"/>
+        </record>
+        <record id="analytic_millennium_industries" model="account.analytic.account">
+            <field name="name">Millennium Industries</field>
+            <field name="parent_id" ref="analytic_integration"/>
+            <field name="type">normal</field>
+            <field name="partner_id" ref="base.res_partner_15"/>
+        </record>
+        <record id="analytic_integration_c2c" model="account.analytic.account">
+            <field name="name">CampToCamp</field>
+            <field name="type">normal</field>
+            <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
+            <field eval="time.strftime('%Y-12-31')" name="date"/>
+            <field name="parent_id" ref="analytic_integration"/>
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="state">open</field>
+        </record>
+        <record id="analytic_agrolait" model="account.analytic.account">
+            <field name="name">Agrolait</field>
+            <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
+            <field name="partner_id" ref="base.res_partner_2"/>
+        </record>
+        <record id="analytic_asustek" model="account.analytic.account">
+            <field name="name">Asustek</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_customers"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
+        </record>
+        <record id="analytic_deltapc" model="account.analytic.account">
+            <field name="name">Delta PC</field>
+            <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
+            <field name="partner_id" ref="base.res_partner_4"/>
+        </record>
+        <record id="analytic_spark" model="account.analytic.account">
+            <field name="name">Spark Systems</field>
+            <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
+            <field eval="time.strftime('%Y-05-08')" name="date"/>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="type">normal</field>
+            <field name="partner_id" ref="base.res_partner_16"/>
+            <field name="state">open</field>
+        </record>
+        <record id="analytic_nebula" model="account.analytic.account">
+            <field name="name">Nebula</field>
+            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
+            <field eval="time.strftime('%Y-07-01')" name="date"/>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_17"/>
+            <field name="state">open</field>
+        </record>
+        <record id="analytic_luminous_technologies" model="account.analytic.account">
+            <field name="name">Luminous Technologies</field>
+            <field eval="time.strftime('%Y-04-24')" name="date_start"/>
+            <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_11"/>
+        </record>
+        <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
+            <field name="name">Desertic - Hispafuentes</field>
+            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
+            <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_12"/>
+        </record>
+        <record id="analytic_think_big_systems" model="account.analytic.account">
+            <field name="name">Think Big Systems</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_18"/>
+        </record>
+        <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
+            <field name="name">Camp to Camp</field>
+            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="state">open</field>
+        </record>
+        <record id="analytic_project_2_support" model="account.analytic.account">
+            <field name="name">Support</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_project_2"/>
+        </record>
+        <record id="analytic_project_2_development" model="account.analytic.account">
+            <field name="name">Development</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_project_2"/>
+        </record>
+        <record id="analytic_project_1_trainings" model="account.analytic.account">
+            <field name="name">Training</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_project_1"/>
+        </record>
+        <record id="analytic_project_1_development" model="account.analytic.account">
+            <field name="name">Development</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_project_1"/>
+        </record>
+        <record id="analytic_administratif" model="account.analytic.account">
+            <field name="name">Administrative</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_internal"/>
+        </record>
+        <record id="analytic_commercial_marketing" model="account.analytic.account">
+            <field name="name">Commercial &amp; Marketing</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_internal"/>
+        </record>
+        <record id="analytic_our_super_product_development" model="account.analytic.account">
+            <field name="name">Our Super Product Development</field>
+            <field name="type">view</field>
+            <field name="parent_id" ref="analytic_internal"/>
+        </record>
+        <record id="analytic_stable" model="account.analytic.account">
+            <field name="name">Stable</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_our_super_product_development"/>
+        </record>
+        <record id="analytic_trunk" model="account.analytic.account">
+            <field name="name">Trunk</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_our_super_product_development"/>
+        </record>
+        <record id="analytic_paid" model="account.analytic.account">
+            <field name="name">Paid</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_absences"/>
+        </record>
+        <record id="analytic_unpaid" model="account.analytic.account">
+            <field name="name">Unpaid</field>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_absences"/>
+        </record>
+    </data>
+</openerp>
 
=== added file 'analytic/project/project.py'
--- analytic/project/project.py	1970-01-01 00:00:00 +0000
+++ analytic/project/project.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,41 @@
+# -*- 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."),
+        '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,
+    }
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'analytic/project/project_demo.xml'
--- analytic/project/project_demo.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/project_demo.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="cose_journal_sale" model="account.analytic.journal">
+            <field name="code">SAL</field>
+            <field name="name">Sales</field>
+            <field name="type">sale</field>
+        </record>
+        <record id="sit" model="account.analytic.journal">
+            <field name="code">START</field>
+            <field name="name">Miscellaneous Operation</field>
+            <field name="type">situation</field>
+        </record>
+    </data>
+</openerp>
 
=== added file 'analytic/project/project_report.xml'
--- analytic/project/project_report.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/project_report.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <report 
+            id="action_account_analytic_account_inverted_balance"
+            model="account.analytic.account"
+            string="Inverted Analytic Balance"
+            report_type="qweb-pdf"
+            name="account.report_invertedanalyticbalance"
+            file="account.report_invertedanalyticbalance"
+            menu="False"
+        />
+
+        <report 
+            id="action_report_analytic_journal"
+            model="account.analytic.journal"
+            string="Analytic Journal"
+            report_type="qweb-pdf"
+            name="account.report_analyticjournal"
+            file="account.report_analyticjournal"
+            menu="False"
+        />
+
+         <report
+            id="action_report_analytic_balance"
+            model="account.analytic.account"
+            string="Analytic Balance"
+            report_type="qweb-pdf"
+            name="account.report_analyticbalance"
+            file="account.report_analyticbalance"
+            menu="False"
+        />
+
+        <report
+            id="action_report_cost_ledger"
+            model="account.analytic.account"
+            report_type="qweb-pdf"
+            string="Cost Ledger"
+            name="account.report_analyticcostledger"
+            file="account.report_analyticcostledger"
+            menu="False"
+        />
+
+        <report
+            id="action_report_cost_ledgerquantity"
+            model="account.analytic.account"
+            report_type="qweb-pdf"
+            string="Cost Ledger (Only quantities)"
+            name="account.report_analyticcostledgerquantity"
+            file="account.report_analyticcostledgerquantity"
+            menu="False"
+        />
+
+    </data>
+</openerp>
 
=== added file 'analytic/project/project_view.xml'
--- analytic/project/project_view.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/project_view.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,309 @@
+<?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="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="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>
+
+        <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>
+
+    </data>
+</openerp>
 
=== added directory 'analytic/project/wizard'
=== added file 'analytic/project/wizard/__init__.py'
--- analytic/project/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/__init__.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,30 @@
+# -*- 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 account_analytic_journal_report
+import account_analytic_balance_report
+import account_analytic_inverted_balance_report
+import account_analytic_cost_ledger_report
+import account_analytic_cost_ledger_for_journal_report
+import project_account_analytic_line
+import account_analytic_chart
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'analytic/project/wizard/account_analytic_balance_report.py'
--- analytic/project/wizard/account_analytic_balance_report.py	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_balance_report.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,57 @@
+# -*- 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 fields, osv
+
+
+class account_analytic_balance(osv.osv_memory):
+    _name = 'account.analytic.balance'
+    _description = 'Account Analytic Balance'
+
+    _columns = {
+        'date1': fields.date('Start of period', required=True),
+        'date2': fields.date('End of period', required=True),
+        'empty_acc': fields.boolean('Empty Accounts ? ', help='Check if you want to display Accounts with 0 balance too.'),
+    }
+
+    _defaults = {
+        'date1': lambda *a: time.strftime('%Y-01-01'),
+        'date2': lambda *a: time.strftime('%Y-%m-%d')
+    }
+
+    def check_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids)[0]
+        datas = {
+             'ids': context.get('active_ids', []),
+            'model': 'account.analytic.account',
+            'form': data
+        }
+
+        datas['form']['active_ids'] = context.get('active_ids', False)
+
+        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticbalance', data=datas, context=context)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'analytic/project/wizard/account_analytic_balance_report_view.xml'
--- analytic/project/wizard/account_analytic_balance_report_view.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_balance_report_view.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_analytic_balance_view" model="ir.ui.view">
+            <field name="name">Account Analytic Balance</field>
+            <field name="model">account.analytic.balance</field>
+            <field name="arch" type="xml">
+            <form string="Select Period" version="7.0">
+                <header>
+                    <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </header>
+                <group col="4">
+                    <field name="date1"/>
+                    <field name="date2"/>
+                    <newline/>
+                    <field name="empty_acc"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_account_analytic_balance" model="ir.actions.act_window">
+            <field name="name">Analytic Balance</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.balance</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_balance_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <record model="ir.values" id="account_analytic_balance_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="name">Account Analytic Balance</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_balance'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
+
+    </data>
+</openerp>
+
 
=== added file 'analytic/project/wizard/account_analytic_chart.py'
--- analytic/project/wizard/account_analytic_chart.py	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_chart.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,49 @@
+# -*- 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/>.
+#
+##############################################################################
+from openerp.osv import fields, osv
+
+class account_analytic_chart(osv.osv_memory):
+    _name = 'account.analytic.chart'
+    _description = 'Account Analytic Chart'
+
+    _columns = {
+        'from_date': fields.date('From'),
+        'to_date': fields.date('To'),
+    }
+
+    def analytic_account_chart_open_window(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        result_context = {}
+        if context is None:
+            context = {}
+        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]
+        if data['from_date']:
+            result_context.update({'from_date': data['from_date']})
+        if data['to_date']:
+            result_context.update({'to_date': data['to_date']})
+        result['context'] = str(result_context)
+        return result
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'analytic/project/wizard/account_analytic_chart_view.xml'
--- analytic/project/wizard/account_analytic_chart_view.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_chart_view.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_analytic_chart_view" model="ir.ui.view">
+            <field name="name">Chart of Analytic Accounts</field>
+            <field name="model">account.analytic.chart</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Account Charts" version="7.0">
+                    <group string="Select the Period for Analysis" col="4">
+                        <field name="from_date"/>
+                        <field name="to_date"/>
+                        <label string="(Keep empty to open the current situation)" colspan="4"/>
+                    </group>
+                    <footer>
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_analytic_chart" model="ir.actions.act_window">
+            <field name="name">Chart of Analytic Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.chart</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_chart_view"/>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'analytic/project/wizard/account_analytic_cost_ledger_for_journal_report.py'
--- analytic/project/wizard/account_analytic_cost_ledger_for_journal_report.py	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_cost_ledger_for_journal_report.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,54 @@
+# -*- 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 fields, osv
+
+
+class account_analytic_cost_ledger_journal_report(osv.osv_memory):
+    _name = 'account.analytic.cost.ledger.journal.report'
+    _description = 'Account Analytic Cost Ledger For Journal Report'
+
+    _columns = {
+        'date1': fields.date('Start of period', required=True),
+        'date2': fields.date('End of period', required=True),
+        'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'journal_id', 'Journals'),
+    }
+
+    _defaults = {
+        'date1': lambda *a: time.strftime('%Y-01-01'),
+        'date2': lambda *a: time.strftime('%Y-%m-%d')
+    }
+
+    def check_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids)[0]
+        datas = {
+             'ids': context.get('active_ids', []),
+            'model': 'account.analytic.account',
+            'form': data
+        }
+
+        datas['form']['active_ids'] = context.get('active_ids', False)
+        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledgerquantity', data=datas, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'analytic/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml'
--- analytic/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_analytic_cost_ledger_journal_view" model="ir.ui.view">
+            <field name="name">Account Analytic Cost Ledger Journal</field>
+            <field name="model">account.analytic.cost.ledger.journal.report</field>
+            <field name="arch" type="xml">
+                <form string="Select period" version="7.0">
+                    <header>
+                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
+                    <group string="Cost Ledger for Period" col="4">
+                        <field name="date1"/>
+                        <field name="date2"/>
+                        <field name="journal" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_analytic_cost_ledger_journal" model="ir.actions.act_window">
+            <field name="name">Cost Ledger (Only quantities)</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.cost.ledger.journal.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_cost_ledger_journal_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <record model="ir.values" id="account_analytic_cost_ledger_journal_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="name">Account Analytic Cost Ledger Journal</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost_ledger_journal'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'analytic/project/wizard/account_analytic_cost_ledger_report.py'
--- analytic/project/wizard/account_analytic_cost_ledger_report.py	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_cost_ledger_report.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,54 @@
+# -*- 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, fields
+
+
+class account_analytic_cost_ledger(osv.osv_memory):
+    _name = 'account.analytic.cost.ledger'
+    _description = 'Account Analytic Cost Ledger'
+
+    _columns = {
+        'date1': fields.date('Start of period', required=True),
+        'date2': fields.date('End of period', required=True),
+    }
+
+    _defaults = {
+        'date1': lambda *a: time.strftime('%Y-01-01'),
+        'date2': lambda *a: time.strftime('%Y-%m-%d')
+    }
+
+    def check_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids)[0]
+        datas = {
+             'ids': context.get('active_ids',[]),
+            'model': 'account.analytic.account',
+            'form': data
+        }
+
+        datas['form']['active_ids'] = context.get('active_ids', False)
+
+        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledger', data=datas, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'analytic/project/wizard/account_analytic_cost_ledger_view.xml'
--- analytic/project/wizard/account_analytic_cost_ledger_view.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_cost_ledger_view.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_analytic_cost_view" model="ir.ui.view">
+            <field name="name">Account Analytic Check</field>
+            <field name="model">account.analytic.cost.ledger</field>
+            <field name="arch" type="xml">
+            <form string="Select Period" version="7.0">
+                <header>
+                     <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+                     or
+                     <button string="Cancel" class="oe_link" special="cancel"/>
+                </header>
+                <group col="4">
+                    <field name="date1"/>
+                    <field name="date2"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_account_analytic_cost" model="ir.actions.act_window">
+            <field name="name">Cost Ledger</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.cost.ledger</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_cost_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <record model="ir.values" id="account_analytic_cost_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="name">Account Analytic Cost</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'analytic/project/wizard/account_analytic_inverted_balance_report.py'
--- analytic/project/wizard/account_analytic_inverted_balance_report.py	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_inverted_balance_report.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,52 @@
+# -*- 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 fields, osv
+
+
+class account_analytic_inverted_balance(osv.osv_memory):
+    _name = 'account.analytic.inverted.balance'
+    _description = 'Account Analytic Inverted Balance'
+
+    _columns = {
+        'date1': fields.date('Start of period', required=True),
+        'date2': fields.date('End of period', required=True),
+    }
+
+    _defaults = {
+        'date1': lambda *a: time.strftime('%Y-01-01'),
+        'date2': lambda *a: time.strftime('%Y-%m-%d')
+    }
+
+    def check_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids)[0]
+        datas = {
+             'ids': context.get('active_ids', []),
+            'model': 'account.analytic.account',
+            'form': data
+        }
+        datas['form']['active_ids'] = context.get('active_ids', False)
+        return self.pool['report'].get_action(cr, uid, ids, 'account.report_invertedanalyticbalance', data=datas, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'analytic/project/wizard/account_analytic_inverted_balance_report.xml'
--- analytic/project/wizard/account_analytic_inverted_balance_report.xml	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_inverted_balance_report.xml	2014-04-28 09:41:45 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_analytic_invert_balance_view" model="ir.ui.view">
+            <field name="name">Account Analytic Inverted Balance</field>
+            <field name="model">account.analytic.inverted.balance</field>
+            <field name="arch" type="xml">
+                <form string="Select Period" version="7.0">
+                    <header>
+                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
+                    <group col="4">
+                        <field name="date1"/>
+                        <field name="date2"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
+            <field name="name">Inverted Analytic Balance</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.inverted.balance</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_invert_balance_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <record model="ir.values" id="account_analytic_invert_balance_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="name">Account Analytic Inverted Balance</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'analytic/project/wizard/account_analytic_journal_report.py'
--- analytic/project/wizard/account_analytic_journal_report.py	1970-01-01 00:00:00 +0000
+++ analytic/project/wizard/account_analytic_journal_report.py	2014-04-28 09:41:45 +0000
@@ -0,0 +1,75 @@
+# -*- 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