[REM/MOVE]:moved the report_analytic files in hr_timesheet_invoice module and removed...
authorapa-tiny <apa@tinyerp.com>
Fri, 12 Mar 2010 12:42:47 +0000 (18:12 +0530)
committerapa-tiny <apa@tinyerp.com>
Fri, 12 Mar 2010 12:42:47 +0000 (18:12 +0530)
bzr revid: apa@tinyerp.com-20100312124247-8ojsf86doe2304bg

addons/hr_timesheet_invoice/__terp__.py
addons/hr_timesheet_invoice/report/__init__.py
addons/hr_timesheet_invoice/report/report_analytic.py [new file with mode: 0644]
addons/hr_timesheet_invoice/report/report_analytic_view.xml [new file with mode: 0644]
addons/hr_timesheet_invoice/security/ir.model.access.csv
addons/report_analytic/__init__.py [deleted file]
addons/report_analytic/__terp__.py [deleted file]
addons/report_analytic/report_analytic.py [deleted file]
addons/report_analytic/report_analytic_view.xml [deleted file]
addons/report_analytic/security/ir.model.access.csv [deleted file]

index cbb2ace..fd07bb2 100644 (file)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,7 +36,8 @@ reports, eso.""",
         'security/ir.model.access.csv',
         'hr_timesheet_invoice_view.xml',
         'hr_timesheet_invoice_wizard.xml',
-        'hr_timesheet_invoice_report.xml'
+        'hr_timesheet_invoice_report.xml',
+        'report/report_analytic_view.xml',
     ],
     'demo_xml': ['hr_timesheet_invoice_demo.xml'],
     'installable': True,
index 9d87b1f..dc24977 100644 (file)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import cost_ledger
 import account_analytic_profit
+import report_analytic
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
new file mode 100644 (file)
index 0000000..0b3d144
--- /dev/null
@@ -0,0 +1,109 @@
+# -*- 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 osv import fields,osv
+import tools
+
+class report_analytic_account_close(osv.osv):
+    _name = "report.analytic.account.close"
+    _description = "Analytic account to close"
+    _auto = False
+    _columns = {
+        'name': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
+        'state': fields.char('State', size=32, readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'quantity': fields.float('Quantity', readonly=True),
+        'quantity_max': fields.float('Max. Quantity', readonly=True),
+        'balance': fields.float('Balance', readonly=True),
+        'date_deadline': fields.date('Deadline', readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_analytic_account_close')
+        cr.execute("""
+            create or replace view report_analytic_account_close as (
+                select
+                    a.id as id,
+                    a.id as name,
+                    a.state as state,
+                    sum(l.unit_amount) as quantity,
+                    sum(l.amount) as balance,
+                    a.partner_id as partner_id,
+                    a.quantity_max as quantity_max,
+                    a.date as date_deadline
+                from
+                    account_analytic_line l
+                right join
+                    account_analytic_account a on (l.account_id=a.id)
+                group by
+                    a.id,a.state, a.quantity_max,a.date,a.partner_id
+                having
+                    (a.quantity_max>0 and (sum(l.unit_amount)>=a.quantity_max)) or
+                    a.date <= current_date
+            )""")
+report_analytic_account_close()
+
+class report_account_analytic_line_to_invoice(osv.osv):
+    _name = "report.account.analytic.line.to.invoice"
+    _description = "Analytic lines to invoice report"
+    _auto = False
+    _columns = {
+        'name': fields.char('Year',size=64,required=False, readonly=True),
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
+        'product_uom_id':fields.many2one('product.uom', 'UoM', readonly=True),
+        'unit_amount': fields.float('Units', readonly=True),
+        'sale_price': fields.float('Sale price', readonly=True),
+        'amount': fields.float('Amount', readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+    }
+    _order = 'name desc, product_id asc, account_id asc'
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_account_analytic_line_to_invoice')
+        cr.execute("""
+            CREATE OR REPLACE VIEW report_account_analytic_line_to_invoice AS (
+                SELECT
+                    DISTINCT(to_char(l.date,'MM')) as month,
+                    to_char(l.date, 'YYYY') as name,
+                    MIN(l.id) AS id,
+                    l.product_id,
+                    l.account_id,
+                    SUM(l.amount) AS amount,
+                    SUM(l.unit_amount*t.list_price) AS sale_price,
+                    SUM(l.unit_amount) AS unit_amount,
+                    l.product_uom_id
+                FROM
+                    account_analytic_line l
+                left join
+                    product_product p on (l.product_id=p.id)
+                left join
+                    product_template t on (p.product_tmpl_id=t.id)
+                WHERE
+                    (invoice_id IS NULL) and (to_invoice IS NOT NULL)
+                GROUP BY
+                    to_char(l.date, 'YYYY'), to_char(l.date,'MM'), product_id, product_uom_id, account_id
+            )
+        """)
+report_account_analytic_line_to_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
new file mode 100644 (file)
index 0000000..da501ad
--- /dev/null
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Analytic accounts to close -->
+        <record id="view_analytic_account_close_form" model="ir.ui.view">
+            <field name="name">report.analytic.account.close.form</field>
+            <field name="model">report.analytic.account.close</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Expired analytic accounts">
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="quantity" select="1"/>
+                    <field name="state" select="1"/>
+                    <field name="quantity_max"/>
+                    <field name="date_deadline" select="1"/>
+                    <field name="balance" select="1"/>
+                </form>
+            </field>
+        </record>
+        
+        
+        <record id="view_analytic_account_close_tree" model="ir.ui.view">
+            <field name="name">report.analytic.account.close.tree</field>
+            <field name="model">report.analytic.account.close</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Expired analytic accounts">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="state"/>
+                    <field name="quantity"/>
+                    <field name="quantity_max"/>
+                    <field name="date_deadline"/>
+                    <field name="balance"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_analytic_account_graph" model="ir.ui.view">
+            <field name="name">report.analytic.account.close.graph</field>
+            <field name="model">report.analytic.account.close</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Expired analytic accounts" type="bar">
+                    <field name="partner_id"/>
+                    <field name="quantity" operator="+"/>
+                    <field name="quantity_max" operator="+"/> 
+                </graph>
+            </field>
+        </record>
+        
+        <record id="action_analytic_account_tree" model="ir.actions.act_window">
+            <field name="name">Expired analytic accounts</field>
+            <field name="res_model">report.analytic.account.close</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="domain">[('state','=','open')]</field>
+        </record>
+        <menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_40"/>
+
+
+        <record id="account_analytic_line_to_invoice_view_form" model="ir.ui.view">
+            <field name="name">report.account.analytic.line.to.invoice</field>
+            <field name="model">report.account.analytic.line.to.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Lines to Invoice">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="account_id" select="1"/>
+                    <newline/>
+                    <field name="product_id" select="1"/>
+                    <field name="product_uom_id"/>
+                    <newline/>
+                    <field colspan="1" name="amount"/>
+                    <field colspan="1" name="unit_amount"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_analytic_line_to_invoice_view_tree" model="ir.ui.view">
+            <field name="name">report.account.analytic.line.to.invoice</field>
+            <field name="model">report.account.analytic.line.to.invoice</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Lines to Invoice">
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="product_id"/>
+                    <field name="account_id"/>
+                    <field name="amount"/>
+                    <field name="sale_price"/>
+                    <field name="unit_amount"/>
+                    <field name="product_uom_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="account_analytic_line_to_invoice_view_graph" model="ir.ui.view">
+            <field name="name">report.account.analytic.line.to.invoice.graph</field>
+            <field name="model">report.account.analytic.line.to.invoice</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Analytic Lines to Invoice" type="bar">
+                    <field name="name"/>
+                    <field name="sale_price" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+               <record id="account_analytic_line_to_invoice_view_filter" model="ir.ui.view">
+            <field name="name">report.account.analytic.line.to.invoice.select</field>
+            <field name="model">report.account.analytic.line.to.invoice</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Lines to Invoice">
+                   <group col="12" colspan="4">
+                               <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+                                               <filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+                                               <separator orientation="vertical"/>
+                                               <field name="name" select="1"/>
+                                               <field name="month" select="1"/>
+                           <field name="product_id" select="1"/>
+                           <field name="account_id" select="1"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
+        <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
+            <field name="name">Analytic Lines to Invoice</field>
+            <field name="res_model">report.account.analytic.line.to.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
+        </record>
+        <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>
+
+        <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
+        
+    </data>
+</openerp>
index 670f835..a81e229 100644 (file)
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","hr.group_hr_user",1,0,0,0
 "access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
+"access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
+"access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
diff --git a/addons/report_analytic/__init__.py b/addons/report_analytic/__init__.py
deleted file mode 100644 (file)
index ad14dd1..0000000
+++ /dev/null
@@ -1,25 +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 report_analytic
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_analytic/__terp__.py b/addons/report_analytic/__terp__.py
deleted file mode 100644 (file)
index c5ec3a0..0000000
+++ /dev/null
@@ -1,38 +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/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'Analytic Account Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """A module that adds new reports based on analytic accounts.""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['account', 'hr_timesheet_invoice'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_analytic_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0059950675429',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_analytic/report_analytic.py b/addons/report_analytic/report_analytic.py
deleted file mode 100644 (file)
index 0b3d144..0000000
+++ /dev/null
@@ -1,109 +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 osv import fields,osv
-import tools
-
-class report_analytic_account_close(osv.osv):
-    _name = "report.analytic.account.close"
-    _description = "Analytic account to close"
-    _auto = False
-    _columns = {
-        'name': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
-        'state': fields.char('State', size=32, readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
-        'quantity_max': fields.float('Max. Quantity', readonly=True),
-        'balance': fields.float('Balance', readonly=True),
-        'date_deadline': fields.date('Deadline', readonly=True),
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_analytic_account_close')
-        cr.execute("""
-            create or replace view report_analytic_account_close as (
-                select
-                    a.id as id,
-                    a.id as name,
-                    a.state as state,
-                    sum(l.unit_amount) as quantity,
-                    sum(l.amount) as balance,
-                    a.partner_id as partner_id,
-                    a.quantity_max as quantity_max,
-                    a.date as date_deadline
-                from
-                    account_analytic_line l
-                right join
-                    account_analytic_account a on (l.account_id=a.id)
-                group by
-                    a.id,a.state, a.quantity_max,a.date,a.partner_id
-                having
-                    (a.quantity_max>0 and (sum(l.unit_amount)>=a.quantity_max)) or
-                    a.date <= current_date
-            )""")
-report_analytic_account_close()
-
-class report_account_analytic_line_to_invoice(osv.osv):
-    _name = "report.account.analytic.line.to.invoice"
-    _description = "Analytic lines to invoice report"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'product_id':fields.many2one('product.product', 'Product', readonly=True),
-        'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
-        'product_uom_id':fields.many2one('product.uom', 'UoM', readonly=True),
-        'unit_amount': fields.float('Units', readonly=True),
-        'sale_price': fields.float('Sale price', readonly=True),
-        'amount': fields.float('Amount', readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-    }
-    _order = 'name desc, product_id asc, account_id asc'
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_account_analytic_line_to_invoice')
-        cr.execute("""
-            CREATE OR REPLACE VIEW report_account_analytic_line_to_invoice AS (
-                SELECT
-                    DISTINCT(to_char(l.date,'MM')) as month,
-                    to_char(l.date, 'YYYY') as name,
-                    MIN(l.id) AS id,
-                    l.product_id,
-                    l.account_id,
-                    SUM(l.amount) AS amount,
-                    SUM(l.unit_amount*t.list_price) AS sale_price,
-                    SUM(l.unit_amount) AS unit_amount,
-                    l.product_uom_id
-                FROM
-                    account_analytic_line l
-                left join
-                    product_product p on (l.product_id=p.id)
-                left join
-                    product_template t on (p.product_tmpl_id=t.id)
-                WHERE
-                    (invoice_id IS NULL) and (to_invoice IS NOT NULL)
-                GROUP BY
-                    to_char(l.date, 'YYYY'), to_char(l.date,'MM'), product_id, product_uom_id, account_id
-            )
-        """)
-report_account_analytic_line_to_invoice()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/report_analytic/report_analytic_view.xml
deleted file mode 100644 (file)
index da501ad..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Analytic accounts to close -->
-        <record id="view_analytic_account_close_form" model="ir.ui.view">
-            <field name="name">report.analytic.account.close.form</field>
-            <field name="model">report.analytic.account.close</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Expired analytic accounts">
-                    <field name="name" select="1"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="quantity" select="1"/>
-                    <field name="state" select="1"/>
-                    <field name="quantity_max"/>
-                    <field name="date_deadline" select="1"/>
-                    <field name="balance" select="1"/>
-                </form>
-            </field>
-        </record>
-        
-        
-        <record id="view_analytic_account_close_tree" model="ir.ui.view">
-            <field name="name">report.analytic.account.close.tree</field>
-            <field name="model">report.analytic.account.close</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Expired analytic accounts">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="state"/>
-                    <field name="quantity"/>
-                    <field name="quantity_max"/>
-                    <field name="date_deadline"/>
-                    <field name="balance"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="view_analytic_account_graph" model="ir.ui.view">
-            <field name="name">report.analytic.account.close.graph</field>
-            <field name="model">report.analytic.account.close</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Expired analytic accounts" type="bar">
-                    <field name="partner_id"/>
-                    <field name="quantity" operator="+"/>
-                    <field name="quantity_max" operator="+"/> 
-                </graph>
-            </field>
-        </record>
-        
-        <record id="action_analytic_account_tree" model="ir.actions.act_window">
-            <field name="name">Expired analytic accounts</field>
-            <field name="res_model">report.analytic.account.close</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="domain">[('state','=','open')]</field>
-        </record>
-        <menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_40"/>
-
-
-        <record id="account_analytic_line_to_invoice_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.line.to.invoice</field>
-            <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Lines to Invoice">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="account_id" select="1"/>
-                    <newline/>
-                    <field name="product_id" select="1"/>
-                    <field name="product_uom_id"/>
-                    <newline/>
-                    <field colspan="1" name="amount"/>
-                    <field colspan="1" name="unit_amount"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="account_analytic_line_to_invoice_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.line.to.invoice</field>
-            <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Analytic Lines to Invoice">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="product_id"/>
-                    <field name="account_id"/>
-                    <field name="amount"/>
-                    <field name="sale_price"/>
-                    <field name="unit_amount"/>
-                    <field name="product_uom_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="account_analytic_line_to_invoice_view_graph" model="ir.ui.view">
-            <field name="name">report.account.analytic.line.to.invoice.graph</field>
-            <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Analytic Lines to Invoice" type="bar">
-                    <field name="name"/>
-                    <field name="sale_price" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-               <record id="account_analytic_line_to_invoice_view_filter" model="ir.ui.view">
-            <field name="name">report.account.analytic.line.to.invoice.select</field>
-            <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Analytic Lines to Invoice">
-                   <group col="12" colspan="4">
-                               <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-                                               <filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
-                                               <separator orientation="vertical"/>
-                                               <field name="name" select="1"/>
-                                               <field name="month" select="1"/>
-                           <field name="product_id" select="1"/>
-                           <field name="account_id" select="1"/>
-                   </group>
-               </search>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
-            <field name="name">Analytic Lines to Invoice</field>
-            <field name="res_model">report.account.analytic.line.to.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
-        </record>
-        <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>
-
-        <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
-        
-    </data>
-</openerp>
diff --git a/addons/report_analytic/security/ir.model.access.csv b/addons/report_analytic/security/ir.model.access.csv
deleted file mode 100644 (file)
index 6780739..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_analytic_account_close,report.analytic.account.close,model_report_analytic_account_close,account.group_account_manager,1,0,0,0
-access_report_account_analytic_line_to_invoice,report.account.analytic.line.to.invoice,model_report_account_analytic_line_to_invoice,account.group_account_manager,1,0,0,0
\ No newline at end of file