diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 157a08f8ca5..82a063256c1 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -35,10 +35,10 @@ - - diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index eba69e2785b..f853b809867 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -36,10 +36,10 @@ - - diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index f61348c290c..5d1b99b578e 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -50,10 +50,10 @@ - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 597e5f43675..94f181cd587 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -54,10 +54,10 @@ - - diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 44c20ebbe16..6ccd1e80ab9 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -6,7 +6,7 @@ hr.evaluation.report tree - + @@ -27,7 +27,7 @@ hr.evaluation.report graph - + @@ -40,12 +40,12 @@ hr.evaluation.report search - + - - @@ -99,7 +99,7 @@ - Evaluations + Evaluations Analysis hr.evaluation.report form tree,graph diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 1d1b1dc6e0f..6507ff87342 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -6,7 +6,7 @@ hr.expense.report tree - + @@ -36,7 +36,7 @@ hr.expense.report graph - + @@ -49,42 +49,42 @@ hr.expense.report search - + - - + + + string=" 7 Days " + separator="1" + domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" + help="Expenses during last 7 days"/> + icon="terp-hr" + domain="[('state','=','draft')]" + help = "Draft Expenses"/> + icon="terp-hr" + domain="[('state', '=' ,'confirm')]" + help = "Confirm Expenses"/> + icon="terp-hr" + domain="[('state','=','accepted')]" + help = "Accepted Expenses"/> - - - + + + @@ -106,37 +106,29 @@ - - - - + + + + + + + - - - - - + + + - Expenses + Expenses Analysis hr.expense.report form tree,graph - {'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]} + {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 00d15ef3f21..7c867247cd0 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -35,7 +35,7 @@ class hr_recruitment_report(osv.osv): _description = "Recruitments Statistics" _auto = False _rec_name = 'date' - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -73,9 +73,7 @@ class hr_recruitment_report(osv.osv): return res _columns = { - 'name': fields.char('Year', size=64, required=False, readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"), @@ -88,8 +86,7 @@ class hr_recruitment_report(osv.osv): ('09', 'September'), ('10', 'October'),\ ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'create_date': fields.datetime('Create Date', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'year': fields.char('Year', size=4, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), @@ -99,7 +96,6 @@ class hr_recruitment_report(osv.osv): 'date_closed': fields.date('Closed', readonly=True), 'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True), 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'), -# 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True), 'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"), 'department_id':fields.many2one('hr.department','Department',readonly=True), 'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'), diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 5913684eb80..8a9e913a454 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -6,7 +6,7 @@ hr.recruitment.report tree - + @@ -33,7 +33,7 @@ hr.recruitment.report graph - + @@ -45,66 +45,56 @@ hr.recruitment.report search - + - - + + help="Recruitment performed in this month"/> + help="Recruitment during last 7 days"/> + help = "Draft recruitment"/> + help = "In progress recruitment"/> + help = "Pending recruitment"/> - - - + + + + - - - - - - + + + - - @@ -112,37 +102,30 @@ - + - - - - + + + - - - - + + + - Recruitments + Recruitment Analysis hr.recruitment.report form tree,graph - {'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]} + {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py new file mode 100644 index 00000000000..c83787a6ef7 --- /dev/null +++ b/addons/marketing/__init__.py @@ -0,0 +1,25 @@ +# -*- 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 marketing_wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py new file mode 100644 index 00000000000..ee6abca5355 --- /dev/null +++ b/addons/marketing/__openerp__.py @@ -0,0 +1,37 @@ +# -*- 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 . +# +############################################################################## + + +{ + "name" : "Marketing", + "version" : "1.1", + "depends" : ["base"], + "author" : "Tiny", + "category": 'Generic Modules/Marketing', + "description": "Menu for Marketing", + 'website': 'http://www.openerp.com', + 'init_xml': [], + 'update_xml': ['marketing_view.xml'], + 'demo_xml': [], + 'installable': True, + 'active': False, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml new file mode 100644 index 00000000000..7a72f39c6eb --- /dev/null +++ b/addons/marketing/marketing_view.xml @@ -0,0 +1,52 @@ + + + + + + + + marketing.installer.view + marketing.installer + form + + + +
+ Marketing Modules Installation +
+ + + Configure Your Marketing System + + + You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications + + + + + + + + + + + + + + Marketing Modules Installation + ir.actions.act_window + marketing.installer + + form + form + new + + + + + 3 + + + + \ No newline at end of file diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py new file mode 100644 index 00000000000..443fb09ed48 --- /dev/null +++ b/addons/marketing/marketing_wizard.py @@ -0,0 +1,38 @@ +# -*- 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 . +# +############################################################################## + +from osv import fields, osv + +class marketing_installer(osv.osv_memory): + _name = 'marketing.installer' + _inherit = 'res.config.installer' + + _columns = { + # Generic modules + 'marketing_campaign':fields.boolean('Marketing Campaign', + help="Helps you to manage your marketing campaigns step by step."), + 'crm_profiling':fields.boolean('Crm Profile', + help="Helps you to perform segmentation within partners.") + } + +marketing_installer() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index 9a10fdbaa3d..aca6c2f6d28 100755 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -23,7 +23,8 @@ { "name" : "", "version" : "1.1", - "depends" : ["crm", + "depends" : ["marketing", + "crm", "document", "poweremail" # need to get this module form the branch # lp:poweremail @@ -39,6 +40,7 @@ 'marketing_campaign_data.xml', 'marketing_campaign_workflow.xml', 'report/campaign_analysis_view.xml', + 'marketing_campaign_demo.xml' ], 'demo_xml': [ 'marketing_campaign_demo.xml', diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 5a7f8529cc0..fb88b6d283d 100755 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -1,7 +1,7 @@ - +