From 2d128f52d8fecda290dd5145854357795afac937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 8 Oct 2013 16:57:30 +0200 Subject: [PATCH] [FIX] [IMP] base_geolocalize, crm_partner_assign: fix views + added implemented by / references fields. Not sure those fields should come here. However the purpose is to avoid having ot rely on contract to display customer references / partner implementation. bzr revid: tde@openerp.com-20131008145730-r34hgri6wyod8dw6 --- .../base_geolocalize/views/res_partner_view.xml | 2 +- addons/crm_partner_assign/__openerp__.py | 6 +++++- addons/crm_partner_assign/crm_partner_assign.py | 8 ++++++++ addons/crm_partner_assign/portal_data.xml | 15 --------------- addons/crm_partner_assign/res_partner_demo.xml | 4 ++++ addons/crm_partner_assign/res_partner_view.xml | 9 +++++---- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/addons/base_geolocalize/views/res_partner_view.xml b/addons/base_geolocalize/views/res_partner_view.xml index 4747b2e3bff..24cc8d2d21d 100644 --- a/addons/base_geolocalize/views/res_partner_view.xml +++ b/addons/base_geolocalize/views/res_partner_view.xml @@ -2,7 +2,7 @@ - + res.partner.geo.inherit res.partner diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py index f203d6e9dbc..7f6e725422b 100644 --- a/addons/crm_partner_assign/__openerp__.py +++ b/addons/crm_partner_assign/__openerp__.py @@ -38,7 +38,10 @@ You can also use the geolocalization without using the GPS coordinates. """, 'author': 'OpenERP SA', 'depends': ['base_geolocalize', 'crm', 'account', 'portal'], - 'demo': ['res_partner_demo.xml', 'crm_lead_demo.xml'], + 'demo': [ + # 'res_partner_demo.xml', + 'crm_lead_demo.xml' + ], 'data': [ 'security/ir.model.access.csv', 'res_partner_view.xml', @@ -50,6 +53,7 @@ You can also use the geolocalization without using the GPS coordinates. 'portal_data.xml', 'report/crm_lead_report_view.xml', 'report/crm_partner_report_view.xml', + 'res_partner_demo.xml', ], 'js': [ 'static/src/js/next.js', diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py index 171b862fdfe..e43e090103a 100644 --- a/addons/crm_partner_assign/crm_partner_assign.py +++ b/addons/crm_partner_assign/crm_partner_assign.py @@ -63,6 +63,14 @@ class res_partner(osv.osv): 'date_partnership' : fields.date('Partnership Date'), 'date_review' : fields.date('Latest Partner Review'), 'date_review_next' : fields.date('Next Partner Review'), + # customer implementation + 'assigned_partner_id': fields.many2one( + 'res.partner', 'Implementedy by', + ), + 'implemented_partner_ids': fields.one2many( + 'res.partner', 'assigned_partner_id', + string='Implementation References', + ), } _defaults = { 'partner_weight': lambda *args: 0 diff --git a/addons/crm_partner_assign/portal_data.xml b/addons/crm_partner_assign/portal_data.xml index 6544f3f9d4e..da0660c3446 100644 --- a/addons/crm_partner_assign/portal_data.xml +++ b/addons/crm_partner_assign/portal_data.xml @@ -3,21 +3,6 @@ - - openerp.portal.res.partner - - - - - - - - - openerp.portal.res.partner - - - [('id','child_of',user.commercial_partner_id.id)] - openerp.portal.res.partner.grade diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 8e9088165d1..633a5094722 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -9,5 +9,9 @@ 10 + + + + diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml index 891556e0ad5..59ca4c51da3 100644 --- a/addons/crm_partner_assign/res_partner_view.xml +++ b/addons/crm_partner_assign/res_partner_view.xml @@ -98,13 +98,14 @@ - - res.partner.geo.inherit + + res.partner.assign.inherit res.partner - + - + +