diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f8d1e6dd980cbf72792d403e15fa5484c6b5a7c5..54f61e6f41ea9ecfe704acce3ff0c10a8b9812f2 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -111,8 +111,6 @@ class res_partner(osv.osv):
_order = "name"
_columns = {
'name': fields.char('Name', size=128, required=True, select=True),
- 'opt_out':fields.boolean('Opt-out', help="If checked, this partner will not receive any automated email \
-notifications, such as the availability of invoices."),
'date': fields.date('Date', select=1),
'title': fields.many2one('res.partner.title','Partner Firm'),
'parent_id': fields.many2one('res.partner','Parent Partner'),
@@ -155,7 +153,6 @@ notifications, such as the availability of invoices."),
'address': [{'type': 'default'}],
'category_id': _default_category,
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
- 'opt_out' : False,
'color': 0,
}
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index f106702cd6131e00536aaa0dafe72971a2a981ba..d3c4db106f9ba2e8ec87d1241a6a93ed86f8e9a0 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -94,7 +94,6 @@
<field name="supplier">1</field>
<field eval="0" name="customer"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="website">www.asustek.com</field>
</record>
<record id="res_partner_agrolait" model="res.partner">
@@ -102,7 +101,6 @@
<field eval="[(6, 0, [ref('base.res_partner_category_0')])]" name="category_id"/>
<field name="user_id" ref="base.user_root"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="website">www.agrolait.com</field>
</record>
<record id="res_partner_c2c" model="res.partner">
@@ -111,7 +109,6 @@
<field name="supplier">1</field>
<field name="user_id" ref="base.user_root"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="website">www.camptocamp.com</field>
</record>
<record id="res_partner_sednacom" model="res.partner">
@@ -119,14 +116,12 @@
<field name="name">Syleam</field>
<field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="user_demo"/>
</record>
<record id="res_partner_thymbra" model="res.partner">
<field name="name">Thymbra</field>
<field name="user_id" ref="base.user_root"/>
<field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
- <field name="opt_out" eval="True"/>
<field name="website">www.thymbra.com/</field>
</record>
<record id="res_partner_desertic_hispafuentes" model="res.partner">
@@ -134,7 +129,6 @@
<field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
<field name="supplier">1</field>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="user_demo"/>
<field name="website">www.axelor.com/</field>
</record>
@@ -142,13 +136,11 @@
<field name="name">Tiny AT Work</field>
<field name="user_id" ref="base.user_root"/>
<field eval="[(6, 0, [ref('res_partner_category_5'), ref('res_partner_category_10')])]" name="category_id"/>
- <field name="opt_out" eval="True"/>
<field name="website">www.tinyatwork.com/</field>
</record>
<record id="res_partner_2" model="res.partner">
<field name="name">Bank Wealthy and sons</field>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="base.user_root"/>
<field name="website">www.wealthyandsons.com/</field>
</record>
@@ -156,7 +148,6 @@
<field name="name">China Export</field>
<field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="base.user_root"/>
<field name="website">www.chinaexport.com/</field>
</record>
@@ -166,14 +157,12 @@
<field name="supplier">1</field>
<field eval="0" name="customer"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="website">www.distribpc.com/</field>
</record>
<record id="res_partner_5" model="res.partner">
<field name="name">Ecole de Commerce de Liege</field>
<field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="user_demo"/>
<field name="website">www.eci-liege.info//</field>
</record>
@@ -184,7 +173,6 @@
<field name="supplier">1</field>
<field eval="0" name="customer"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_maxtor" model="res.partner">
<field name="name">Maxtor</field>
@@ -194,7 +182,6 @@
<field name="supplier">1</field>
<field eval="0" name="customer"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_seagate" model="res.partner">
<field name="name">Seagate</field>
@@ -203,7 +190,6 @@
<field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
<field name="supplier">1</field>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_8" model="res.partner">
<field name="website">http://mediapole.net</field>
@@ -211,7 +197,6 @@
<field name="user_id" ref="user_demo"/>
<field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_9" model="res.partner">
<field name="website">www.balmerinc.com</field>
@@ -221,14 +206,12 @@
<field name="user_id" ref="base.user_root"/>
<field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_10" model="res.partner">
<field name="name">Tecsas</field>
<field name="ean13">3020170000003</field>
<field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="user_demo"/>
</record>
<record id="res_partner_11" model="res.partner">
@@ -237,7 +220,6 @@
<field name="user_id" ref="user_demo"/>
<field eval="[(6, 0, [ref('res_partner_category_0')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_14" model="res.partner">
<field name="name">Centrale d'achats BML</field>
@@ -246,7 +228,6 @@
<field name="parent_id" ref="res_partner_10"/>
<field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="user_demo"/>
</record>
<record id="res_partner_15" model="res.partner">
@@ -257,13 +238,11 @@
<field name="user_id" ref="user_demo"/>
<field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_accent" model="res.partner">
<field name="name">Université de Liège</field>
<field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="user_demo"/>
<field name="website">http://www.ulg.ac.be/</field>
</record>
@@ -277,7 +256,6 @@
<field model="res.users" name="user_id" search="[('name', '=', u'Thomas Lebrun')]"/>
<field name="name">Dubois sprl</field>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="website">http://www.dubois.be/</field>
</record>
@@ -285,20 +263,17 @@
<field name="name">Eric Dubois</field>
<field name="address" eval="[]"/>
<field name="user_id" ref="user_demo"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_fabiendupont0" model="res.partner">
<field name="name">Fabien Dupont</field>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="user_id" ref="base.user_root"/>
</record>
<record id="res_partner_lucievonck0" model="res.partner">
<field name="name">Lucie Vonck</field>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_notsotinysarl0" model="res.partner">
@@ -306,7 +281,6 @@
<field name="address" eval="[]"/>
<field name="user_id" ref="base.user_root"/>
<field name="website">notsotiny.be</field>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_theshelvehouse0" model="res.partner">
@@ -314,7 +288,6 @@
<field eval="[(6,0,[ref('res_partner_category_retailers0')])]" name="category_id"/>
<field name="address" eval="[]"/>
<field name="user_id" ref="base.user_root"/>
- <field name="opt_out" eval="True"/>
</record>
<record id="res_partner_vickingdirect0" model="res.partner">
@@ -323,7 +296,6 @@
<field name="supplier">1</field>
<field name="customer">0</field>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="website">vicking-direct.be</field>
</record>
@@ -333,7 +305,6 @@
<field name="supplier">1</field>
<field eval="0" name="customer"/>
<field name="address" eval="[]"/>
- <field name="opt_out" eval="True"/>
<field name="website">woodywoodpecker.com</field>
</record>
@@ -342,7 +313,6 @@
<field eval="[(6,0,[ref('res_partner_category_consumers0')])]" name="category_id"/>
<field name="address" eval="[]"/>
<field name="user_id" ref="base.user_root"/>
- <field name="opt_out" eval="True"/>
<field name="website">http://www.zerooneinc.com/</field>
</record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 58a62285ab07f9efa84546cf974d5ae2f8ec2c1a..5f3ebf73f46c9ca72a76a2c4cbbae0091abfc6ff 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -332,7 +332,6 @@
<group colspan="1" col="2">
<field name="customer" select="1"/>
<field name="supplier"/>
- <field name="opt_out"/>
<!-- <field name="employee"/>-->
</group>
</group>