[MERGE] forward port of branch 8.0 up to ed1c173

2 files changed, 68 insertions, 1 deletions

diff --git a/addons/website_partner/i18n/website_partner.pot b/addons/website_partner/i18n/website_partner.pot
new file mode 100644
index 00000000000..c4006ec59bf
--- /dev/null
+++ b/addons/website_partner/i18n/website_partner.pot
@@ -0,0 +1,67 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* website_partner
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_partner
+#: model:ir.model,name:website_partner.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: website_partner
+#: field:res.partner,website_published:0
+msgid "Publish"
+msgstr ""
+
+#. module: website_partner
+#: help:res.partner,website_published:0
+msgid "Publish on the website"
+msgstr ""
+
+#. module: website_partner
+#: view:website:website_partner.partner_detail
+msgid "Short Description for List View"
+msgstr ""
+
+#. module: website_partner
+#: field:res.partner,website_description:0
+msgid "Website Partner Full Description"
+msgstr ""
+
+#. module: website_partner
+#: field:res.partner,website_short_description:0
+msgid "Website Partner Short Description"
+msgstr ""
+
+#. module: website_partner
+#: field:res.partner,website_meta_description:0
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_partner
+#: field:res.partner,website_meta_keywords:0
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_partner
+#: field:res.partner,website_meta_title:0
+msgid "Website meta title"
+msgstr ""
+
+#. module: website_partner
+#: field:res.partner,self:0
+msgid "unknown"
+msgstr ""
+
diff --git a/addons/website_partner/models/res_partner.py b/addons/website_partner/models/res_partner.py
index 052f20e4158..898d2d111a0 100644
--- a/addons/website_partner/models/res_partner.py
+++ b/addons/website_partner/models/res_partner.py
@@ -36,5 +36,5 @@ class WebsiteResPartner(osv.Model):
     }
 
     _defaults = {
-        'website_published': False
+        'website_published': True
     }