diff --git a/addons/website_crm/__init__.py b/addons/website_crm/__init__.py index 9b7fc18e45e..ee5959455ad 100644 --- a/addons/website_crm/__init__.py +++ b/addons/website_crm/__init__.py @@ -1,2 +1 @@ import controllers -import website_crm \ No newline at end of file diff --git a/addons/website_crm/__openerp__.py b/addons/website_crm/__openerp__.py index daa47206313..71f210d69dd 100644 --- a/addons/website_crm/__openerp__.py +++ b/addons/website_crm/__openerp__.py @@ -9,7 +9,7 @@ OpenERP Contact Form """, 'author': 'OpenERP SA', - 'depends': ['website', 'crm'], + 'depends': ['website_partner', 'crm'], 'data': [ 'website_crm_data.xml', 'views/website_crm.xml', diff --git a/addons/website_crm/website_crm.py b/addons/website_crm/website_crm.py deleted file mode 100644 index 82d5390ec71..00000000000 --- a/addons/website_crm/website_crm.py +++ /dev/null @@ -1,9 +0,0 @@ -# -*- coding: utf-8 -*- - -from openerp.osv import osv, fields - -class res_partner(osv.osv): - _inherit = 'res.partner' - _columns = { - 'website_published': fields.boolean('Available in the website'), - } diff --git a/addons/website_crm_partner_assign/__init__.py b/addons/website_crm_partner_assign/__init__.py index 8fddc880d43..9f86759e32b 100644 --- a/addons/website_crm_partner_assign/__init__.py +++ b/addons/website_crm_partner_assign/__init__.py @@ -1,2 +1,2 @@ import controllers -import website_crm_partner_assign \ No newline at end of file +import models diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py index bb89be3ecf0..01d7e5f63d9 100644 --- a/addons/website_crm_partner_assign/__openerp__.py +++ b/addons/website_crm_partner_assign/__openerp__.py @@ -1,5 +1,5 @@ { -'name': 'Public Partners References', + 'name': 'Public Partners References', 'category': 'Website', 'summary': 'Publish Customer References', 'version': '1.0', @@ -9,7 +9,7 @@ OpenERP Public Partners References """, 'author': 'OpenERP SA', - 'depends': ['website', 'website_google_map'], + 'depends': ['website_partner', 'website_google_map'], 'data': [ 'views/website_crm_partner_assign.xml', ], diff --git a/addons/website_crm_partner_assign/models/__init__.py b/addons/website_crm_partner_assign/models/__init__.py new file mode 100644 index 00000000000..4e5bc1614d1 --- /dev/null +++ b/addons/website_crm_partner_assign/models/__init__.py @@ -0,0 +1 @@ +import res_partner diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py new file mode 100644 index 00000000000..bd3c1e64ff3 --- /dev/null +++ b/addons/website_crm_partner_assign/models/res_partner.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- + +from openerp.osv import osv, fields + +class res_partner_grade(osv.osv): + _inherit = 'res.partner.grade' + _columns = { + 'website_description': fields.html('Description for the website'), + } \ No newline at end of file diff --git a/addons/website_crm_partner_assign/website_crm_partner_assign.py b/addons/website_crm_partner_assign/website_crm_partner_assign.py deleted file mode 100644 index 828df9bbff5..00000000000 --- a/addons/website_crm_partner_assign/website_crm_partner_assign.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- - -from openerp.osv import osv, fields - -class res_partner(osv.osv): - _inherit = 'res.partner' - _columns = { - 'website_description': fields.html('Description for the website'), - 'website_short_description': fields.text('Sort description for the website'), - } - - def img(self, cr, uid, ids, field='image_small', context=None): - return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0]) - - -class res_partner_grade(osv.osv): - _inherit = 'res.partner.grade' - _columns = { - 'website_description': fields.html('Description for the website'), - } \ No newline at end of file diff --git a/addons/website_google_map/__init__.py b/addons/website_google_map/__init__.py index 03fd7013e17..65221e1f916 100644 --- a/addons/website_google_map/__init__.py +++ b/addons/website_google_map/__init__.py @@ -1,2 +1,2 @@ import controllers -import website_google_map \ No newline at end of file +import models \ No newline at end of file diff --git a/addons/website_google_map/__openerp__.py b/addons/website_google_map/__openerp__.py index ac97bd20fd8..f1fed29227e 100644 --- a/addons/website_google_map/__openerp__.py +++ b/addons/website_google_map/__openerp__.py @@ -9,7 +9,7 @@ OpenERP Website Google Map """, 'author': 'OpenERP SA', - 'depends': ['website', 'crm_partner_assign'], + 'depends': ['website_partner', 'crm_partner_assign'], 'data': [ 'views/google_map.xml', ], diff --git a/addons/website_google_map/website_google_map.py b/addons/website_google_map/models/res_partner.py similarity index 85% rename from addons/website_google_map/website_google_map.py rename to addons/website_google_map/models/res_partner.py index ad6e34d1c4f..066428ec86e 100644 --- a/addons/website_google_map/website_google_map.py +++ b/addons/website_google_map/models/res_partner.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- -from openerp.osv import osv, fields +from openerp.osv import osv + import simplejson import werkzeug.wrappers -class res_partner(osv.osv): + +class res_partner(osv.Model): _inherit = 'res.partner' - _columns = { - 'website_published': fields.boolean('Available in the website'), - } def google_map_json(self, cr, uid, ids, context=None): data = { diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py index bf4620d7a8c..a4d3c146274 100644 --- a/addons/website_mail/__openerp__.py +++ b/addons/website_mail/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Website Mail', 'category': 'Website', - 'summary': 'Glue Module', + 'summary': 'Website Module for Mail', 'version': '0.1', 'description': """Glue module holding mail improvements for website.""", 'author': 'OpenERP SA', diff --git a/addons/website_membership/__init__.py b/addons/website_membership/__init__.py index 65221e1f916..ee5959455ad 100644 --- a/addons/website_membership/__init__.py +++ b/addons/website_membership/__init__.py @@ -1,2 +1 @@ import controllers -import models \ No newline at end of file diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py index 37ef781f984..2d470cd6aa1 100644 --- a/addons/website_membership/__openerp__.py +++ b/addons/website_membership/__openerp__.py @@ -1,5 +1,5 @@ { -'name': 'Public Partners Members', + 'name': 'Public Partners Members', 'category': 'Website', 'summary': 'Publish Members', 'version': '1.0', @@ -9,7 +9,7 @@ OpenERP Partners Members """, 'author': 'OpenERP SA', - 'depends': ['website', 'association'], + 'depends': ['website_partner', 'association'], 'data': [ 'views/website_membership.xml', ], diff --git a/addons/website_partner/__init__.py b/addons/website_partner/__init__.py new file mode 100644 index 00000000000..d95d47860af --- /dev/null +++ b/addons/website_partner/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2013-Today OpenERP SA (). +# +# 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 models diff --git a/addons/website_partner/__openerp__.py b/addons/website_partner/__openerp__.py new file mode 100644 index 00000000000..94596478756 --- /dev/null +++ b/addons/website_partner/__openerp__.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2013-Today OpenERP SA (). +# +# 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': 'Website Partner', + 'category': 'Website', + 'summary': 'Partner Module for Website', + 'version': '0.1', + 'description': """Base module holding website-related stuff for partner model""", + 'author': 'OpenERP SA', + 'depends': ['website'], + 'data': [ + ], + 'css': [ + ], + 'js': [ + ], + 'qweb': [ + ], + 'installable': True, + 'auto_install': False, +} diff --git a/addons/website_membership/models/__init__.py b/addons/website_partner/models/__init__.py similarity index 100% rename from addons/website_membership/models/__init__.py rename to addons/website_partner/models/__init__.py diff --git a/addons/website_membership/models/res_partner.py b/addons/website_partner/models/res_partner.py similarity index 65% rename from addons/website_membership/models/res_partner.py rename to addons/website_partner/models/res_partner.py index 76e5be7f2e2..bdaaa986fad 100644 --- a/addons/website_membership/models/res_partner.py +++ b/addons/website_partner/models/res_partner.py @@ -9,8 +9,12 @@ class WebsiteResPartner(osv.Model): _columns = { 'website_published': fields.boolean( 'Publish', help="Publish on the website"), - 'website_description': fields.html('Description for the website'), - 'website_short_description': fields.text('Sort description for the website'), + 'website_description': fields.html( + 'Website Partner Full Description' + ), + 'website_short_description': fields.text( + 'Website artner Short Description' + ), } def img(self, cr, uid, ids, field='image_small', context=None):