[MERGE]: Merge with lp:openobject-addons

[odoo/odoo.git] / addons / import_sugarcrm / import_sugarcrm_view.xml

diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7e3ec00..b960d66 100644 (file)
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -10,7 +10,7 @@
       <field name="arch" type="xml">
         <form string="Import Data From SugarCRM">
           <group col="8" >
-            <group colspan="2" col="1" width="200">
+            <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."/>
@@ -22,60 +22,60 @@
               <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="(Comming Soon)"/>
+              <label colspan="2"  string="(Coming Soon)"/>
               <label colspan="2"  string=""/>
             </group>
             <separator string="" orientation="vertical" colspan="1" rowspan="24" />
-            <group colspan="4">
-              <separator string="Login Information" colspan="3"/>
+            <group colspan="5">
+              <separator string="Login Information" colspan="4"/>
               <field name="url" colspan="4" widget="url"/>
-              <field name="username"/>
-              <newline/>
-              <field name="password" password="True" />
-              <separator string="" colspan="4"/>
-              <group colspan="4" col="6">
+              <field name="username" colspan="4"/>
+              <field name="password" password="True" colspan="4"/>
+
+              <group colspan="4">
                 <group colspan="1" col="2">
-                  <separator string="Address Book" colspan="4"/>
+                  <separator string="Address Book" colspan="2"/>
                   <field name="user" />
                   <field name= "account" />
                   <field name= "contact" />
                 </group>
-                <group colspan="1" col="1">
-                  <separator string="CRM" colspan="4"/>
+                <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="2" col="2">
-                  <separator string="Project" colspan="4"/>
+                <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="4"/>
+                  <separator string="HR" colspan="2"/>
                   <field name="employee" />
-                  <separator string="Document" colspan="4"/>
+                  <separator string="Document" colspan="2"/>
                   <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"/>
+                <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" groups="base.group_no_one">
                 <separator string="Multi Instance Management" colspan="4"/>
-                <field name="instance_name"/>
+                <field name="instance_name" colspan="4"/>
               </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" groups="base.group_extended" string="_Schedule Recurrent Imports"
+                <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"/>
@@ -98,7 +98,7 @@
     </record>
 
 
-    <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="import_base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
+    <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE" sequence="20"/>
 
   </data>
 </openerp>