← Back to team overview

clearcorp team mailing list archive

[Merge] lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sneldev_magento into lp:openerp-ccorp-addons

 

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sneldev_magento into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sneldev_magento/+merge/129025

Safety rules are added to the connection module of magento. Only the administrator has the option to access connection settings
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sneldev_magento/+merge/129025
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.
=== modified file 'sneldev_magento/__openerp__.py'
--- sneldev_magento/__openerp__.py	2012-09-13 21:22:06 +0000
+++ sneldev_magento/__openerp__.py	2012-10-10 19:17:37 +0000
@@ -27,7 +27,7 @@
 ##############################################################################
 {
     "name" : "Magento-OpenERP Interface",
-    "version" : "0.9.2.6",
+    "version" : "1.0",
     "author" : "SnelDev",
     "category" : "Interfaces/CMS & eCommerce",
     "website" : "http://www.sneldev.com/";,
@@ -47,7 +47,10 @@
                      'wizard/sneldev_magento_stock_export.xml',
                      'wizard/sneldev_magento_sync_start.xml',
                      'wizard/sneldev_magento_sync_stop.xml',
-                     'sneldev_magento_view.xml'],
+                     'sneldev_magento_view.xml',
+                     'sneldev_magento_menu.xml',
+                     'security/security.xml',
+                     ],
     "active": False,
     "installable": True
 }

=== modified file 'sneldev_magento/security/ir.model.access.csv'
--- sneldev_magento/security/ir.model.access.csv	2012-09-10 15:35:49 +0000
+++ sneldev_magento/security/ir.model.access.csv	2012-10-10 19:17:37 +0000
@@ -1,2 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sneldev_magento","Magento Settings","model_sneldev_magento","base.group_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sneldev_magento_manager,magento_settings_manager,model_sneldev_magento,group_magento_manager,1,1,1,1
+access_sneldev_magento_user,magento_settings_user,model_sneldev_magento,group_magento_user,1,0,0,0

=== added file 'sneldev_magento/security/security.xml'
--- sneldev_magento/security/security.xml	1970-01-01 00:00:00 +0000
+++ sneldev_magento/security/security.xml	2012-10-10 19:17:37 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<!-- Module category: Magento -->
+        <record id="module_magento_settings" model="ir.module.category">
+            <field name="name">Magento settings</field>
+            <field name="description">Magento settings</field>
+            <field name="sequence">20</field>
+        </record>
+        
+		<!-- Groups -->
+        <record id="group_magento_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_magento_settings"/>
+            <field name="menu_access" eval="[(6,0,[base.menu_magento])]" />
+        </record>        
+        <record id="group_magento_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="category_id" ref="module_magento_settings"/>
+            <field name="implied_ids" eval="[(6,0,[group_magento_user])]" />
+        </record>
+        
+	</data>
+</openerp>
\ No newline at end of file

=== added file 'sneldev_magento/sneldev_magento_menu.xml'
--- sneldev_magento/sneldev_magento_menu.xml	1970-01-01 00:00:00 +0000
+++ sneldev_magento/sneldev_magento_menu.xml	2012-10-10 19:17:37 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+		<!-- Magento / View	-->
+			<record model="ir.actions.act_window" id="action_magento_form">
+				<field name="name">Magento</field>
+				<field name="res_model">sneldev.magento</field>
+				<field name="view_mode">tree,form</field>
+			</record>
+
+			<menuitem id="base.menu_magento" name="Magento" web_icon="static/src/img/magento.png" web_icon_hover="static/src/img/magento.png" />
+			
+				<menuitem name="Magento Settings" id="menu_magento_form" parent="base.menu_magento" groups="group_magento_manager"/>
+					<menuitem id="base.menu_magento_sub_form" action="action_magento_form" parent="menu_magento_form" name="Magento settings"></menuitem>
+				
+				<menuitem id="base.import_menu_magento" name="Import" parent="base.menu_magento"/>			
+					<menuitem name="Import categories from Magento" action="action_sneldev_categories_import" parent="base.import_menu_magento" id="base.menu_magento_categories_import" />
+			    	<menuitem name="Import products from Magento" action="action_sneldev_products_import" parent="base.import_menu_magento" id="base.menu_magento_products_import" />
+			    	<menuitem name="Import orders from Magento" action="action_sneldev_orders_import" parent="base.import_menu_magento" id="base.menu_magento_orders_import" />
+			   		<menuitem name="Import customers from Magento" action="action_sneldev_customers_import" parent="base.import_menu_magento" id="base.menu_magento_clients_import" />
+	            
+            	<menuitem id="base.export_menu_magento" name="Export" parent="base.menu_magento"/>
+	           		<menuitem name="Export categories to Magento" action="action_sneldev_categories_export" parent="base.export_menu_magento" id="base.menu_magento_categories_export" />
+	           		<menuitem name="Export products to Magento" action="action_sneldev_products_export" parent="base.export_menu_magento" id="base.menu_magento_products_export" />
+			    	<menuitem name="Export stock to Magento" action="action_sneldev_stock_export" parent="base.export_menu_magento" id="base.menu_magento_stock_export" />
+	</data>
+</openerp>
\ No newline at end of file

=== modified file 'sneldev_magento/sneldev_magento_view.xml'
--- sneldev_magento/sneldev_magento_view.xml	2012-10-08 22:26:26 +0000
+++ sneldev_magento/sneldev_magento_view.xml	2012-10-10 19:17:37 +0000
@@ -1,30 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-    	<!-- Magento / View	-->
-			<record model="ir.actions.act_window" id="action_magento_form">
-				<field name="name">Magento</field>
-				<field name="res_model">sneldev.magento</field>
-				<field name="view_mode">tree,form</field>
-			</record>
-
-			<menuitem id="base.menu_magento" name="Magento" web_icon="static/src/img/magento.png" web_icon_hover="static/src/img/magento.png" />
-			
-			<menuitem name="Magento Settings" id="menu_magento_form" parent="base.menu_magento"/>
-				<menuitem id="base.menu_magento_sub_form" action="action_magento_form" parent="menu_magento_form" name="Magento settings"></menuitem>
-				
-			<menuitem id="base.import_menu_magento" name="Import" parent="base.menu_magento"/>			
-				<menuitem name="Import categories from Magento" action="action_sneldev_categories_import" parent="base.import_menu_magento" id="base.menu_magento_categories_import" />
-		    	<menuitem name="Import products from Magento" action="action_sneldev_products_import" parent="base.import_menu_magento" id="base.menu_magento_products_import" />
-		    	<menuitem name="Import orders from Magento" action="action_sneldev_orders_import" parent="base.import_menu_magento" id="base.menu_magento_orders_import" />
-		   		<menuitem name="Import customers from Magento" action="action_sneldev_customers_import" parent="base.import_menu_magento" id="base.menu_magento_clients_import" />
-            
-            <menuitem id="base.export_menu_magento" name="Export" parent="base.menu_magento"/>
-           		<menuitem name="Export categories to Magento" action="action_sneldev_categories_export" parent="base.export_menu_magento" id="base.menu_magento_categories_export" />
-           		<menuitem name="Export products to Magento" action="action_sneldev_products_export" parent="base.export_menu_magento" id="base.menu_magento_products_export" />
-		    	<menuitem name="Export stock to Magento" action="action_sneldev_stock_export" parent="base.export_menu_magento" id="base.menu_magento_stock_export" />
-		  		   		
-			<record model="ir.ui.view" id="view_magento_form">
+    	<record model="ir.ui.view" id="view_magento_form">
 				<field name="name">sneldev.magento.form</field>
 				<field name="model">sneldev.magento</field>
 				<field name="type">form</field>


Follow ups