Merge lp:~openerp-dev/openobject-server/trunk-bug-1161881-ishwar into lp:openobject-server

[Ishwar Malvi(OpenERP)]

Hello,

     I have fixed problem in custom model when adding many2many field.

Thank you.
Ishwar Malvi

Unmerged revisions

4853. By Ishwar Malvi(OpenERP) on 2013-04-09

[FIX]Custom model : adding many2many field generates error

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2013-04-05 11:07:50 +0000
+++ openerp/osv/orm.py	2013-04-09 11:34:23 +0000
@@ -2865,13 +2865,14 @@
         Record the creation of a many2many for this model, to make it possible
         to delete it later when the module is uninstalled.
         """
-        cr.execute("""
-            SELECT 1 FROM ir_model_relation, ir_module_module
-            WHERE ir_model_relation.module=ir_module_module.id
-                AND ir_model_relation.name=%s
-                AND ir_module_module.name=%s
-            """, (relation_table, self._module))
-        if not cr.rowcount:
+        if self._module:
+            cr.execute("""
+                SELECT 1 FROM ir_model_relation, ir_module_module
+                WHERE ir_model_relation.module=ir_module_module.id
+                    AND ir_model_relation.name=%s
+                    AND ir_module_module.name=%s
+                """, (relation_table, self._module))
+        if not cr.rowcount and self._module:
             cr.execute("""INSERT INTO ir_model_relation (name, date_init, date_update, module, model)
                                  VALUES (%s, now() AT TIME ZONE 'UTC', now() AT TIME ZONE 'UTC',
                     (SELECT id FROM ir_module_module WHERE name=%s),