[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

4 files changed, 63 insertions, 86 deletions

diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 11d3c26a207..42ba4382b27 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -149,7 +149,7 @@ class sugar_import(import_framework):
             res_model = 'res.partner'
         elif sugar_document_contact:
             res_id = self.get_mapped_id(self.TABLE_CONTACT, sugar_document_contact[0])
-            res_model = 'res.partner.address'
+            res_model = 'res.partner'
         elif sugar_document_opportunity:
             res_id = self.get_mapped_id(self.TABLE_OPPORTUNITY, sugar_document_opportunity[0])
             res_model = 'crm.lead'
@@ -587,7 +587,7 @@ class sugar_import(import_framework):
             
         partner_contact_id = False 
         partner_contact_email = False       
-        partner_address_obj = self.obj.pool.get('res.partner.address')
+        partner_address_obj = self.obj.pool.get('res.partner')
         partner_xml_id = self.name_exist(self.TABLE_ACCOUNT, val['account_name'], 'res.partner')
         
         for contact in sugar_opportunities_contact:
@@ -598,7 +598,7 @@ class sugar_import(import_framework):
                 if not partner_name: #link with partner id 
                     fields = ['partner_id/id']
                     data = [partner_xml_id]
-                    self.import_object(fields, data, 'res.partner.address', self.TABLE_CONTACT, contact, self.DO_NOT_FIND_DOMAIN)
+                    self.import_object(fields, data, 'res.partner', self.TABLE_CONTACT, contact, self.DO_NOT_FIND_DOMAIN)
                 if not partner_name or partner_name == val.get('account_name'):
                     partner_contact_id = self.xml_id_exist(self.TABLE_CONTACT, contact)
                     partner_contact_email = address.email
@@ -724,12 +724,12 @@ class sugar_import(import_framework):
         
     def get_contact_mapping(self):
         return { 
-            'model' : 'res.partner.address',
-            'dependencies' : [self.TABLE_ACCOUNT],
+            'model' : 'res.partner',
+            #'dependencies' : [self.TABLE_ACCOUNT],
             'hook' : self.import_contact,
             'map' :  {
                 'name': concat('first_name', 'last_name'),
-                'partner_id/id': ref(self.TABLE_ACCOUNT,'account_id'),
+                'parent_id/id': ref(self.TABLE_ACCOUNT,'account_id'),
                 'phone': 'phone_work',
                 'mobile': 'phone_mobile',
                 'fax': 'phone_fax',
@@ -782,7 +782,7 @@ class sugar_import(import_framework):
             
         val['type'] = type
         val['id_new'] = val['id'] + '_address_' + type
-        return self.import_object_mapping(map_partner_address, val, 'res.partner.address', self.TABLE_CONTACT, val['id_new'], self.DO_NOT_FIND_DOMAIN) 
+        return self.import_object_mapping(map_partner_address, val, 'res.partner', self.TABLE_CONTACT, val['id_new'], self.DO_NOT_FIND_DOMAIN) 
         
     def get_partner_address(self, val):
         address_id=[]
@@ -846,7 +846,7 @@ class sugar_import(import_framework):
             val['country_id/id'] =  country_id
             val['state_id/id'] =  state_id
             
-        return self.import_object_mapping(map_user_address, val, 'res.partner.address', self.TABLE_CONTACT, val['id'], self.DO_NOT_FIND_DOMAIN)
+        return self.import_object_mapping(map_user_address, val, 'res.partner', self.TABLE_CONTACT, val['id'], self.DO_NOT_FIND_DOMAIN)
 
     def get_employee_mapping(self):
         return {
@@ -949,7 +949,7 @@ class import_sugarcrm(osv.osv):
         'user' : fields.boolean('User', help="Check this box to import sugarCRM Users into OpenERP users, warning if a user with the same login exist in OpenERP, user information will be erase by sugarCRM user information", readonly=True),
         'opportunity': fields.boolean('Leads & Opp', help="Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads and Opportunities"),
         'contact': fields.boolean('Contacts', help="Check this box to import sugarCRM Contacts into OpenERP addresses"),
-        'account': fields.boolean('Accounts', help="Check this box to import sugarCRM Accounts into OpenERP partners"),
+        'account': fields.boolean('Partner/Account', help="Check this box to import sugarCRM Accounts into OpenERP partners"),
         'employee': fields.boolean('Employee', help="Check this box to import sugarCRM Employees into OpenERP employees"),
         'meeting': fields.boolean('Meetings', help="Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"),
         'call': fields.boolean('Calls', help="Check this box to import sugarCRM Calls into OpenERP calls"),
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index b960d66f1b1..7188108ba6c 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -8,80 +8,59 @@
       <field name="model">import.sugarcrm</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Import Data From SugarCRM">
-          <group col="8" >
-            <group colspan="2" col="2" width="200">
-              <label colspan="2"  string="Import your data from SugarCRM :"/>
-              <label colspan="2"  string="" />
-              <label colspan="2"  string="Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."/>
-              <label colspan="2"  string="" />
-              <label colspan="2"  string="Choose data you want to import. Click 'Import' to get data manually or 'Schedule Reccurent Imports' to get recurrently and automatically data."/>
-              <label colspan="2"  string="" />
-              <label colspan="2"  string="If you make recurrent or ponctual import, data already  in OpenERP will be updated by SugarCRM data."/>
-              <label colspan="2"  string="" />
-              <label colspan="2"  string="Do not forget the email address to be notified of the success of the import."/>
-              <label colspan="2" />
-              <label colspan="2"  string="Online documentation:"/>
-              <label colspan="2"  string="(Coming Soon)"/>
-              <label colspan="2"  string=""/>
-            </group>
-            <separator string="" orientation="vertical" colspan="1" rowspan="24" />
-            <group colspan="5">
-              <separator string="Login Information" colspan="4"/>
-              <field name="url" colspan="4" widget="url"/>
-              <field name="username" colspan="4"/>
-              <field name="password" password="True" colspan="4"/>
+        <form string="Import Data From SugarCRM" version="7.0">
+            <header>
+                <button name="import_all" string="_Import"
+                        type="object" class="oe_highlight"/>
+                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
+                        type="object" class="oe_highlight" />
+                <button special="cancel" string="_Cancel" class="oe_link"/>
+            </header>
+            <sheet>
+              <group col="8" >
+                <group colspan="5">
+                  <separator string="Login Information" colspan="4"/>
+                  <field name="url" colspan="2" widget="url"/>
+                  <field name="username" colspan="2"/>
+                  <field name="password" password="True" colspan="2"/>
 
-              <group colspan="4">
-                <group colspan="1" col="2">
-                  <separator string="Address Book" colspan="2"/>
-                  <field name="user" />
-                  <field name= "account" />
-                  <field name= "contact" />
-                </group>
-                <group colspan="1" col="2">
-                  <separator string="CRM" colspan="2"/>
-                  <field name="opportunity" />
-                  <field name= "call" />
-                  <field name= "meeting" />
-                  <field name= "claim" />
-                </group>
-                <group colspan="1" col="2">
-                  <separator string="Project" colspan="2"/>
-                  <field name= "project" />
-                  <field name= "project_task" />
-                  <field name= "bug"/>
-                </group>
-                <group colspan="1" col="2">
-                  <separator string="HR" colspan="2"/>
-                  <field name="employee" />
-                  <separator string="Document" colspan="2"/>
-                  <field name="email_history"/>
-                  <field name= "document" />
-                </group>
-              </group>
+                  <group colspan="4">
+                    <separator string="Data to Import" colspan="4"/>
+                    <group colspan="1" col="2">
+                      <field name="user" />
+                      <field name= "account" />
+                      <field name= "contact" />
+                    </group>
+                    <group colspan="1" col="2">
+                      <field name="opportunity" />
+                      <field name= "call" />
+                      <field name= "meeting" />
+                      <field name= "claim" />
+                    </group>
+                    <group colspan="1" col="2">
+                      <field name= "project" />
+                      <field name= "project_task" />
+                      <field name= "bug"/>
+                    </group>
+                    <group colspan="1" col="2">
+                      <field name="employee" />
+                      <field name="email_history"/>
+                      <field name= "document" />
+                    </group>
+                  </group>
 
-              <group colspan="4">
-                <separator string="Email Notification When Import is Finished" colspan="4"/>
-                <field name="email_from" widget="email" string="Email Address to Notify" colspan="4"/>
-              </group>
+                  <group colspan="4">
+                    <separator string="Email Notification When Import is Finished" colspan="2"/>
+                    <field name="email_from" widget="email" string="Email Address to Notify" colspan="2"/>
+                  </group>
 
-              <group colspan="4" groups="base.group_no_one">
-                <separator string="Multi Instance Management" colspan="4"/>
-                <field name="instance_name" colspan="4"/>
+                  <group colspan="4" groups="base.group_no_one">
+                    <separator string="Multi Instance Management" colspan="4"/>
+                    <field name="instance_name" colspan="2"/>
+                </group>
               </group>
-
-              <separator string="" colspan="4" />
-              <group colspan="4" col="6">
-                <label string="" colspan="2"/>
-                <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" icon="gtk-execute" />
-                <button name="import_all" string="_Import"
-                        type="object" icon="terp-camera_test"/>
               </group>
-            </group>
-          </group>
+          </sheet>
         </form>
       </field>
     </record>
diff --git a/addons/import_sugarcrm/sugar.py b/addons/import_sugarcrm/sugar.py
index 35103a41173..df2aa386992 100644
--- a/addons/import_sugarcrm/sugar.py
+++ b/addons/import_sugarcrm/sugar.py
@@ -33,7 +33,7 @@ import import_sugarcrm
 import logging
 
 import sys
-
+_logger = logging.getLogger(__name__)
 
 debug = False
 
@@ -119,7 +119,7 @@ def get_contact_by_email(portType, username, password, email_address=None):
                 email_list.append(list.Email_address)
         return email_list
     except Exception,e:
-        logging.getLogger('sugarcrm_soap').error('Exception: %s\n' % (tools.ustr(e)))
+        _logger.error('Exception: %s\n' % (tools.ustr(e)))
         return False
 
 def get_document_revision_search(portType, sessionid, module_id=None):
diff --git a/addons/import_sugarcrm/wizard/import_message_view.xml b/addons/import_sugarcrm/wizard/import_message_view.xml
index 581d862e408..6f1f3fad3c1 100644
--- a/addons/import_sugarcrm/wizard/import_message_view.xml
+++ b/addons/import_sugarcrm/wizard/import_message_view.xml
@@ -8,13 +8,11 @@
             <field name="model">import.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Message">
-                   <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/> 
-                   <separator string="" colspan="4" />
-                   <button  icon="gtk-ok" special="cancel" string="_Ok"/>
+                <form string="Import Message" version="7.0">
+                   <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/>
                 </form>
             </field>
         </record>
-        
+
     </data>
-</openerp>        
\ No newline at end of file
+</openerp>
\ No newline at end of file