Merge pull request #45 from dreispt/port-users-ldap-populate

Port users ldap populate

__unported__/users_ldap_populate/model/__init__.py

@@ -1,2 +0,0 @@
-import users_ldap
-import populate_wizard

users_ldap_populate/__openerp__.py

@@ -24,8 +24,8 @@
     "author": "Therp BV",
     "category": 'Tools',
     "description": """
-This module allows to prepopulate the user database with all entries in the LDAP
+This module allows to prepopulate the user database with all entries in the
-database.
+LDAP database.
 
 In order to schedule the population of the user database on a regular basis,
 create a new scheduled action with the following properties:
@@ -34,8 +34,8 @@ create a new scheduled action with the following properties:
 - Function: action_populate
 - Arguments: [res.company.ldap.id]
 
-Substitute res.company.ldap.id with the actual id of the res.company.ldap object you want to query.
+Substitute res.company.ldap.id with the actual id of the res.company.ldap
-
+object you want to query.
 """,
     "depends": [
         'auth_ldap',
@@ -44,6 +44,5 @@ Substitute res.company.ldap.id with the actual id of the res.company.ldap object
         'view/users_ldap.xml',
         'view/populate_wizard.xml',
         ],
-    'installable': False,
+    'installable': True,
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

users_ldap_populate/model/__init__.py

@@ -0,0 +1,2 @@
+from . import users_ldap
+from . import populate_wizard

users_ldap_populate/model/populate_wizard.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import orm, fields
+from openerp.osv import orm, fields
 
 
 class CompanyLDAPPopulateWizard(orm.TransientModel):

users_ldap_populate/view/populate_wizard.xml

@@ -5,8 +5,8 @@
             <field name="name">Add populate button to ldap view</field>
             <field name="model">res.company.ldap.populate_wizard</field>
             <field name="arch" type="xml">
-                <form string="Add populate button to ldap view" version="7.0">
+                <form string="Add populate button to ldap view">
-                    <group col="4">
+                    <group>
                        <field name="users_created"/>
                        <button icon="gtk-ok" string="OK" special="cancel"/>
                     </group>

users_ldap_populate/view/users_ldap.xml

@@ -17,4 +17,3 @@
         </record>
     </data>
 </openerp>
-