[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

3 files changed, 102 insertions, 98 deletions

diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index 927a4b542ed..093331a1bbe 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Import Data from SugarCRM',
+    'name': 'SugarCRM Import',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
@@ -28,10 +28,12 @@
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['import_base','crm', 'document'],
-    'init_xml': [],
-    'update_xml': ["wizard/import_message_view.xml",
-                   "import_sugarcrm_view.xml"],
-    'demo_xml': [],
+    'data': [
+        "wizard/import_message_view.xml",
+        "import_sugarcrm_view.xml",
+        "security/ir.model.access.csv",
+    ],
+    'demo': [],
     'test': [],
     'installable': True,
     'active': False,
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 1f12a8fde57..3c1f9df60fb 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -1,105 +1,104 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+  <data>
 
     <!-- Import Sugarcrm Form View -->
-        <record model="ir.ui.view" id="view_import_sugarcrm_form">
-            <field name="name">import.sugarcrm.form</field>
-            <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="1" 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="(Comming Soon)"/>
-                            <label colspan="2"  string=""/>
-			            </group>
-	    				<separator string="" orientation="vertical" colspan="1" rowspan="24" />                
-	                    <group colspan="4"> 
-	                    	<separator string="Login Information" colspan="3"/>
-	                    	 <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">
-	                            <group colspan="1" col="2">    
-	                                <separator string="Address Book" colspan="4"/>
-	                                <field name="user" />
-	                                <field name= "account" />
-	                                <field name= "contact" />
-	                            </group>                         
-	                            <group colspan="1" col="1">    
-	                                <separator string="CRM" colspan="4"/>
-	                             	<field name="opportunity" />
-	                             	<field name= "call" />
-	                             	<field name= "meeting" />
-	                             	<field name= "claim" />
-	                             	
-	                             </group>
-	                         
-	                             <group colspan="2" col="2"> 
-	                                <separator string="Project" colspan="4"/>       
-		                             <field name= "project" />
-		                             <field name= "project_task" />
-		                             <field name= "bug"/>
-	                            </group>
-	                            <group colspan="1" col="2">
-	                            	<separator string="HR" colspan="4"/>
-	    	                         <field name="employee" />  
-	                                <separator string="Document" colspan="4"/>
-	                                <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"/>
-		                     	</group>
-		                     	<group colspan="4" groups="base.group_no_one">   
-		                   			<separator string="Multi Instance Management" colspan="4"/>
-		                       		<field name="instance_name"/>
-		                       </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"
-	                                   type="object" icon="gtk-execute" />
-	                        <button name="import_all" string="_Import"
-	                                type="object" icon="terp-camera_test"/>
-	                   </group>		                       
-	                    </group>
-	                </group>   
-                </form>
-            </field>
-        </record>
+    <record model="ir.ui.view" id="view_import_sugarcrm_form">
+      <field name="name">import.sugarcrm.form</field>
+      <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"/>
 
-        <!-- Import Sugarcrm Action -->
+              <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="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" 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"
+                        type="object" icon="gtk-execute" />
+                <button name="import_all" string="_Import"
+                        type="object" icon="terp-camera_test"/>
+              </group>
+            </group>
+          </group>
+        </form>
+      </field>
+    </record>
+
+    <!-- Import Sugarcrm Action -->
 
     <record model="ir.actions.act_window" id="action_import_sugarcrm">
-        <field name="name">Import SugarCRM</field>
-        <field name="res_model">import.sugarcrm</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_import_sugarcrm_form"/>
-        <field name="target">new</field>
+      <field name="name">Import SugarCRM</field>
+      <field name="res_model">import.sugarcrm</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="view_id" ref="view_import_sugarcrm_form"/>
+      <field name="target">new</field>
     </record>
 
-    
+
     <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="import_base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
 
-    </data>
+  </data>
 </openerp>
-
diff --git a/addons/import_sugarcrm/security/ir.model.access.csv b/addons/import_sugarcrm/security/ir.model.access.csv
new file mode 100644
index 00000000000..5aadbf32950
--- /dev/null
+++ b/addons/import_sugarcrm/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_import_sugarcrm_system,import.sugarcrm system,model_import_sugarcrm,base.group_system,1,1,1,1

+access_import_message_system,import.message system,model_import_message,base.group_system,1,1,1,1