From 6f33cfb8b5bf500c7413a73df0771ae91ad6c996 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 28 Apr 2010 16:40:14 +0530 Subject: [PATCH] [REM]: crm: Removed fundraising from crm [ADD]: crm_fundraising: Added new module for fundraising bzr revid: rpa@tinyerp.com-20100428111014-v9ruvr62t3pjr7gs --- addons/crm/__init__.py | 3 -- addons/crm/__openerp__.py | 35 ++++---------- addons/crm/report/__init__.py | 3 -- addons/crm/security/ir.model.access.csv | 6 --- addons/crm_fundraising/__init__.py | 26 ++++++++++ addons/crm_fundraising/__openerp__.py | 48 +++++++++++++++++++ .../crm_fundraising.py | 4 +- .../crm_fundraising_data.xml} | 16 +++---- .../crm_fundraising_demo.xml} | 16 +++---- .../crm_fundraising_menu.xml} | 16 +++---- .../crm_fundraising_view.xml} | 4 +- addons/crm_fundraising/report/__init__.py | 25 ++++++++++ .../report/crm_fundraising_report.py | 0 .../report/crm_fundraising_report_view.xml | 4 +- .../security/ir.model.access.csv | 3 ++ .../test/test_crm_fund.yml | 0 16 files changed, 141 insertions(+), 68 deletions(-) create mode 100644 addons/crm_fundraising/__init__.py create mode 100644 addons/crm_fundraising/__openerp__.py rename addons/{crm => crm_fundraising}/crm_fundraising.py (98%) rename addons/{crm/crm_fund_data.xml => crm_fundraising/crm_fundraising_data.xml} (78%) rename addons/{crm/crm_fund_demo.xml => crm_fundraising/crm_fundraising_demo.xml} (92%) rename addons/{crm/crm_fund_menu.xml => crm_fundraising/crm_fundraising_menu.xml} (64%) rename addons/{crm/crm_fund_view.xml => crm_fundraising/crm_fundraising_view.xml} (99%) create mode 100644 addons/crm_fundraising/report/__init__.py rename addons/{crm => crm_fundraising}/report/crm_fundraising_report.py (100%) rename addons/{crm => crm_fundraising}/report/crm_fundraising_report_view.xml (97%) create mode 100644 addons/crm_fundraising/security/ir.model.access.csv rename addons/{crm => crm_fundraising}/test/test_crm_fund.yml (100%) diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index 1c0cc81dd38..48d1193129e 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -27,9 +27,6 @@ import crm_meeting import crm_opportunity import crm_lead import crm_phonecall -import crm_claim -import crm_fundraising -import crm_helpdesk import report import wizard diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index e4dea534b65..37ffc80bd29 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -26,7 +26,7 @@ 'category': 'Generic Modules/CRM & SRM', 'description': """The generic Open ERP Customer Relationship Management system enables a group of people to intelligently and efficiently manage -leads, opportunities, claims, meeting, phonecall etc. +leads, opportunities, meeting, phonecall etc. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification. @@ -55,13 +55,10 @@ between mails and Open ERP.""", 'init_xml': [ 'crm_data.xml', 'crm_meeting_data.xml', - 'crm_claims_data.xml', - 'crm_fund_data.xml', - 'crm_helpdesk_data.xml', - 'crm_lead_data.xml', - 'crm_meeting_data.xml', - 'crm_opportunity_data.xml', - 'crm_phonecall_data.xml', + 'crm_lead_data.xml', + 'crm_meeting_data.xml', + 'crm_opportunity_data.xml', + 'crm_phonecall_data.xml', ], 'update_xml': [ @@ -82,49 +79,37 @@ between mails and Open ERP.""", 'crm_action_rule_view.xml', 'crm_lead_view.xml', 'crm_lead_menu.xml', + 'crm_meeting_view.xml', 'crm_meeting_menu.xml', + 'crm_phonecall_view.xml', 'crm_phonecall_menu.xml', + 'crm_opportunity_view.xml', 'crm_opportunity_menu.xml', - 'crm_fund_view.xml', - 'crm_fund_menu.xml', - 'crm_claims_view.xml', - 'crm_claims_menu.xml', - - 'crm_helpdesk_view.xml', - 'crm_helpdesk_menu.xml', - + 'security/crm_security.xml', 'security/ir.model.access.csv', 'report/crm_report_view.xml', - 'report/crm_claim_report_view.xml', 'report/crm_lead_report_view.xml', - 'report/crm_fundraising_report_view.xml', 'report/crm_opportunity_report_view.xml' , 'report/crm_phonecall_report_view.xml', 'process/crm_configuration_process.xml', ], 'demo_xml': [ - 'test/test_crm_meeting.yml', 'crm_demo.xml', - 'crm_claims_demo.xml', - 'crm_fund_demo.xml', - 'crm_helpdesk_demo.xml', 'crm_lead_demo.xml', 'crm_meeting_demo.xml', 'crm_opportunity_demo.xml', 'crm_phonecall_demo.xml' ], 'test': ['test/test_crm_lead.yml', + 'test/test_crm_meeting.yml', 'test/test_crm_opportunity.yml', 'test/test_crm_phonecall.yml', - 'test/test_crm_fund.yml', - 'test/test_crm_claim.yml', - 'test/test_crm_helpdesk.yml', ], 'installable': True, 'active': False, diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py index 7030c43cfe2..bfcbba7d875 100644 --- a/addons/crm/report/__init__.py +++ b/addons/crm/report/__init__.py @@ -21,12 +21,9 @@ #import report_businessopp import crm_report -import crm_claim_report import crm_lead_report import crm_phonecall_report -import crm_fundraising_report import crm_opportunity_report -import crm_helpdesk_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 12e9d2557f1..37a36fc5504 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -5,9 +5,6 @@ "access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0 "access_crm_case_manger","crm.case manager","model_crm_case","crm.group_crm_user",1,1,1,1 "access_crm_case","crm.case","model_crm_case","crm.group_crm_manager",1,1,1,1 -"access_crm_claim","crm.claim","model_crm_claim","crm.group_crm_manager",1,1,1,1 -"access_crm_fundraising","crm.fundraising","model_crm_fundraising","crm.group_crm_manager",1,1,1,1 -"access_crm_helpdesk","crm.helpdesk","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1 "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1 "access_crm_opportunity","crm.opportunity","model_crm_opportunity","crm.group_crm_manager",1,1,1,1 @@ -26,8 +23,6 @@ "access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","crm.group_crm_manager",1,1,1,1 "access_crm_case_report_user","crm.case.report","model_crm_case_report","crm.group_crm_user",1,0,0,0 "access_crm_case_report_manager","crm.case.report manager","model_crm_case_report","crm.group_crm_manager",1,1,1,1 -"access_crm_claim_report_user","crm.claim.report","model_crm_claim_report","crm.group_crm_user",1,0,0,0 -"access_crm_fundraising_report_user","crm.fundraising.report","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0 "access_crm_lead_report_user","crm.lead.report","model_crm_lead_report","crm.group_crm_user",1,0,0,0 "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0 "access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0 @@ -38,7 +33,6 @@ "access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,1,1,1 "access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,1,1,1 "access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1 -"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1 "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1 "access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1 diff --git a/addons/crm_fundraising/__init__.py b/addons/crm_fundraising/__init__.py new file mode 100644 index 00000000000..b16301ec63c --- /dev/null +++ b/addons/crm_fundraising/__init__.py @@ -0,0 +1,26 @@ +# -*- 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 crm_fundraising +import report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py new file mode 100644 index 00000000000..292325f1084 --- /dev/null +++ b/addons/crm_fundraising/__openerp__.py @@ -0,0 +1,48 @@ +# -*- 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': 'CRM Fundraising', + 'version': '1.0', + 'category': 'Generic Modules/CRM & SRM', + 'description': """Fundraising""", + 'author': 'Tiny', + 'website': 'http://www.openerp.com', + 'depends': ['crm'], + 'init_xml': [ + 'crm_fundraising_data.xml', + ], + + 'update_xml': [ + 'crm_fundraising_view.xml', + 'crm_fundraising_menu.xml', + 'security/ir.model.access.csv', + 'report/crm_fundraising_report_view.xml', + ], + 'demo_xml': [ + 'crm_fundraising_demo.xml', + ], + 'installable': True, + 'active': False, +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py similarity index 98% rename from addons/crm/crm_fundraising.py rename to addons/crm_fundraising/crm_fundraising.py index afd7f7fbf4d..30c413076ea 100644 --- a/addons/crm/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -20,7 +20,7 @@ ############################################################################## from osv import fields, osv, orm -import crm +from crm import crm class crm_fundraising(osv.osv): """ Fund Raising Cases """ @@ -73,5 +73,3 @@ class crm_fundraising(osv.osv): } crm_fundraising() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_fund_data.xml b/addons/crm_fundraising/crm_fundraising_data.xml similarity index 78% rename from addons/crm/crm_fund_data.xml rename to addons/crm_fundraising/crm_fundraising_data.xml index 1c566279b90..03613d87a7f 100644 --- a/addons/crm/crm_fund_data.xml +++ b/addons/crm_fundraising/crm_fundraising_data.xml @@ -6,25 +6,25 @@ Social Rehabilitation And Rural Upliftment - + Learning And Education - + Healthcare - + Arts And Culture - + @@ -32,25 +32,25 @@ Cash - + Cheque - + Credit Card - + Demand Draft - + diff --git a/addons/crm/crm_fund_demo.xml b/addons/crm_fundraising/crm_fundraising_demo.xml similarity index 92% rename from addons/crm/crm_fund_demo.xml rename to addons/crm_fundraising/crm_fundraising_demo.xml index 23ea6835df1..c7588701af0 100644 --- a/addons/crm/crm_fund_demo.xml +++ b/addons/crm_fundraising/crm_fundraising_demo.xml @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml similarity index 64% rename from addons/crm/crm_fund_menu.xml rename to addons/crm_fundraising/crm_fundraising_menu.xml index 7a53ab1aa18..eab0603c446 100644 --- a/addons/crm/crm_fund_menu.xml +++ b/addons/crm_fundraising/crm_fundraising_menu.xml @@ -12,29 +12,29 @@ Funds crm.fundraising tree,form,graph - - + + tree - - + + form - - + + graph - - + +