From 36a6909d0dc558c2bc7e1f4dcea3702aa23254e5 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 6 Feb 2013 13:42:51 +0100
Subject: [PATCH] Remove <field name="type">form/tree</field> in `ir.ui.view`
 model (deprecated in OpenERP 7.0)

---
 asterisk_click2dial/__openerp__.py                              | 2 +-
 asterisk_click2dial/asterisk_click2dial.py                      | 2 +-
 asterisk_click2dial/asterisk_server_view.xml                    | 2 --
 asterisk_click2dial/wizard/open_calling_partner.py              | 1 -
 asterisk_click2dial/wizard/open_calling_partner_view.xml        | 1 -
 asterisk_click2dial/wizard/reformat_all_phonenumbers_view.xml   | 1 -
 asterisk_click2dial_crm/wizard/create_crm_phonecall_view.xml    | 1 -
 asterisk_click2dial_crm/wizard/open_calling_partner_view.xml    | 1 -
 .../wizard/open_calling_partner_view.xml                        | 1 -
 9 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/asterisk_click2dial/__openerp__.py b/asterisk_click2dial/__openerp__.py
index 46d799c..4097315 100644
--- a/asterisk_click2dial/__openerp__.py
+++ b/asterisk_click2dial/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '0.4',
     'category': 'Extra Tools',
     'license': 'AGPL-3',
-    'description': """This module adds 3 functionnalities :
+    '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 :
 . In OpenERP, the user clicks on the 'dial' button next to a phone number field in the partner view.
diff --git a/asterisk_click2dial/asterisk_click2dial.py b/asterisk_click2dial/asterisk_click2dial.py
index f5ebbbf..9721c2b 100644
--- a/asterisk_click2dial/asterisk_click2dial.py
+++ b/asterisk_click2dial/asterisk_click2dial.py
@@ -226,7 +226,7 @@ class asterisk_server(osv.osv):
         return (user, ast_server, ast_manager)
 
     def _dial_with_asterisk(self, cr, uid, erp_number, context=None):
-        print "_dial_with_asterisk erp_number=", erp_number
+        #print "_dial_with_asterisk erp_number=", erp_number
         if not erp_number:
             raise osv.except_osv(_('Error :'), "Hara kiri : you must call the function with erp_number")
 
diff --git a/asterisk_click2dial/asterisk_server_view.xml b/asterisk_click2dial/asterisk_server_view.xml
index ea14bd2..92c9456 100644
--- a/asterisk_click2dial/asterisk_server_view.xml
+++ b/asterisk_click2dial/asterisk_server_view.xml
@@ -26,7 +26,6 @@
 <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="type">form</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)" />
@@ -53,7 +52,6 @@
 <record id="view_asterisk_server_tree" model="ir.ui.view">
     <field name="name">asterisk.server.tree</field>
     <field name="model">asterisk.server</field>
-    <field name="type">tree</field>
     <field name="arch" type="xml">
         <tree string="Asterisk servers">
             <field name="company_id" invisible="not context.get('asterisk_server_main_view', False)"/>
diff --git a/asterisk_click2dial/wizard/open_calling_partner.py b/asterisk_click2dial/wizard/open_calling_partner.py
index 129a046..3810a67 100644
--- a/asterisk_click2dial/wizard/open_calling_partner.py
+++ b/asterisk_click2dial/wizard/open_calling_partner.py
@@ -210,4 +210,3 @@ class wizard_open_calling_partner(osv.osv_memory):
             res['value'].update({'current_phone': False, 'current_mobile': False})
         return res
 
-wizard_open_calling_partner()
diff --git a/asterisk_click2dial/wizard/open_calling_partner_view.xml b/asterisk_click2dial/wizard/open_calling_partner_view.xml
index 75f7974..a602090 100644
--- a/asterisk_click2dial/wizard/open_calling_partner_view.xml
+++ b/asterisk_click2dial/wizard/open_calling_partner_view.xml
@@ -12,7 +12,6 @@
 <record id="view_open_calling_partner" model="ir.ui.view">
     <field name="name">view_open_calling_partner</field>
     <field name="model">wizard.open.calling.partner</field>
-    <field name="type">form</field>
     <field name="arch" type="xml">
         <form string="Open calling partner" version="7.0">
             <group name="display_result">
diff --git a/asterisk_click2dial/wizard/reformat_all_phonenumbers_view.xml b/asterisk_click2dial/wizard/reformat_all_phonenumbers_view.xml
index cfc7607..75f1f26 100644
--- a/asterisk_click2dial/wizard/reformat_all_phonenumbers_view.xml
+++ b/asterisk_click2dial/wizard/reformat_all_phonenumbers_view.xml
@@ -11,7 +11,6 @@
 <record id="reformat_all_phonenumbers_form" model="ir.ui.view">
     <field name="name">reformat_all_phonenumbers.form</field>
     <field name="model">reformat.all.phonenumbers</field>
-    <field name="type">form</field>
     <field name="arch" type="xml">
         <form string="Reformat all phone numbers">
             <label string="This wizard reformats the phone, mobile and fax numbers of all partner contacts in standard international format e.g. +33141981242" colspan="4"/>
diff --git a/asterisk_click2dial_crm/wizard/create_crm_phonecall_view.xml b/asterisk_click2dial_crm/wizard/create_crm_phonecall_view.xml
index 491bb80..158d3e3 100644
--- a/asterisk_click2dial_crm/wizard/create_crm_phonecall_view.xml
+++ b/asterisk_click2dial_crm/wizard/create_crm_phonecall_view.xml
@@ -12,7 +12,6 @@
 <record id="create_crm_phonecall_view" model="ir.ui.view">
     <field name="name">create_crm_phonecall.view</field>
     <field name="model">wizard.create.crm.phonecall</field>
-    <field name="type">form</field>
     <field name="arch" type="xml">
         <form string="CRM phone call" version="7.0">
             <label string="Create a phone call in the CRM ?"/>
diff --git a/asterisk_click2dial_crm/wizard/open_calling_partner_view.xml b/asterisk_click2dial_crm/wizard/open_calling_partner_view.xml
index d55f88a..acc9bb0 100644
--- a/asterisk_click2dial_crm/wizard/open_calling_partner_view.xml
+++ b/asterisk_click2dial_crm/wizard/open_calling_partner_view.xml
@@ -13,7 +13,6 @@
     <field name="name">asterisk_click2dial_crm.open_calling_partner.view</field>
     <field name="model">wizard.open.calling.partner</field>
     <field name="inherit_id" ref="asterisk_click2dial.view_open_calling_partner"/>
-    <field name="type">form</field>
     <field name="arch" type="xml">
         <group name="partner_found" position="inside">
             <button name="create_incoming_phonecall" string="Create Call in CRM" type="object" icon="gtk-new" />
diff --git a/asterisk_click2dial_crm_claim/wizard/open_calling_partner_view.xml b/asterisk_click2dial_crm_claim/wizard/open_calling_partner_view.xml
index 8610334..2dd0b08 100644
--- a/asterisk_click2dial_crm_claim/wizard/open_calling_partner_view.xml
+++ b/asterisk_click2dial_crm_claim/wizard/open_calling_partner_view.xml
@@ -13,7 +13,6 @@
     <field name="name">asterisk_click2dial_crm_claim.add_open_crm_claims_button</field>
     <field name="model">wizard.open.calling.partner</field>
     <field name="inherit_id" ref="asterisk_click2dial.view_open_calling_partner"/>
-    <field name="type">form</field>
     <field name="arch" type="xml">
         <group name="partner_found" position="inside">
             <button name="open_crm_claims" string="Open Related CRM Claims" type="object" icon="gtk-go-forward" />