diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py index 269cec893ed..429aa011f31 100644 --- a/addons/account_analytic_analysis/__init__.py +++ b/addons/account_analytic_analysis/__init__.py @@ -21,7 +21,6 @@ import account_analytic_analysis import cron_account_analytic_account -import report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 8dbbd6b39e4..4f25ece5954 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -42,7 +42,6 @@ user-wise as well as month wise. "account_analytic_analysis_view.xml", "account_analytic_analysis_menu.xml", "account_analytic_analysis_cron.xml", - "account_analytic_analysis_report.xml" ], 'demo_xml': [], 'installable': True, diff --git a/addons/account_analytic_analysis/account_analytic_analysis_report.xml b/addons/account_analytic_analysis/account_analytic_analysis_report.xml deleted file mode 100644 index 2785d68fd32..00000000000 --- a/addons/account_analytic_analysis/account_analytic_analysis_report.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/addons/account_analytic_analysis/report/__init__.py b/addons/account_analytic_analysis/report/__init__.py deleted file mode 100644 index 69726299c50..00000000000 --- a/addons/account_analytic_analysis/report/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# 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 . -# -############################################################################## - -import analytic_account - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/account_analytic_analysis/report/analytic_account.py b/addons/account_analytic_analysis/report/analytic_account.py deleted file mode 100644 index 336d9ccb340..00000000000 --- a/addons/account_analytic_analysis/report/analytic_account.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# 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 . -# -############################################################################## - -import time -from report import report_sxw - -class analytic_account(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): - super(analytic_account, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'time': time, - 'get_lines': self.get_lines, - }) - def get_lines(self, analytic_account): - res = [] - res.append(('Fix Price Invoices',analytic_account.amount_max,analytic_account.ca_invoiced,analytic_account.remaining_ca,analytic_account.ca_to_invoice)) - res.append(('Invoice On Timesheets',analytic_account.hours_qtt_est,analytic_account.hours_qtt_invoiced,analytic_account.remaining_hours,analytic_account.hours_qtt_non_invoiced)) - res.append(('Total',analytic_account.est_total,analytic_account.invoiced_total,analytic_account.remaining_total,analytic_account.toinvoice_total)) - return res - -report_sxw.report_sxw( - 'report.analytic.account', - 'account.analytic.account', - 'addons/account_analytic_analysis/report/analytic_account.rml', - parser=analytic_account -) -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_analytic_analysis/report/analytic_account.rml b/addons/account_analytic_analysis/report/analytic_account.rml deleted file mode 100644 index c86562c4650..00000000000 --- a/addons/account_analytic_analysis/report/analytic_account.rml +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Analytic Account - - [[repeatIn(objects,'account')]] - - - - - - - Customer - - - Code/Refrence - - - Project Name - - - Account Manager - - - - - [[ account.partner_id.name ]] - - - [[ account.code ]] - - - [[ account.name ]] - - - [[ account.user_id.name ]] - - - - - Validity - - - - - Date Start - - - Date End - - - Maximum Time - - - - - [[ formatLang(account.date_start,date=True) ]] - - - [[ formatLang(account.date,date=True) ]] - - - [[ account.quantity_max or 'N/A' ]] - - - - - - - - - - Invoicing - - - Total Cost - - - Invoiced - - - Remaining - - - Ready To Invoice - - - -
- [[repeatIn(get_lines(account),'line')]] - - - - [[ line[0] ]] - - - [[ formatLang(line[1]) ]] - - - [[ formatLang(line[2]) ]] - - - [[ formatLang(line[3]) ]] - - - [[ formatLang(line[4]) ]] - - - -
- - - - Terms & Conditions - - - - [[ account.description ]] - - - - - - - - - - - - - Signature -
-