From d8be17300e262d1aa512d597e27b7ca2c22851e6 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 2 Aug 2007 12:09:30 +0000 Subject: [PATCH] Splitted module report_analytic_line in 2 modules: report_analytic_planning report_analytic_line Change module_graph.py to take a list of modules as arguments ex: gen_graph.sh profile_accounting bzr revid: fp@tinyerp.com-3220c9bc0ed6ec8ddc454ef8515025e9aa3d2989 --- addons/board_project/__terp__.py | 1 + addons/hr_timesheet_sheet/__terp__.py | 2 +- addons/report_analytic_line/__init__.py | 3 -- addons/report_analytic_line/__terp__.py | 5 +-- addons/report_analytic_planning/__init__.py | 31 +++++++++++++++++++ addons/report_analytic_planning/__terp__.py | 19 ++++++++++++ .../report/__init__.py | 0 .../report/report_planning.rml | 0 .../report_account_analytic.planning.csv | 0 .../report_analytic_planning.py | 0 .../report_analytic_planning_report.xml | 0 .../report_analytic_planning_view.xml | 0 12 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 addons/report_analytic_planning/__init__.py create mode 100644 addons/report_analytic_planning/__terp__.py rename addons/{report_analytic_line => report_analytic_planning}/report/__init__.py (100%) rename addons/{report_analytic_line => report_analytic_planning}/report/report_planning.rml (100%) rename addons/{report_analytic_line => report_analytic_planning}/report_account_analytic.planning.csv (100%) rename addons/{report_analytic_line => report_analytic_planning}/report_analytic_planning.py (100%) rename addons/{report_analytic_line => report_analytic_planning}/report_analytic_planning_report.xml (100%) rename addons/{report_analytic_line => report_analytic_planning}/report_analytic_planning_view.xml (100%) diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py index c4aabeb1c8f..40a817347cd 100644 --- a/addons/board_project/__terp__.py +++ b/addons/board_project/__terp__.py @@ -7,6 +7,7 @@ "project", "report_timesheet", "board", + "report_analytic_planning", "report_analytic_line", "report_task", "hr_timesheet_sheet" diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py index 40f88a506d9..f488a362080 100644 --- a/addons/hr_timesheet_sheet/__terp__.py +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -23,7 +23,7 @@ The validation can be configured in te company: * Period size (day, week, month, year) * Maximal difference between timesheet and attendances """, - "depends" : ["base", "hr_timesheet", "hr_timesheet_project", "hr_timesheet_invoice"], + "depends" : ["base", "hr_timesheet", "hr_timesheet_invoice"], "init_xml" : [], "demo_xml" : ["hr_timesheet_sheet_demo.xml",], "update_xml" : ["hr_timesheet_sheet_view.xml", "hr_timesheet_workflow.xml"], diff --git a/addons/report_analytic_line/__init__.py b/addons/report_analytic_line/__init__.py index d2693782e4b..2631131552e 100644 --- a/addons/report_analytic_line/__init__.py +++ b/addons/report_analytic_line/__init__.py @@ -28,6 +28,3 @@ ############################################################################## import report_analytic_line -import report_analytic_planning - -import report diff --git a/addons/report_analytic_line/__terp__.py b/addons/report_analytic_line/__terp__.py index c8e37323bcb..1d983a42739 100644 --- a/addons/report_analytic_line/__terp__.py +++ b/addons/report_analytic_line/__terp__.py @@ -3,17 +3,14 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com", - "depends" : ["account", "hr_timesheet_invoice","project"], + "depends" : ["account", "hr_timesheet_invoice"], "category" : "Generic Modules/Accounting", "description": "A report on analytic lines, costs by products, months and accounts.", "init_xml" : [], "demo_xml" : [ - "report_account_analytic.planning.csv" ], "update_xml" : [ "report_analytic_line_view.xml", - "report_analytic_planning_view.xml", - "report_analytic_planning_report.xml" ], "active": False, "installable": True diff --git a/addons/report_analytic_planning/__init__.py b/addons/report_analytic_planning/__init__.py new file mode 100644 index 00000000000..33cf4cfd5bb --- /dev/null +++ b/addons/report_analytic_planning/__init__.py @@ -0,0 +1,31 @@ +############################################################################## +# +# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# $Id: sale.py 1005 2005-07-25 08:41:42Z nicoe $ +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + +import report_analytic_planning +import report diff --git a/addons/report_analytic_planning/__terp__.py b/addons/report_analytic_planning/__terp__.py new file mode 100644 index 00000000000..1ba201470e5 --- /dev/null +++ b/addons/report_analytic_planning/__terp__.py @@ -0,0 +1,19 @@ +{ + "name" : "Analytic planning - Reporting", + "version" : "1.0", + "author" : "Tiny", + "website" : "http://tinyerp.com", + "depends" : ["account", "hr_timesheet_invoice","project","report_analytic_line"], + "category" : "Generic Modules/Accounting", + "description": "Planning on analytic accounts.", + "init_xml" : [], + "demo_xml" : [ + "report_account_analytic.planning.csv" + ], + "update_xml" : [ + "report_analytic_planning_view.xml", + "report_analytic_planning_report.xml" + ], + "active": False, + "installable": True +} diff --git a/addons/report_analytic_line/report/__init__.py b/addons/report_analytic_planning/report/__init__.py similarity index 100% rename from addons/report_analytic_line/report/__init__.py rename to addons/report_analytic_planning/report/__init__.py diff --git a/addons/report_analytic_line/report/report_planning.rml b/addons/report_analytic_planning/report/report_planning.rml similarity index 100% rename from addons/report_analytic_line/report/report_planning.rml rename to addons/report_analytic_planning/report/report_planning.rml diff --git a/addons/report_analytic_line/report_account_analytic.planning.csv b/addons/report_analytic_planning/report_account_analytic.planning.csv similarity index 100% rename from addons/report_analytic_line/report_account_analytic.planning.csv rename to addons/report_analytic_planning/report_account_analytic.planning.csv diff --git a/addons/report_analytic_line/report_analytic_planning.py b/addons/report_analytic_planning/report_analytic_planning.py similarity index 100% rename from addons/report_analytic_line/report_analytic_planning.py rename to addons/report_analytic_planning/report_analytic_planning.py diff --git a/addons/report_analytic_line/report_analytic_planning_report.xml b/addons/report_analytic_planning/report_analytic_planning_report.xml similarity index 100% rename from addons/report_analytic_line/report_analytic_planning_report.xml rename to addons/report_analytic_planning/report_analytic_planning_report.xml diff --git a/addons/report_analytic_line/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml similarity index 100% rename from addons/report_analytic_line/report_analytic_planning_view.xml rename to addons/report_analytic_planning/report_analytic_planning_view.xml