From dbceae355edc3ddee96382de83a50ef5a8bb8420 Mon Sep 17 00:00:00 2001
From: Antonio Espinosa <antonioea@antiun.com>
Date: Wed, 8 Apr 2015 19:34:58 +0200
Subject: [PATCH] [FIX] XML revised

---
 crm_department/views/crm_department_view.xml |  48 +++---
 crm_department/views/crm_lead_view.xml       | 154 +++++++++----------
 crm_department/views/res_partner_view.xml    |  82 +++++-----
 3 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/crm_department/views/crm_department_view.xml b/crm_department/views/crm_department_view.xml
index 4a0c66fa7..d340f28e3 100644
--- a/crm_department/views/crm_department_view.xml
+++ b/crm_department/views/crm_department_view.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-        <record id="crm_department_action" model="ir.actions.act_window">
-            <field name="name">Departments</field>
-            <field name="res_model">crm.department</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
+<record id="crm_department_action" model="ir.actions.act_window">
+    <field name="name">Departments</field>
+    <field name="res_model">crm.department</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">tree</field>
+</record>
 
-        <record id="crm_department_tree_view" model="ir.ui.view">
-            <field name="name">CRM department tree</field>
-            <field name="model">crm.department</field>
-            <field name="arch" type="xml">
-                <tree string="Departments" editable="bottom">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                </tree>
-            </field>
-        </record>
+<record id="crm_department_tree_view" model="ir.ui.view">
+    <field name="name">CRM department tree</field>
+    <field name="model">crm.department</field>
+    <field name="arch" type="xml">
+        <tree string="Departments" editable="bottom">
+            <field name="name"/>
+            <field name="parent_id"/>
+        </tree>
+    </field>
+</record>
 
-        <menuitem action="crm_department_action"
-                  id="menu_crm_department"
-                  name="Departments"
-                  parent="base.menu_crm_config_lead"
-                  sequence="3"/>
+<menuitem action="crm_department_action"
+          id="menu_crm_department"
+          name="Departments"
+          parent="base.menu_crm_config_lead"
+          sequence="3"/>
 
-    </data>
+</data>
 </openerp>
\ No newline at end of file
diff --git a/crm_department/views/crm_lead_view.xml b/crm_department/views/crm_lead_view.xml
index 32e851bce..26439d894 100644
--- a/crm_department/views/crm_lead_view.xml
+++ b/crm_department/views/crm_lead_view.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-        <record model="ir.ui.view" id="crm_case_form_view_leads_department">
-            <field name="name">CRM - Leads Form with department</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
-            <field name="arch" type="xml">
-                <field name="phone" position="before">
-                    <field name="department"/>
-                </field>
-            </field>
-        </record>
+<record model="ir.ui.view" id="crm_case_form_view_leads_department">
+    <field name="name">CRM - Leads Form with department</field>
+    <field name="model">crm.lead</field>
+    <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
+    <field name="arch" type="xml">
+        <field name="phone" position="before">
+            <field name="department"/>
+        </field>
+    </field>
+</record>
 
-        <!-- Uncomment this to add a new column to tree view
-        <record model="ir.ui.view" id="crm_case_tree_view_leads_department">
-            <field name="name">Leads with department</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_tree_view_leads"/>
-            <field name="arch" type="xml">
-                <field name="section_id" position="after">
-                    <field name="department"/>
-                </field>
-            </field>
-        </record>
-        -->
+<!-- Uncomment this to add a new column to tree view
+<record model="ir.ui.view" id="crm_case_tree_view_leads_department">
+    <field name="name">Leads with department</field>
+    <field name="model">crm.lead</field>
+    <field name="inherit_id" ref="crm.crm_case_tree_view_leads"/>
+    <field name="arch" type="xml">
+        <field name="section_id" position="after">
+            <field name="department"/>
+        </field>
+    </field>
+</record>
+-->
 
-        <record model="ir.ui.view" id="view_crm_case_leads_filter_department">
-            <field name="name">CRM - Leads Search with departments</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.view_crm_case_leads_filter"/>
-            <field name="arch" type="xml">
-                <field name="section_id" position="after">
-                    <field name="department"/>
-                </field>
-                <filter string="Sales Team" position="after">
-                    <filter string="Department"
-                            domain="[]"
-                            context="{'group_by': 'department'}"/>
-                </filter>
-            </field>
-        </record>
+<record model="ir.ui.view" id="view_crm_case_leads_filter_department">
+    <field name="name">CRM - Leads Search with departments</field>
+    <field name="model">crm.lead</field>
+    <field name="inherit_id" ref="crm.view_crm_case_leads_filter"/>
+    <field name="arch" type="xml">
+        <field name="section_id" position="after">
+            <field name="department"/>
+        </field>
+        <filter string="Sales Team" position="after">
+            <filter string="Department"
+                    domain="[]"
+                    context="{'group_by': 'department'}"/>
+        </filter>
+    </field>
+</record>
 
-        <record model="ir.ui.view" id="crm_case_form_view_oppor_department">
-            <field name="name">CRM - Leads Form with department</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
-            <field name="arch" type="xml">
-                <field name="phone" position="before">
-                    <field name="department"/>
-                </field>
-            </field>
-        </record>
+<record model="ir.ui.view" id="crm_case_form_view_oppor_department">
+    <field name="name">CRM - Leads Form with department</field>
+    <field name="model">crm.lead</field>
+    <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
+    <field name="arch" type="xml">
+        <field name="phone" position="before">
+            <field name="department"/>
+        </field>
+    </field>
+</record>
 
-        <!-- Uncomment this to add a new column to tree view
-        <record model="ir.ui.view" id="crm_case_tree_view_oppor_department">
-            <field name="name">Leads with department</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_tree_view_oppor"/>
-            <field name="arch" type="xml">
-                <field name="section_id" position="after">
-                    <field name="department"/>
-                </field>
-            </field>
-        </record>
-        -->
+<!-- Uncomment this to add a new column to tree view
+<record model="ir.ui.view" id="crm_case_tree_view_oppor_department">
+    <field name="name">Leads with department</field>
+    <field name="model">crm.lead</field>
+    <field name="inherit_id" ref="crm.crm_case_tree_view_oppor"/>
+    <field name="arch" type="xml">
+        <field name="section_id" position="after">
+            <field name="department"/>
+        </field>
+    </field>
+</record>
+-->
 
-        <record model="ir.ui.view" id="view_crm_case_opportunities_filter_department">
-            <field name="name">CRM - Leads Search with departments</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter"/>
-            <field name="arch" type="xml">
-                <field name="section_id" position="after">
-                    <field name="department"/>
-                </field>
-                <filter string="Sales Team" position="after">
-                    <filter string="Department"
-                            domain="[]"
-                            context="{'group_by': 'department'}"/>
-                </filter>
-            </field>
-        </record>
+<record model="ir.ui.view" id="view_crm_case_opportunities_filter_department">
+    <field name="name">CRM - Leads Search with departments</field>
+    <field name="model">crm.lead</field>
+    <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter"/>
+    <field name="arch" type="xml">
+        <field name="section_id" position="after">
+            <field name="department"/>
+        </field>
+        <filter string="Sales Team" position="after">
+            <filter string="Department"
+                    domain="[]"
+                    context="{'group_by': 'department'}"/>
+        </filter>
+    </field>
+</record>
 
-    </data>
+</data>
 </openerp>
\ No newline at end of file
diff --git a/crm_department/views/res_partner_view.xml b/crm_department/views/res_partner_view.xml
index 0909e057d..a896b98fb 100644
--- a/crm_department/views/res_partner_view.xml
+++ b/crm_department/views/res_partner_view.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-        <record model="ir.ui.view" id="view_partner_form_department">
-            <field name="name">Partner form with department</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <field name="phone" position="before">
-                    <field name="department"
-                           placeholder="Department"/>
-                </field>
-            </field>
-        </record>
+<record model="ir.ui.view" id="view_partner_form_department">
+    <field name="name">Partner form with department</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_partner_form"/>
+    <field name="arch" type="xml">
+        <field name="phone" position="before">
+            <field name="department"
+                   placeholder="Department"/>
+        </field>
+    </field>
+</record>
 
-        <!-- Uncomment this to add a new column to tree view
-        <record model="ir.ui.view" id="view_partner_tree_department">
-            <field name="name">Partner tree with department</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_tree"/>
-            <field name="arch" type="xml">
-                <field name="phone" position="before">
-                    <field name="department"/>
-                </field>
-            </field>
-        </record>
-        -->
+<!-- Uncomment this to add a new column to tree view
+<record model="ir.ui.view" id="view_partner_tree_department">
+    <field name="name">Partner tree with department</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_partner_tree"/>
+    <field name="arch" type="xml">
+        <field name="phone" position="before">
+            <field name="department"/>
+        </field>
+    </field>
+</record>
+-->
 
-        <record model="ir.ui.view" id="view_res_partner_filter_department">
-            <field name="name">Partner search with department</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_res_partner_filter"/>
-            <field name="arch" type="xml">
-                <field name="category_id" position="after">
-                    <field name="department"/>
-                </field>
-                <filter string="Salesperson" position="after">
-                    <filter string="Department"
-                            domain="[]"
-                            context="{'group_by': 'department'}"/>
-                </filter>
-            </field>
-        </record>
+<record model="ir.ui.view" id="view_res_partner_filter_department">
+    <field name="name">Partner search with department</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_res_partner_filter"/>
+    <field name="arch" type="xml">
+        <field name="category_id" position="after">
+            <field name="department"/>
+        </field>
+        <filter string="Salesperson" position="after">
+            <filter string="Department"
+                    domain="[('is_company', '=', False)]"
+                    context="{'group_by': 'department'}"/>
+        </filter>
+    </field>
+</record>
 
-    </data>
+</data>
 </openerp>
\ No newline at end of file