Jigar Amin (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-import_salesforce-trunkimp-jam into
lp:~openerp-dev/openobject-addons/trunk-import_salesforce.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_salesforce-trunkimp-jam/+merge/74054
Changes according to recent trunk IMP :
[FIX] he_emplyee user address_id removed
[FIX] CRM - 1) crm_case_stage type field removed,
2) res_partner_canal is renamed to new crm_case_channel,
3)Meeting attndee user.address_id removed
[FIX] User - Removed Address_id and added groups_id
Kindly Review this
Thank You
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_salesforce-trunkimp-jam/+merge/74054
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-import_salesforce.
=== modified file 'import_salesforce/wizard/import_salesforce.py'
--- import_salesforce/wizard/import_salesforce.py 2011-07-27 06:55:59 +0000
+++ import_salesforce/wizard/import_salesforce.py 2011-09-05 07:31:23 +0000
@@ -204,30 +204,13 @@
val['password'] = 'salesforce' #default password for all user #TODO needed in documentation
return val
- def get_user_address(self, val):
- field_map = {
- 'name': 'Name',
- 'type': 'Type',
- 'street': 'Street',
- 'zip': 'PostalCode',
- 'city': 'City',
- 'phone': 'Phone',
- 'mobile': 'MobilePhone',
- 'email': 'Email',
- 'fax': 'Fax',
- 'function': 'Title',
- 'country_id/id': 'CountryId',
- 'state_id/id': 'StateId',
- }
- val.update({'Type': 'contact'})
- country = state = False
- if val.get('Country'):
- country = self.get_all_countries(val.get('Country'))
- if val.get('State'):
- state = self.get_all_states(val.get('State'), country)
- val.update({'CountryId': country, 'StateId': state, 'id_new': val['Id']+'address_contact'})
- return self.import_object_mapping(field_map, val, 'res.partner.address', self.TABLE_CONTACT, val['id_new'], self.DO_NOT_FIND_DOMAIN)
-
+ def get_groups(self, vals):
+ user_pool = self.obj.pool.get("res.users")
+ #calling Default gruops of the system
+ groups = user_pool._get_group(self.cr, self.uid)
+ groups = [str(group) for group in groups]
+ return ",".join(groups)
+
def get_user_mapping(self):
return {
'model': 'res.users',
@@ -238,7 +221,7 @@
'user_email': 'Email',
'context_tz': 'TimeZoneSidKey',
'context_lang': 'LocaleSidKey',
- 'address_id/id': self.get_user_address,
+ 'groups_id/.id': call(self.get_groups)
}
}
@@ -273,11 +256,10 @@
}
}
- def get_status(self, val, status, status_type):
- fields = ['name', 'type']
- name = status_type + '_' + status
- data = [status, status_type]
- return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, name, [('type', '=', status_type), ('name', 'ilike', status)])
+ def get_status(self, val, status):
+ fields = ['name']
+ data = [status]
+ return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, status, [('name', 'ilike', status)])
stateMap = {
'Open - Not Contacted': 'draft',
@@ -294,11 +276,10 @@
def get_channel(self, vals, val):
if not val:
return False
-
fields = ['name']
name = 'lead_' + val
data = [val]
- return self.import_object(fields, data, 'res.partner.canal', self.TABLE_LEAD, name, [('name', 'ilike', val)])
+ return self.import_object(fields, data, 'crm.case.channel', self.TABLE_LEAD, name, [('name', 'ilike', val)])
def import_lead(self, vals):
if vals.get('Country'):
@@ -317,7 +298,7 @@
'user_id/id': ref(self.TABLE_USER, 'CreatedById'),
'state': map_val('Status', self.stateMap),
'priority': map_val('Rating', self.priorityMap, default='3'),
- 'stage_id/id': call(self.get_status, value('Status'), 'lead'),
+ 'stage_id/id': call(self.get_status, value('Status')),
'partner_name': 'Company',
'contact_name': 'Name',
'function': 'Title',
@@ -419,7 +400,7 @@
'title_action': 'NextStep',
'planned_revenue': 'Amount',
'date_deadline': self.get_oppo_date_deadline,
- 'stage_id/id': call(self.get_status, value('StageName'), 'opportunity'),
+ 'stage_id/id': call(self.get_status, value('StageName')),
'type': const('opportunity'),
'partner_id/id': ref(self.TABLE_ACCOUNT, 'AccountId'),
'channel_id/id': call(self.get_channel, value('LeadSource')),
@@ -481,7 +462,7 @@
'partner_phone': 'partner_phone',
'email_from': 'email_from',
'priority': map_val('Priority', self.Claimpriority),
- 'stage_id/id': call(self.get_status, value('Status'), 'claim'),
+ 'stage_id/id': call(self.get_status, value('Status')),
'state': map_val('Status', self.claim_state_map, default='draft'),
'categ_id/id': call(self.get_category, 'crm.claim', value('Type')),
# 'ref': call(self.get_product_ref, value('Product__c')),
@@ -535,7 +516,6 @@
user_id = self.get_mapped_id(self.TABLE_USER, val.get('AttendeeId'))
user_rec = users_pool.browse(self.cr, self.uid, user_id)
val.update({'UserId': user_id,
- 'ContactId': user_rec.address_id,
'Email': user_rec.user_email})
return val
@@ -554,7 +534,6 @@
'map': {
'state': map_val('Status', self.stats_attendee, 'needs-action'),
'user_id/.id': 'UserId',
- 'partner_address_id/.id': 'ContactId',
'email': 'Email',
}
}
@@ -743,15 +722,6 @@
}
}
- def import_employee(self, val):
- users_pool = self.obj.pool.get('res.users')
- user = self.xml_id_exist(self.TABLE_USER, val.get('Id'))
- if user:
- user_id = self.get_mapped_id(self.TABLE_USER, val.get('Id'))
- user_rec = users_pool.browse(self.cr, self.uid, user_id)
- val['AddressId'] = user_rec.address_id
- return val
-
def get_department(self, val, dept):
if dept:
fields = ['name']
@@ -764,7 +734,6 @@
return {
'model': 'hr.employee',
'dependencies': [self.TABLE_USER],
- 'hook': self.import_employee,
'map': {
'name': 'Name',
'active': map_val('IsActive', self.boolean_map),
_______________________________________________
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
