pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REMOVE]: Remove conflict

Browse Source 
bzr revid: atp@tinyerp.com-20110428045156-ssluwcxhtc575tnz
This commit is contained in:
Atul Patel (OpenERP)
2011-04-28 10:21:56 +05:30
parent 794f45ed05
commit 94f2c6d093
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/import_sugarcrm/import_sugarcrm.py
+2 -22
View File
@@ -1182,11 +1182,7 @@ MAP_FIELDS = {'Opportunities': #Object Mapping name
'process' : import_leads,
},
'Contacts':
<<<<<<< TREE
{'dependencies' : ['Users', 'Accounts'], #Object to import before this table
=======
{'dependencies' : [], #Object to import before this table
>>>>>>> MERGE-SOURCE
'process' : import_partner_address,
},
'Accounts':
@@ -1212,23 +1208,7 @@ MAP_FIELDS = {'Opportunities': #Object Mapping name
'Calls':
{'dependencies' : ['Accounts', 'Contacts', 'Users', 'Opportunities'],
'process' : import_calls,
<<<<<<< TREE
},
'Claims':
{'dependencies' : ['Users', 'Accounts', 'Contacts', 'Leads'],
'process' : import_claims,
},
'Employees':
{'dependencies' : ['Resources'],
'process' : import_employees,
},
'Emails':
{'dependencies' : ['Users', 'Projects', 'Project Tasks', 'Accounts', 'Contacts', 'Leads', 'Opportunities', 'Meetings', 'Calls'],
'process' : import_emails,
},
=======
},
>>>>>>> MERGE-SOURCE
'Projects':
{'dependencies' : ['Users', 'Accounts', 'Contacts'],
'process' : import_projects,
@@ -1243,12 +1223,12 @@ MAP_FIELDS = {'Opportunities': #Object Mapping name
},
'Emails':
{'dependencies' : ['Users'],
{'dependencies' : ['Users', 'Projects', 'Project Tasks', 'Accounts', 'Contacts', 'Leads', 'Opportunities', 'Meetings', 'Calls'],
'process' : import_emails,
},
'Notes':
{'dependencies' : [],
{'dependencies' : ['Users', 'Projects', 'Project Tasks', 'Accounts', 'Contacts', 'Leads', 'Opportunities', 'Meetings', 'Calls'],
'process' : import_history,
},
'Employees':