From 1879af69f2ad98f8a53177062ac574634bd7d46a Mon Sep 17 00:00:00 2001
From: resteve <resteve@zikzakmedia.com>
Date: Wed, 29 Aug 2012 13:36:06 +0200
Subject: [PATCH] Rename Model name. Replace _ to . (dot)

---
 CHANGELOG           |  1 +
 electronic_mail.py  | 34 ++++++++++++++++-----------------
 electronic_mail.xml | 46 ++++++++++++++++++++++-----------------------
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index de90db2..b0ac7d5 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Rename Model name. Replace _ to . (dot)
 * Add get_rec_name in ElectronicMail
 * Review INSTALL documentation
 * Test legal notice
diff --git a/electronic_mail.py b/electronic_mail.py
index 1a910be..fd6f290 100644
--- a/electronic_mail.py
+++ b/electronic_mail.py
@@ -24,18 +24,18 @@ from trytond.pool import Pool
 
 class Mailbox(ModelSQL, ModelView):
     "Mailbox"
-    _name = "electronic_mail.mailbox"
+    _name = "electronic.mail.mailbox"
     _description = __doc__
 
     name = fields.Char('Name', required=True)
     user = fields.Many2One('res.user', 'Owner')
     parents = fields.Many2Many(
-             'electronic_mail.mailbox-mailbox',
+             'electronic.mail.mailbox.mailbox',
              'parent', 'child' ,'Parents')
     subscribed = fields.Boolean('Subscribed')
-    read_users = fields.Many2Many('electronic_mail.mailbox-read-res.user',
+    read_users = fields.Many2Many('electronic.mail.mailbox.read.res.user',
             'mailbox', 'user', 'Read Users')
-    write_users = fields.Many2Many('electronic_mail.mailbox-write-res.user',
+    write_users = fields.Many2Many('electronic.mail.mailbox.write.res.user',
             'mailbox', 'user', 'Write Users')
 
 Mailbox()
@@ -44,11 +44,11 @@ Mailbox()
 class MailboxParent(ModelSQL):
     'Mailbox - parent - Mailbox'
     _description = __doc__
-    _name = 'electronic_mail.mailbox-mailbox'
+    _name = 'electronic.mail.mailbox.mailbox'
 
-    parent = fields.Many2One('electronic_mail.mailbox', 'Parent',
+    parent = fields.Many2One('electronic.mail.mailbox', 'Parent',
             ondelete='CASCADE', required=True, select=1)
-    child = fields.Many2One('electronic_mail.mailbox', 'Child',
+    child = fields.Many2One('electronic.mail.mailbox', 'Child',
             ondelete='CASCADE', required=True, select=1)
 
 MailboxParent()
@@ -57,9 +57,9 @@ MailboxParent()
 class ReadUser(ModelSQL):
     'Electronic Mail - read - User'
     _description = __doc__
-    _name = 'electronic_mail.mailbox-read-res.user'
+    _name = 'electronic.mail.mailbox.read.res.user'
 
-    mailbox = fields.Many2One('electronic_mail.mailbox', 'Mailbox',
+    mailbox = fields.Many2One('electronic.mail.mailbox', 'Mailbox',
             ondelete='CASCADE', required=True, select=1)
     user = fields.Many2One('res.user', 'User', ondelete='CASCADE',
             required=True, select=1)
@@ -70,9 +70,9 @@ ReadUser()
 class WriteUser(ModelSQL):
     'Mailbox - write - User'
     _description = __doc__
-    _name = 'electronic_mail.mailbox-write-res.user'
+    _name = 'electronic.mail.mailbox.write.res.user'
 
-    mailbox = fields.Many2One('electronic_mail.mailbox', 'mailbox',
+    mailbox = fields.Many2One('electronic.mail.mailbox', 'mailbox',
             ondelete='CASCADE', required=True, select=1)
     user = fields.Many2One('res.user', 'User', ondelete='CASCADE',
             required=True, select=1)
@@ -82,11 +82,11 @@ WriteUser()
 
 class ElectronicMail(ModelSQL, ModelView):
     "E-mail"
-    _name = 'electronic_mail'
+    _name = 'electronic.mail'
     _description = __doc__
 
     mailbox = fields.Many2One(
-        'electronic_mail.mailbox', 'Mailbox', required=True)
+        'electronic.mail.mailbox', 'Mailbox', required=True)
     from_ = fields.Char('From')
     sender = fields.Char('Sender')
     to = fields.Char('To')
@@ -97,7 +97,7 @@ class ElectronicMail(ModelSQL, ModelView):
     message_id = fields.Char('Message-ID', help='Unique Message Identifier')
     in_reply_to = fields.Char('In-Reply-To')
     headers = fields.One2Many(
-        'electronic_mail.header', 'electronic_mail', 'Headers')
+        'electronic.mail.header', 'electronic_mail', 'Headers')
     digest = fields.Char('MD5 Digest', size=32)
     collision = fields.Integer('Collision')
     email = fields.Function(fields.Binary('Email'), 'get_email', 'set_email')
@@ -268,7 +268,7 @@ class ElectronicMail(ModelSQL, ModelView):
         :param mail: email object
         :param mailbox: ID of the mailbox
         """
-        header_obj = Pool().get('electronic_mail.header')
+        header_obj = Pool().get('electronic.mail.header')
         email_date = mail.get('date') and datetime.fromtimestamp(
                 mktime(parsedate(mail.get('date'))))
         values = {
@@ -294,12 +294,12 @@ ElectronicMail()
 
 class Header(ModelSQL, ModelView):
     "Header fields"
-    _name = 'electronic_mail.header'
+    _name = 'electronic.mail.header'
     _description = __doc__
 
     name = fields.Char('Name', help='Name of Header Field')
     value = fields.Char('Value', help='Value of Header Field')
-    electronic_mail = fields.Many2One('electronic_mail', 'e-mail')
+    electronic_mail = fields.Many2One('electronic.mail', 'e-mail')
 
     def create_from_email(self, mail, mail_id):
         """
diff --git a/electronic_mail.xml b/electronic_mail.xml
index e508cff..ef4453f 100644
--- a/electronic_mail.xml
+++ b/electronic_mail.xml
@@ -22,7 +22,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
 
     <record model="ir.ui.view" id="mailbox_view_tree">
-      <field name="model">electronic_mail.mailbox</field>
+      <field name="model">electronic.mail.mailbox</field>
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <![CDATA[
@@ -34,7 +34,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
       </field>
     </record>
     <record model="ir.ui.view" id="mailbox_view_form">
-      <field name="model">electronic_mail.mailbox</field>
+      <field name="model">electronic.mail.mailbox</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
       <![CDATA[
@@ -64,7 +64,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
     <record model="ir.action.act_window" id="act_mailbox_form">
       <field name="name">Mailboxes</field>
-      <field name="res_model">electronic_mail.mailbox</field>
+      <field name="res_model">electronic.mail.mailbox</field>
     </record>
     <record model="ir.action.act_window.view" id="act_mailbox_form_view1">
       <field name="sequence" eval="10"/>
@@ -80,7 +80,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
       parent="menu_email_management"/>
 
     <record model="ir.ui.view" id="headers_view_tree">
-      <field name="model">electronic_mail.header</field>
+      <field name="model">electronic.mail.header</field>
       <field name="type">tree</field>
       <field name="arch" type="xml">
       <![CDATA[
@@ -93,7 +93,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
 
     <record model="ir.ui.view" id="mail_view_tree">
-      <field name="model">electronic_mail</field>
+      <field name="model">electronic.mail</field>
       <field name="type">tree</field>
       <field name="arch" type="xml">
       <![CDATA[
@@ -109,7 +109,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
       </field>
     </record>
     <record model="ir.ui.view" id="mail_view_form">
-      <field name="model">electronic_mail</field>
+      <field name="model">electronic.mail</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
       <![CDATA[
@@ -152,7 +152,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
     <record model="ir.action.act_window" id="act_mail_form">
       <field name="name">Emails</field>
-      <field name="res_model">electronic_mail</field>
+      <field name="res_model">electronic.mail</field>
     </record>
     <record model="ir.action.act_window.view" id="act_mail_form_view1">
       <field name="sequence" eval="10"/>
@@ -169,7 +169,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
   
     <!-- Access Rule Mailbox -->
     <record model="ir.model.access" id="access_mailbox_admin">
-      <field name="model" search="[('model', '=', 'electronic_mail.mailbox')]"/>
+      <field name="model" search="[('model', '=', 'electronic.mail.mailbox')]"/>
       <field name="group" ref="group_email_admin"/>
       <field name="perm_read" eval="True"/>
       <field name="perm_write" eval="True"/>
@@ -177,7 +177,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
       <field name="perm_delete" eval="True"/>
     </record>
     <record model="ir.model.access" id="access_mailbox_user">
-      <field name="model" search="[('model', '=', 'electronic_mail.mailbox')]"/>
+      <field name="model" search="[('model', '=', 'electronic.mail.mailbox')]"/>
       <field name="group" ref="group_email_user"/>
       <field name="perm_read" eval="True"/>
       <field name="perm_write" eval="False"/>
@@ -186,7 +186,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
     <!-- Access Rule Mail -->
     <record model="ir.model.access" id="access_mail_admin">
-      <field name="model" search="[('model', '=', 'electronic_mail')]"/>
+      <field name="model" search="[('model', '=', 'electronic.mail')]"/>
       <field name="group" ref="group_email_admin"/>
       <field name="perm_read" eval="True"/>
       <field name="perm_write" eval="True"/>
@@ -194,7 +194,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
       <field name="perm_delete" eval="True"/>
     </record>
     <record model="ir.model.access" id="access_mail_user">
-      <field name="model" search="[('model', '=', 'electronic_mail')]"/>
+      <field name="model" search="[('model', '=', 'electronic.mail')]"/>
       <field name="group" ref="group_email_user"/>
       <field name="perm_read" eval="True"/>
       <field name="perm_write" eval="True"/>
@@ -204,7 +204,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
 
     <!-- Rule to read mailboxes -->
     <record model="ir.rule.group" id="rule_group_read_mailbox">
-      <field name="model" search="[('model', '=', 'electronic_mail.mailbox')]"/>
+      <field name="model" search="[('model', '=', 'electronic.mail.mailbox')]"/>
       <field name="global_p" eval="True"/>
       <field name="default_p" eval="False"/>
       <field name="perm_read" eval="True"/>
@@ -214,28 +214,28 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
     <record model="ir.rule" id="rule_group_read_mailbox_line1">
       <field name="field" 
-             search="[('name', '=', 'user'), ('model.model', '=', 'electronic_mail.mailbox')]"/>
+             search="[('name', '=', 'user'), ('model.model', '=', 'electronic.mail.mailbox')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_read_mailbox"/>
     </record>
     <record model="ir.rule" id="rule_group_read_mailbox_line2">
       <field name="field" 
-        search="[('name', '=', 'read_users'), ('model.model', '=', 'electronic_mail.mailbox')]"/>
+        search="[('name', '=', 'read_users'), ('model.model', '=', 'electronic.mail.mailbox')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_read_mailbox"/>
     </record>
     <record model="ir.rule" id="rule_group_read_mailbox_line3">
       <field name="field" 
-        search="[('name', '=', 'write_users'), ('model.model', '=', 'electronic_mail.mailbox')]"/>
+        search="[('name', '=', 'write_users'), ('model.model', '=', 'electronic.mail.mailbox')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_read_mailbox"/>
     </record>
     <record model="ir.rule" id="rule_group_read_mailbox_line4">
       <field name="field" 
-        search="[('name', '=', 'create_uid'), ('model.model', '=', 'electronic_mail.mailbox')]"/>
+        search="[('name', '=', 'create_uid'), ('model.model', '=', 'electronic.mail.mailbox')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_read_mailbox"/>
@@ -243,7 +243,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
 
     <!-- Rule to read emails -->
     <record model="ir.rule.group" id="rule_group_read_mail">
-      <field name="model" search="[('model', '=', 'electronic_mail')]"/>
+      <field name="model" search="[('model', '=', 'electronic.mail')]"/>
       <field name="global_p" eval="True"/>
       <field name="default_p" eval="False"/>
       <field name="perm_read" eval="True"/>
@@ -253,21 +253,21 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
     <record model="ir.rule" id="rule_group_read_mail_line1">
       <field name="field" 
-        search="[('name', '=', 'mailbox_owner'), ('model.model', '=', 'electronic_mail')]"/>
+        search="[('name', '=', 'mailbox_owner'), ('model.model', '=', 'electronic.mail')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_read_mail"/>
     </record>
     <record model="ir.rule" id="rule_group_read_mail_line2">
       <field name="field" 
-        search="[('name', '=', 'mailbox_read_users'), ('model.model', '=', 'electronic_mail')]"/>
+        search="[('name', '=', 'mailbox_read_users'), ('model.model', '=', 'electronic.mail')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_read_mail"/>
     </record>
     <record model="ir.rule" id="rule_group_read_mail_line3">
       <field name="field" 
-        search="[('name', '=', 'mailbox_write_users'), ('model.model', '=', 'electronic_mail')]"/>
+        search="[('name', '=', 'mailbox_write_users'), ('model.model', '=', 'electronic.mail')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_read_mail"/>
@@ -275,7 +275,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
 
     <!-- Rule to write emails -->
     <record model="ir.rule.group" id="rule_group_write_mail">
-      <field name="model" search="[('model', '=', 'electronic_mail')]"/>
+      <field name="model" search="[('model', '=', 'electronic.mail')]"/>
       <field name="global_p" eval="True"/>
       <field name="default_p" eval="False"/>
       <field name="perm_read" eval="True"/>
@@ -285,14 +285,14 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     </record>
     <record model="ir.rule" id="rule_group_write_mail_line1">
       <field name="field" 
-        search="[('name', '=', 'mailbox_owner'), ('model.model', '=', 'electronic_mail')]"/>
+        search="[('name', '=', 'mailbox_owner'), ('model.model', '=', 'electronic.mail')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_write_mail"/>
     </record>
     <record model="ir.rule" id="rule_group_write_mailbox_line2">
       <field name="field" 
-        search="[('name', '=', 'mailbox_write_users'), ('model.model', '=', 'electronic_mail')]"/>
+        search="[('name', '=', 'mailbox_write_users'), ('model.model', '=', 'electronic.mail')]"/>
       <field name="operator">=</field>
       <field name="operand">User</field>
       <field name="rule_group" ref="rule_group_write_mail"/>