From 8ecbc64a79d35be92bf9fd12adf60893a0cdb4e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 1 Oct 2013 16:35:40 +0200
Subject: [FIX] website_membership: fixes / improvements - added
 website_published field on res.partner, because it is used but not defined -
 renamed website_membership.py to res_partner.py (because it modified this
 model) and moved it to models directory. - updated init files accordingly

bzr revid: tde@openerp.com-20131001143540-0tyv309l3ws5wied
---
 addons/website_membership/__init__.py           |  2 +-
 addons/website_membership/models/__init__.py    |  1 +
 addons/website_membership/models/res_partner.py | 17 +++++++++++++++++
 addons/website_membership/website_membership.py | 13 -------------
 4 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 addons/website_membership/models/__init__.py
 create mode 100644 addons/website_membership/models/res_partner.py
 delete mode 100644 addons/website_membership/website_membership.py

(limited to 'addons')

diff --git a/addons/website_membership/__init__.py b/addons/website_membership/__init__.py
index 6a3aa370036..65221e1f916 100644
--- a/addons/website_membership/__init__.py
+++ b/addons/website_membership/__init__.py
@@ -1,2 +1,2 @@
 import controllers
-import website_membership
\ No newline at end of file
+import models
\ No newline at end of file
diff --git a/addons/website_membership/models/__init__.py b/addons/website_membership/models/__init__.py
new file mode 100644
index 00000000000..f6dfb12ddc8
--- /dev/null
+++ b/addons/website_membership/models/__init__.py
@@ -0,0 +1 @@
+import res_partner
\ No newline at end of file
diff --git a/addons/website_membership/models/res_partner.py b/addons/website_membership/models/res_partner.py
new file mode 100644
index 00000000000..76e5be7f2e2
--- /dev/null
+++ b/addons/website_membership/models/res_partner.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv, fields
+
+
+class WebsiteResPartner(osv.Model):
+    _inherit = 'res.partner'
+
+    _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'),
+    }
+
+    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])
diff --git a/addons/website_membership/website_membership.py b/addons/website_membership/website_membership.py
deleted file mode 100644
index 1d89a2bdf4e..00000000000
--- a/addons/website_membership/website_membership.py
+++ /dev/null
@@ -1,13 +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])
-- 
cgit v1.2.3