From 7ee977832f0254a1657ee7978876a2d36d98beda Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Thu, 21 Mar 2013 22:08:24 +0100
Subject: [PATCH] Cosmetic changes.

---
 asterisk_click2dial/__openerp__.py           |  7 +--
 asterisk_click2dial/asterisk_server_view.xml | 56 +++++++++++++-------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/asterisk_click2dial/__openerp__.py b/asterisk_click2dial/__openerp__.py
index 4097315..6039363 100644
--- a/asterisk_click2dial/__openerp__.py
+++ b/asterisk_click2dial/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '0.4',
     'category': 'Extra Tools',
     'license': 'AGPL-3',
+    'summary': 'Asterisk-OpenERP connector',
     'description': """This module adds 3 functionalities :
 
 1) It adds a 'dial' button in the partner form view so that users can directly dial a phone number through Asterisk. This feature is usually known as 'click2dial'. Here is how it works :
@@ -50,8 +51,7 @@ A detailed documentation for this module is available on the Akretion Web site :
     'author': 'Akretion',
     'website': 'http://www.akretion.com/',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'asterisk_server_view.xml',
         'res_users_view.xml',
         'res_partner_view.xml',
@@ -59,11 +59,12 @@ A detailed documentation for this module is available on the Akretion Web site :
         'wizard/reformat_all_phonenumbers_view.xml',
         'security/asterisk_server_security.xml',
         ],
-    'demo_xml': ['asterisk_click2dial_demo.xml'],
+    'demo': ['asterisk_click2dial_demo.xml'],
     'images': [
         'images/sshot-click2dial.jpg',
         'images/sshot-open_calling_party.jpg',
         ],
+    'application': True,
     'installable': True,
     'active': False,
 }
diff --git a/asterisk_click2dial/asterisk_server_view.xml b/asterisk_click2dial/asterisk_server_view.xml
index 92c9456..e120123 100644
--- a/asterisk_click2dial/asterisk_server_view.xml
+++ b/asterisk_click2dial/asterisk_server_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Asterisk Click2dial module for OpenERP
-  Copyright (C) 2010-2012 Alexis de Lattre <alexis@via.ecp.fr>
+  Copyright (C) 2010-2013 Alexis de Lattre <alexis@via.ecp.fr>
   The licence is in the file __openerp__.py
 -->
 
@@ -22,28 +22,48 @@
     </field>
 </record>
 
+<!-- Search view for asterisk.server -->
+<record id="view_asterisk_server_search" model="ir.ui.view">
+    <field name="name">asterisk.server.search</field>
+    <field name="model">asterisk.server</field>
+    <field name="arch" type="xml">
+        <search string="Asterisk Server Search">
+            <field name="name" />
+            <field name="ip_address" />
+        </search>
+    </field>
+</record>
+
 <!-- Form view for asterisk.server -->
 <record id="view_asterisk_server_form" model="ir.ui.view">
     <field name="name">asterisk.server.form</field>
     <field name="model">asterisk.server</field>
     <field name="arch" type="xml">
-        <form string="Asterisk servers">
-            <field name="company_id" select="1" invisible="not context.get('asterisk_server_main_view', False)" />
-            <newline />
-            <field name="name" select="1" />
-            <field name="active" />
-            <field name="ip_address" select="1" />
-            <field name="port" />
-            <field name="login" />
-            <field name="password" password="True" />
-            <field name="context" />
-            <field name="extension_priority" />
-            <field name="out_prefix" />
-            <field name="national_prefix" />
-            <field name="international_prefix" />
-            <field name="country_prefix" select="1" />
-            <field name="alert_info" />
-            <field name="wait_time" />
+        <form string="Asterisk Servers" version="7.0">
+            <sheet>
+                <div class="oe_title">
+                    <label for="name" string="Server Name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                </div>
+                <group>
+                    <field name="company_id" invisible="not context.get('asterisk_server_main_view', False)" />
+                    <field name="active" />
+                    <field name="ip_address" />
+                    <field name="port" />
+                    <field name="login" />
+                    <field name="password" password="True" />
+                    <field name="context" />
+                    <field name="extension_priority" />
+                    <field name="out_prefix" />
+                    <field name="national_prefix" />
+                    <field name="international_prefix" />
+                    <field name="country_prefix" />
+                    <field name="alert_info" />
+                    <field name="wait_time" />
+                </group>
+            </sheet>
         </form>
     </field>
 </record>