diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index d4b08ad2b44..60288ac3bf9 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -149,8 +149,6 @@ class crm_lead(crm_case, osv.osv):
\nWhen the case is over, the state is set to \'Done\'.\
\nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
- 'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True),
- 'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
}
_defaults = {
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index c6a0ae3c370..84e1392168f 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -152,19 +152,6 @@ class crm_opportunity(osv.osv):
return {'value':{}}
return {'value':{'probability': stage.probability}}
- def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context={}):
- """This function updates the "assignation date" automatically, when manually assign a partner in the geo assign tab
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of stage’s IDs
- @stage_id: change state id on run time """
-
- if not partner_assigned_id:
- return {'value':{'date_assign': False}}
- else:
- return {'value':{'date_assign': time.strftime('%Y-%m-%d')}}
-
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
'priority': crm.AVAILABLE_PRIORITIES[2][0],
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index d5a4963ed66..a77a097b9b5 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -197,21 +197,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index db7069af4db..c2651b14c8e 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -31,8 +31,6 @@ class res_partner(osv.osv):
'Meetings'),
'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
'Phonecalls'),
- 'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\
- 'Assigned Opportunities'),
}
res_partner()
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 7b23d0eac3d..9730b8d1d55 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
import crm_send_email
-import crm_forward_to_partner
import crm_add_note
import crm_lead_to_partner
diff --git a/addons/partner_geo_assign/__openerp__.py b/addons/partner_geo_assign/__openerp__.py
index e5ef5b5dd9d..a34efe62867 100644
--- a/addons/partner_geo_assign/__openerp__.py
+++ b/addons/partner_geo_assign/__openerp__.py
@@ -30,9 +30,10 @@ based on geolocalization.
""",
'author': 'OpenERP SA',
'depends': ['crm'],
- 'data': [
+ 'update_xml': [
'res_partner_view.xml',
'crm_lead_view.xml',
+ 'wizard/crm_forward_to_partner_view.xml',
],
'installable': True,
'active': False,
diff --git a/addons/partner_geo_assign/crm_lead_view.xml b/addons/partner_geo_assign/crm_lead_view.xml
index dfd7c3bef1a..a7168855dbc 100644
--- a/addons/partner_geo_assign/crm_lead_view.xml
+++ b/addons/partner_geo_assign/crm_lead_view.xml
@@ -8,19 +8,31 @@
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
- [('partner_weight','>',0)]
+
diff --git a/addons/partner_geo_assign/partner_geo_assign.py b/addons/partner_geo_assign/partner_geo_assign.py
index d53aa461db6..2f29fba7696 100644
--- a/addons/partner_geo_assign/partner_geo_assign.py
+++ b/addons/partner_geo_assign/partner_geo_assign.py
@@ -49,6 +49,8 @@ class res_partner(osv.osv):
'date_localization': fields.date('Geo Localization Date'),
'partner_weight': fields.integer('Weight',
help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
+ 'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\
+ 'Assigned Opportunities'),
}
_defaults = {
'partner_weight': lambda *args: 0
@@ -74,7 +76,21 @@ class crm_lead(osv.osv):
_columns = {
'partner_latitude': fields.float('Geo Latitude'),
'partner_longitude': fields.float('Geo Longitude'),
+ 'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True),
+ 'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
}
+ def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context={}):
+ """This function updates the "assignation date" automatically, when manually assign a partner in the geo assign tab
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of stage’s IDs
+ @stage_id: change state id on run time """
+
+ if not partner_assigned_id:
+ return {'value':{'date_assign': False}}
+ else:
+ return {'value':{'date_assign': time.strftime('%Y-%m-%d')}}
def assign_partner(self, cr, uid, ids, context=None):
ok = False
diff --git a/addons/partner_geo_assign/wizard/__init__.py b/addons/partner_geo_assign/wizard/__init__.py
new file mode 100644
index 00000000000..9224173145b
--- /dev/null
+++ b/addons/partner_geo_assign/wizard/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 crm_forward_to_partner
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/partner_geo_assign/wizard/crm_forward_to_partner.py
similarity index 100%
rename from addons/crm/wizard/crm_forward_to_partner.py
rename to addons/partner_geo_assign/wizard/crm_forward_to_partner.py
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/partner_geo_assign/wizard/crm_forward_to_partner_view.xml
similarity index 94%
rename from addons/crm/wizard/crm_forward_to_partner_view.xml
rename to addons/partner_geo_assign/wizard/crm_forward_to_partner_view.xml
index d2705c8f0db..9ee2870335a 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/partner_geo_assign/wizard/crm_forward_to_partner_view.xml
@@ -5,7 +5,7 @@
crm_lead_forward_to_partnercrm.lead.forward.to.partnerform
-
+
@@ -31,7 +31,7 @@
crm_lead_forward_to_partner1crm.lead.forward.to.partnerform
-
+