Jigar Amin (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-crm_rest-jam
into lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-crm_rest-jam/+merge/96297
res_aprter_address cleanup for modules :
crm* Modules, and Caldav and crm_caldav
Kindly Check them
Thank You
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-crm_rest-jam/+merge/96297
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-03-06 11:12:07 +0000
+++ crm/crm_lead.py 2012-03-07 05:50:25 +0000
@@ -60,7 +60,6 @@
'stage_id': _read_group_stage_ids
}
- # overridden because res.partner.address has an inconvenient name_get,
# especially if base_contact is installed.
def name_get(self, cr, user, ids, context=None):
if isinstance(ids, (int, long)):
@@ -147,7 +146,6 @@
return res
_columns = {
- # Overridden from res.partner.address:
'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null',
select=True, help="Optional linked partner, usually after conversion of the lead"),
=== modified file 'crm/security/ir.model.access.csv'
--- crm/security/ir.model.access.csv 2012-01-31 13:36:57 +0000
+++ crm/security/ir.model.access.csv 2012-03-07 05:50:25 +0000
@@ -26,13 +26,11 @@
access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0
access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1
access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0
-access_res_partner_address_manager,res.partner.address.crm.user.manager,base.model_res_partner_address,base.group_sale_manager,1,0,0,0
access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0
mail_mail_message_manager,mail.message.manager,mail.model_mail_message,base.group_sale_manager,1,0,0,0
access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0
access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calendar_attendee,base.group_sale_manager,1,1,1,1
access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0
-access_res_partner_address,res.partner.address.crm.user,base.model_res_partner_address,base.group_sale_salesman,1,1,1,0
access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
mail_gateway_mail_message_user,mail.message.user,mail.model_mail_message,base.group_sale_salesman,1,1,1,1
=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py 2011-12-21 22:15:04 +0000
+++ crm_claim/crm_claim.py 2012-03-07 05:50:25 +0000
@@ -70,9 +70,6 @@
" mail gateway."),
'company_id': fields.many2one('res.company', 'Company'),
'partner_id': fields.many2one('res.partner', 'Partner'),
- 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
- # domain="[('partner_id','=',partner_id)]"
- ),
'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
'partner_phone': fields.char('Phone', size=32),
@@ -89,7 +86,6 @@
_defaults = {
'user_id': crm.crm_case._get_default_user,
'partner_id': crm.crm_case._get_default_partner,
- 'partner_address_id': crm.crm_case._get_default_partner_address,
'email_from':crm.crm_case. _get_default_email,
'state': lambda *a: 'draft',
'section_id':crm.crm_case. _get_section,
@@ -105,23 +101,11 @@
:param email: ignored
"""
if not part:
- return {'value': {'partner_address_id': False,
- 'email_from': False,
- 'partner_phone': False
- }}
- addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
- data = {'partner_address_id': addr['contact']}
- data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
- return {'value': data}
-
- def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
- """This function returns value of partner email based on Partner Address
- :param part: Partner's id
- :param email: ignored
- """
- if not add:
- return {'value': {'email_from': False}}
- address = self.pool.get('res.partner.address').browse(cr, uid, add)
+ return {'value': {'email_from': False,
+ 'partner_phone': False
+ }
+ }
+ address = self.pool.get('res.partner').browse(cr, uid, part)
return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
def case_open(self, cr, uid, ids, *args):
=== modified file 'crm_claim/crm_claim_demo.xml'
--- crm_claim/crm_claim_demo.xml 2011-12-19 16:54:40 +0000
+++ crm_claim/crm_claim_demo.xml 2012-03-07 05:50:25 +0000
@@ -7,7 +7,6 @@
-->
<record id="crm_case_claim01" model="crm.claim">
- <field name="partner_address_id" ref="base.res_partner_address_15"/>
<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
<field name="partner_id" ref="base.res_partner_11"/>
<field eval=""3"" name="priority"/>
@@ -21,7 +20,6 @@
</record>
<record id="crm_case_claim02" model="crm.claim">
- <field name="partner_address_id" ref="base.res_partner_address_6"/>
<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
<field name="partner_id" ref="base.res_partner_6"/>
<field eval=""4"" name="priority"/>
@@ -35,7 +33,6 @@
</record>
<record id="crm_case_claim03" model="crm.claim">
- <field name="partner_address_id" ref="base.res_partner_address_2"/>
<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
<field name="partner_id" ref="base.res_partner_10"/>
<field eval=""2"" name="priority"/>
@@ -63,7 +60,6 @@
</record>
<record id="crm_case_claim05" model="crm.claim">
- <field name="partner_address_id" ref="base.res_partner_address_10"/>
<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
<field name="partner_id" ref="base.res_partner_5"/>
<field eval=""3"" name="priority"/>
@@ -77,7 +73,6 @@
</record>
<record id="crm_case_claim06" model="crm.claim">
- <field name="partner_address_id" ref="base.res_partner_address_1"/>
<field name="partner_id" ref="base.res_partner_9"/>
<field eval=""3"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2012-01-31 13:36:57 +0000
+++ crm_claim/crm_claim_view.xml 2012-03-07 05:50:25 +0000
@@ -90,8 +90,6 @@
<separator colspan="2" string="Claim Reporter"/>
<field name="partner_id" string="Partner"
on_change="onchange_partner_id(partner_id)" />
- <field name="partner_address_id" string="Contact"
- on_change="onchange_partner_address_id(partner_address_id, email_from)" />
<field name="partner_phone"/>
<field name="email_from" widget="email"/>
</group>
@@ -289,15 +287,5 @@
res_model="crm.claim"
src_model="res.partner"/>
-
- <act_window
- domain="[('partner_address_id', '=', active_id)]"
- context="{'default_partner_address_id': active_id}"
- id="act_claim_partner_address"
- name="Claims"
- view_mode="tree,form"
- res_model="crm.claim"
- src_model="res.partner.address"/>
-
</data>
</openerp>
=== modified file 'crm_fundraising/crm_fundraising.py'
--- crm_fundraising/crm_fundraising.py 2011-12-19 16:54:40 +0000
+++ crm_fundraising/crm_fundraising.py 2012-03-07 05:50:25 +0000
@@ -47,8 +47,6 @@
select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
'company_id': fields.many2one('res.company', 'Company'),
'partner_id': fields.many2one('res.partner', 'Partner'),
- 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
- domain="[('partner_id','=',partner_id)]"),
'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
'date_closed': fields.datetime('Closed', readonly=True),
@@ -100,7 +98,6 @@
'active': 1,
'user_id': crm.crm_case._get_default_user,
'partner_id': crm.crm_case._get_default_partner,
- 'partner_address_id': crm.crm_case._get_default_partner_address,
'email_from': crm.crm_case. _get_default_email,
'state': 'draft',
'section_id': crm.crm_case. _get_section,
=== modified file 'crm_fundraising/crm_fundraising_demo.xml'
--- crm_fundraising/crm_fundraising_demo.xml 2011-01-14 00:11:01 +0000
+++ crm_fundraising/crm_fundraising_demo.xml 2012-03-07 05:50:25 +0000
@@ -3,7 +3,6 @@
<data noupdate="1">
<record id="crm_case_helpingstreetchildren0" model="crm.fundraising">
<field eval="50" name="probability"/>
- <field name="partner_address_id" ref="base.res_partner_address_1"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund3"/>
<field eval="3.0" name="duration"/>
@@ -22,7 +21,6 @@
<data noupdate="1">
<record id="crm_case_helpingearthquakevictims0" model="crm.fundraising">
<field eval="80" name="probability"/>
- <field name="partner_address_id" ref="base.main_address"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund4"/>
<field name="partner_id" ref="base.main_partner"/>
@@ -39,7 +37,6 @@
</data>
<data noupdate="1">
<record id="crm_case_donatingbookstoschoollibraries0" model="crm.fundraising">
- <field name="partner_address_id" ref="base.res_partner_address_zen"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund1"/>
<field eval="5.0" name="duration"/>
@@ -56,7 +53,6 @@
</data>
<data noupdate="1">
<record id="crm_case_renovatinggovernmentschools0" model="crm.fundraising">
- <field name="partner_address_id" ref="base.res_partner_address_7"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund2"/>
<field eval="3.0" name="duration"/>
@@ -74,7 +70,6 @@
</data>
<data noupdate="1">
<record id="crm_case_donatingambulancestohospitals0" model="crm.fundraising">
- <field name="partner_address_id" ref="base.res_partner_address_13"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund4"/>
<field name="partner_id" ref="base.res_partner_14"/>
@@ -91,7 +86,6 @@
</data>
<data noupdate="1">
<record id="crm_case_donatinghospitalequipments0" model="crm.fundraising">
- <field name="partner_address_id" ref="base.res_partner_address_2"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund3"/>
<field name="partner_id" ref="base.res_partner_10"/>
@@ -109,7 +103,6 @@
</data>
<data noupdate="1">
<record id="crm_case_encouragingarts0" model="crm.fundraising">
- <field name="partner_address_id" ref="base.res_partner_address_14"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund2"/>
<field eval="7.0" name="duration"/>
@@ -127,7 +120,6 @@
<data noupdate="1">
<record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.fundraising">
<field eval="10" name="probability"/>
- <field name="partner_address_id" ref="base.res_partner_address_1"/>
<field eval="1" name="active"/>
<field name="type_id" ref="type_fund1"/>
<field eval="6.0" name="duration"/>
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2011-12-19 16:54:40 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2012-03-07 05:50:25 +0000
@@ -94,10 +94,6 @@
<field name="partner_id" select="1"
on_change="onchange_partner_id(partner_id, email_from)"
colspan="2" />
- <field name="partner_address_id"
- string="Contact"
- on_change="onchange_partner_address_id(partner_address_id, email_from)"
- colspan="1" />
<field name="email_from" colspan="2"/>
</group>
<group colspan="2" col="2">
=== modified file 'crm_helpdesk/crm_helpdesk.py'
--- crm_helpdesk/crm_helpdesk.py 2011-10-16 01:28:00 +0000
+++ crm_helpdesk/crm_helpdesk.py 2012-03-07 05:50:25 +0000
@@ -58,8 +58,6 @@
'company_id': fields.many2one('res.company', 'Company'),
'date_closed': fields.datetime('Closed', readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner'),
- 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
- domain="[('partner_id','=',partner_id)]"),
'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
'date': fields.datetime('Date'),
@@ -86,7 +84,6 @@
'active': lambda *a: 1,
'user_id': crm.crm_case._get_default_user,
'partner_id': crm.crm_case._get_default_partner,
- 'partner_address_id': crm.crm_case._get_default_partner_address,
'email_from': crm.crm_case. _get_default_email,
'state': lambda *a: 'draft',
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
=== modified file 'crm_helpdesk/crm_helpdesk_demo.xml'
--- crm_helpdesk/crm_helpdesk_demo.xml 2011-08-27 23:31:30 +0000
+++ crm_helpdesk/crm_helpdesk_demo.xml 2012-03-07 05:50:25 +0000
@@ -38,7 +38,6 @@
</record>
<record id="crm_helpdesk_howtocreateanewmodule0" model="crm.helpdesk">
- <field name="partner_address_id" ref="base.res_partner_address_9"/>
<field eval="1" name="active"/>
<field name="partner_id" ref="base.res_partner_2"/>
<field name="user_id" ref="base.user_root"/>
=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml 2011-12-19 16:54:40 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml 2012-03-07 05:50:25 +0000
@@ -47,9 +47,6 @@
<field name="partner_id" colspan="2"
on_change="onchange_partner_id(partner_id, email_from)"
select="1" />
- <field name="partner_address_id" colspan="2"
- on_change="onchange_partner_address_id(partner_address_id, email_from)"
- />
<newline/>
<field name="email_from" colspan="2"/>
<button name="remind_partner"
=== modified file 'crm_partner_assign/__openerp__.py'
--- crm_partner_assign/__openerp__.py 2012-01-31 13:36:57 +0000
+++ crm_partner_assign/__openerp__.py 2012-03-07 05:50:25 +0000
@@ -37,7 +37,7 @@
You can also use the geolocalization without using the GPS coordinates.
""",
'author': 'OpenERP SA',
- 'depends': ['crm'],
+ 'depends': ['crm', 'account'],
'demo_xml': [
'res_partner_demo.xml',
],
=== modified file 'crm_partner_assign/partner_geo_assign.py'
--- crm_partner_assign/partner_geo_assign.py 2012-02-14 12:25:20 +0000
+++ crm_partner_assign/partner_geo_assign.py 2012-03-07 05:50:25 +0000
@@ -89,14 +89,11 @@
}
def geo_localize(self, cr, uid, ids, context=None):
for partner in self.browse(cr, uid, ids, context=context):
- if not partner.address:
- continue
- contact = partner.address[0] #TOFIX: should be get latitude and longitude for default contact?
addr = ', '.join(filter(None, [
- contact.street,
- "%s %s" % (contact.zip , contact.city),
- contact.state_id and contact.state_id.name,
- contact.country_id and contact.country_id.name]))
+ partner.street,
+ "%s %s" % (partner.zip , partner.city),
+ partner.state_id and partner.state_id.name,
+ partner.country_id and partner.country_id.name]))
result = geo_find(tools.ustr(addr))
if result:
self.write(cr, uid, [partner.id], {
@@ -192,7 +189,7 @@
('partner_weight', '>', 0),
('partner_latitude', '>', latitude - 2), ('partner_latitude', '<', latitude + 2),
('partner_longitude', '>', longitude - 1.5), ('partner_longitude', '<', longitude + 1.5),
- ('country', '=', lead.country_id.id),
+ ('country_id', '=', lead.country_id.id),
], context=context)
# 2. second way: in the same country, big area
@@ -201,7 +198,7 @@
('partner_weight', '>', 0),
('partner_latitude', '>', latitude - 4), ('partner_latitude', '<', latitude + 4),
('partner_longitude', '>', longitude - 3), ('partner_longitude', '<' , longitude + 3),
- ('country', '=', lead.country_id.id),
+ ('country_id', '=', lead.country_id.id),
], context=context)
@@ -210,7 +207,7 @@
# still haven't found any, let's take all partners in the country!
partner_ids = res_partner.search(cr, uid, [
('partner_weight', '>', 0),
- ('country', '=', lead.country_id.id),
+ ('country_id', '=', lead.country_id.id),
], context=context)
# 6. sixth way: closest partner whatsoever, just to have at least one result
=== modified file 'crm_partner_assign/report/crm_partner_report.py'
--- crm_partner_assign/report/crm_partner_report.py 2012-02-16 10:07:44 +0000
+++ crm_partner_assign/report/crm_partner_report.py 2012-03-07 05:50:25 +0000
@@ -51,7 +51,7 @@
SELECT
coalesce(i.id, p.id - 1000000000) as id,
p.id as partner_id,
- (SELECT country_id FROM res_partner_address a WHERE a.partner_id=p.id AND country_id is not null limit 1) as country_id,
+ (SELECT country_id FROM res_partner a WHERE a.partner_id=p.id AND country_id is not null limit 1) as country_id,
p.grade_id,
p.activation,
p.date_review,
=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner.py'
--- crm_partner_assign/wizard/crm_forward_to_partner.py 2011-12-19 16:54:40 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner.py 2012-03-07 05:50:25 +0000
@@ -37,7 +37,6 @@
'user_id': fields.many2one('res.users', "User"),
'attachment_ids': fields.many2many('ir.attachment','lead_forward_to_partner_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
'partner_id' : fields.many2one('res.partner', 'Partner'),
- 'address_id' : fields.many2one('res.partner.address', 'Address'),
'history': fields.selection([('info', 'Case Information'), ('latest', 'Latest email'), ('whole', 'Whole Story')], 'Send history', required=True),
}
@@ -75,27 +74,15 @@
"""This function fills address information based on partner/user selected
"""
if not partner_id:
- return {'value' : {'email_to' : False, 'address_id': False}}
-
+ return {'value' : {'email_to' : False}}
partner_obj = self.pool.get('res.partner')
- addr = partner_obj.address_get(cr, uid, [partner_id], ['contact'])
- data = {'address_id': addr['contact']}
- data.update(self.on_change_address(cr, uid, ids, addr['contact'])['value'])
-
+ data = {}
partner = partner_obj.browse(cr, uid, [partner_id])
user_id = partner and partner[0].user_id or False
- email = user_id and user_id.user_email or ''
- data.update({'email_cc' : email, 'user_id': user_id and user_id.id or False})
- return {
- 'value' : data,
- 'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
- }
-
- def on_change_address(self, cr, uid, ids, address_id):
- email = ''
- if address_id:
- email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
- return {'value': {'email_to' : email}}
+ data.update({'email_from': partner and partner[0].email or "",
+ 'email_cc' : user_id and user_id.user_email or '',
+ 'user_id': user_id and user_id.id or False})
+ return {'value' : data}
def action_forward(self, cr, uid, ids, context=None):
"""
=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner_view.xml'
--- crm_partner_assign/wizard/crm_forward_to_partner_view.xml 2011-12-19 16:54:40 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner_view.xml 2012-03-07 05:50:25 +0000
@@ -20,7 +20,6 @@
</group>
<group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
<field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
- <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
</group>
</group>
<separator string="" colspan="4" />
=== modified file 'crm_profiling/test/process/profiling.yml'
--- crm_profiling/test/process/profiling.yml 2011-12-19 16:54:40 +0000
+++ crm_profiling/test/process/profiling.yml 2012-03-07 05:50:25 +0000
@@ -22,13 +22,12 @@
I'm creating new partner "John" with his email "[email protected]".
-
!record {model: res.partner, id: res_partner_john0}:
- address:
- - city: Bruxelles
- country_id: base.be
- street: Rue des Palais 51, bte 33
- type: default
- zip: '1000'
- email: '[email protected]'
+ city: Bruxelles
+ country_id: base.be
+ street: Rue des Palais 51, bte 33
+ type: default
+ zip: '1000'
+ email: '[email protected]'
name: John
category_id:
- res_partner_category_customers0
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
