diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index 8fb70864e00..78d6e5bce4e 100755
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -107,7 +107,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 		return result
 
 	def get_min_date(self,form):
-		
+
 		## Get max born from account_fiscal year
 		#
 		sql = """ select min(fy.date_start) as start_date,max(fy.date_stop) as stop_date from account_fiscalyear
@@ -122,9 +122,9 @@ class general_ledger_landscape(rml_parse.rml_parse):
 			periods = form['periods'][0][2]
 			if not periods:
 				sql = """
-					Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear'])   + """ 
+					Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear'])   + """
 					"""
-			else:	
+			else:
 				periods_id = ','.join(map(str, periods))
 				sql = """
 					Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id   + """)
@@ -140,9 +140,9 @@ class general_ledger_landscape(rml_parse.rml_parse):
 			periods = form['periods'][0][2]
 			if not periods:
 				sql = """
-					Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear'])   + """ 
+					Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear'])   + """
 					"""
-			else:	
+			else:
 				periods_id = ','.join(map(str, periods))
 				sql = """
 					Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id   + """)
@@ -162,7 +162,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 			else :
 				borne_max = date_max
 		elif form['state'] == 'none':
-			
+
 			sql = """
 					SELECT min(date) as start_date,max(date) as stop_date FROM account_move_line """
 			self.cr.execute(sql)
@@ -180,7 +180,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 
 	def get_children_accounts(self, account, form):
 
-		
+
 		self.child_ids = self.pool.get('account.account').search(self.cr, self.uid,
 			[('parent_id', 'child_of', self.ids)])
 #
@@ -225,7 +225,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 					res.append(child_account)
 		##
 		if not len(res):
-			
+
 			return [account]
 		else:
 			## We will now compute solde initiaux
@@ -250,7 +250,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 					move.init_credit = 0
 					move.init_debit = 0
 
-		
+
 		return res
 
 	def lines(self, account, form):
@@ -266,19 +266,19 @@ class general_ledger_landscape(rml_parse.rml_parse):
 		else:
 			sorttag = 'j.code'
 		sql = """
-			SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , l.debit, l.credit, l.period_id  
+			SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , l.debit, l.credit, l.period_id
 					FROM account_move_line as l
-   					LEFT JOIN res_currency c on (l.currency_id=c.id) 
+   					LEFT JOIN res_currency c on (l.currency_id=c.id)
    	   				JOIN account_journal j on (l.journal_id=j.id)
    	   	   			AND account_id = %d
-   	   	   			AND %s 
-   	   	   	  		WHERE l.date<='%s' 
-   	   	   	  		AND l.date>='%s' 
-   	   	   	  		ORDER by %s"""%(account.id,self.query,self.date_borne['max_date'],self.date_borne['min_date'],sorttag)		
-		
+   	   	   			AND %s
+   	   	   	  		WHERE l.date<='%s'
+   	   	   	  		AND l.date>='%s'
+   	   	   	  		ORDER by %s"""%(account.id,self.query,self.date_borne['max_date'],self.date_borne['min_date'],sorttag)
+
 		self.cr.execute(sql)
-		
-		res = self.cr.dictfetchall() 
+
+		res = self.cr.dictfetchall()
 		sum = 0.0
 		account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
 		for l in res:
@@ -293,7 +293,10 @@ class general_ledger_landscape(rml_parse.rml_parse):
 				l['partner'] = line.partner_id.name
 			else :
 				l['partner'] = ''
-			sum += l['debit'] - l ['credit']
+
+			
+			sum = l['debit'] - l ['credit']
+			
 			c = time.strptime(l['date'],"%Y-%m-%d")
 			l['date'] = time.strftime("%d-%m-%Y",c)
 			l['progress'] = sum
diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 2918acbf1dc..6dab67767e9 100644
--- a/addons/crm_configuration/crm_claims_menu.xml
+++ b/addons/crm_configuration/crm_claims_menu.xml
@@ -1,190 +1,162 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>
-	
-	######################## CLAIMS (menu) ###########################
-	<record model="ir.actions.act_window" id="crm_case_categ_claim0">
-		<field name="name">All Claims</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_claim0"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_claims_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_claim0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_claim0"/>
-	</record>
-	<menuitem name="Claims" id="menu_crm_case_claims"  parent="menu_aftersale" action="crm_case_categ_claim0"/>
-	
-	<!-- My Claims -->
-	<record model="ir.actions.act_window" id="crm_case_category_act_claim_my1">
-		<field name="name">My Claims</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_claim_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_claims_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
-	</record>
-	<menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims"/>
+    <menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>
+    
+    ######################## CLAIMS (menu) ###########################
+    <record model="ir.actions.act_window" id="crm_case_categ_claim0">
+        <field name="name">All Claims</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_claims_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_claims_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+    </record>
+    <menuitem name="Claims" id="menu_crm_case_claims"  parent="menu_aftersale" action="crm_case_categ_claim0"/>
+    
+    <!-- My Claims -->
+    <record model="ir.actions.act_window" id="crm_case_category_act_claim_my1">
+        <field name="name">My Claims</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,form,calendar</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid)]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_claim_my1">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_claims_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_claims_form_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
+    </record>
+    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_claim1">
-		<field name="name">Funds</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim1"/>
-	</record>
-	<menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_category_act_claim_my1"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_claim1">
+        <field name="name">Claims</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_claims_form_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_claims_form_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim1"/>
+    </record>
+    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_claim_my2">
-		<field name="name">My Unclosed Claims</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_claims_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
-	</record>
-	<menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2">
+        <field name="name">My Unclosed Claims</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my2">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_my2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_claims_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my2">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_claims_form_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
+    </record>
+    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_claim_my3">
-		<field name="name">My Cancelled Claims</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_claims_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_claim_my3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_my3"/>
-	</record>
-	<menuitem name="My Cancelled Claims" id="menu_crm_case_categ0_act_claim_my3" action="crm_case_category_act_claim_my3" parent="menu_crm_case_category_act_claim_my1"/>
-	
-	<!-- All Claims -->
-	<menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2_open">
+        <field name="name">My Open Claims</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my2_open">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_my2_open">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_claims_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_my2_open">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_claims_form_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
+    </record>
+    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2" parent="menu_crm_case_categ0_act_claim_my2"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_claim_all2">
-		<field name="name">All Unclosed Claims</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_all2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_claims_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_all2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
-	</record>
-	<menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0"/>
+    <!-- All Claims -->
+    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims"/>
 
-	<record model="ir.actions.act_window" id="crm_case_category_act_claim_all3">
-		<field name="name">All Cancelled Claims</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'state\',\'=\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_all3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_claims_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_all3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_claims_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_claim_all3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_claims_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_claim_all3"/>
-	</record>
-	<menuitem name="All Cancelled Claims" id="menu_crm_case_categ0_act_claim_all3" action="crm_case_category_act_claim_all3" parent="menu_crm_case_categ_claim0"/>
+    <record model="ir.actions.act_window" id="crm_case_category_act_claim_all2">
+        <field name="name">All Unclosed Claims</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_all2">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_claims_tree_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_claim_all2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_claims_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim_all2">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_claims_form_view"/>
+        <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
+    </record>
+    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0"/>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 254c9e30223..a46410a298e 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -1,144 +1,136 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-	# ------------------------------------------------------ 
-	# Claims
-	# ------------------------------------------------------ 
+    <data>
+    # ------------------------------------------------------ 
+    # Claims
+    # ------------------------------------------------------ 
 
-	<record model="ir.ui.view" id="crm_case_claims_tree_view">
-		<field name="name">CRM - Claims Tree</field>
-		<field name="model">crm.case</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Claims"  colors="red:state=='open'">
-				<field name="id"/>
-				<field name="partner_id"/>
-				<field name="date" string="Date of Claim"/>
-				<field name="categ_id" string="Type of claim" select="1"/>
-				<field name="date_closed"/>
-				<field name="planned_cost" string="Claim Cost"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="crm_case_claims_tree_view">
+        <field name="name">CRM - Claims Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Claims"  colors="red:state=='open'">
+                <field name="id"/>
+                <field name="partner_id"/>
+                <field name="date" string="Date of Claim"/>
+                <field name="categ_id" string="Type of claim" select="1"/>
+                <field name="date_closed"/>
+                <field name="planned_cost" string="Claim Cost"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="crm_case_claims_form_view">
-		<field name="name">CRM - Claims Form</field>
-		<field name="model">crm.case</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Claims">
-				<group colspan="4" col="6">
-					<field name="partner_id"/>
-					<field name="section_id" colspan="1"/>
-					<newline/>
-					<field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
-					<field name="date" string="Date of Claim"/>
-				</group>
-				<notebook>
-				<page string="Claims Info">
-						<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-						<field name="email_from"/>
-						<newline/>
-						<field name="partner_phone"/>
-						<field name="partner_mobile"/>
-						<newline/>
-						<separator colspan="4"/>
-						<field name="planned_cost" string="Claim Cost"/>
-						<field name="probability"/>
-						<newline/>
-						<field name="priority"/>						
-						<field name="category2_id" string="Type of Action" select="1"/>
-						<field name="stage_id" colspan="2"/>
-						<field name="user_id" string="Responsible" select="2"/>
-						<newline/>
-						<separator colspan="4"/>
-						<field name="name" string="Description" colspan="4"/>
-						<separator colspan="4"/>
-						<group col="8" colspan="4">
-							<field name="state" select="1"/> 
-					 		<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-							<button name="case_open" string="Open" states="draft,pending" type="object"/>
-							<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-							<button name="case_pending" string="Pending" states="draft,open" type="object"/>
-							<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
-						</group>
-				</page>
-				<page string="Internal Notes">
-					<separator string= "Notes" colspan="4"/>
-					<field name="note" nolabel="1"/>
-				</page>
-				<page string="Extra Info">
-					<field name="id"/>
-					<field name="active"/>
-					<field name="email_cc"/>
-					<field name="canal_id"/>
-					<separator colspan="4" string="Dates"/>
-					<field name="create_date"/>
-					<field name="date_closed"/>
-					<field name="date_action_last"/>
-					<field name="date_action_next"/>
-					<separator colspan="4"/>
-					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-						<form string="Communication history">
-							<group col="6" colspan="4">
-								<field name="date"/>
-								<field name="email"/>
-								<field name="canal_id"/>
-							</group>
-							<newline/>
-							<field name="description" colspan="4" nolabel="1"/>
-						</form>
-						<tree string="Communication history">
-							<field name="description"/>
-							<field name="email"/>
-							<field name="date"/>
-						</tree>
-					</field>
-					<group col="2" colspan="2" expand="1">
-						<field name="som"/>
-						<button name="add_reply" string="Add Last Mail for Replying"
-							states="open" type="object" colspan="2"/>
-						<field name="description" colspan="2" nolabel="1"/>
-						<button name="case_log_reply"
-							string="Send Partner &amp; Historize" states="open"
-							type="object"/>
-						<button name="case_log" string="Historize" states="open"
-							type="object"/>
-					</group>
-					<separator colspan="4" string="References"/>
-					<field name="ref" colspan="4"/>
-					<field name="ref2" colspan="4"/>
-				</page>
-				<page string="History">
-					<field name="log_ids" nolabel="1" colspan="4">
-						<form string="Actions">
-							<separator string="Action Information" colspan="4"/>
-							<field name="name" colspan="4"/>
-							<field name="date"/>
-							<field name="user_id"/>
-							<field name="som"/>
-							<field name="canal_id"/>
-						</form>
-					</field>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="crm_case_claims_form_view">
+        <field name="name">CRM - Claims Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Claims">
+                <group colspan="4" col="6">
+                    <field name="partner_id"/>
+                    <field name="user_id" string="Responsible" select="2"/>
+                    <field name="section_id"/>
+                    <newline/>
+                    <field name="date" string="Date of Claim"/>
+                    <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
+                    <field name="stage_id"/>
+                </group>
+                <notebook>
+                <page string="Claims Info">
+                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                    <field name="email_from"/>
+                    <field name="partner_phone"/>
+                    <field name="partner_mobile"/>
+                    <newline/>
+                    <field name="planned_cost" string="Claim Cost"/>
+                    <field name="planned_revenue" string="Claim Revenue"/>
+                    <field name="priority"/>
+                    <field name="category2_id" string="Type of Action" select="1"/>
+                    <field name="ref"/>
+                    <field name="ref2"/>
+                    <separator colspan="2" string="Claim Description"/>
+                    <separator colspan="2" string="Action Description"/>
+                    <field name="note" colspan="2" nolabel="1"/>
+                    <field name="description" colspan="2" nolabel="1"/>
+                    <label string="" colspan="2"/>
+                    <group colspan="2">
+                        <button name="case_log_reply"
+                            string="Send Partner &amp; Historize" states="open"
+                            type="object"/>
+                        <button name="case_log" string="Historize" states="open"
+                            type="object"/>
+                    </group>
+                    <separator colspan="4" string="Status"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="1"/> 
+                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                    </group>
+                </page>
+                <page string="Extra Info" groups="base.group_extended">
+                    <field name="id"/>
+                    <field name="active"/>
+                    <field name="email_cc"/>
+                    <field name="canal_id"/>
+                    <separator colspan="4" string="Dates"/>
+                    <field name="create_date"/>
+                    <field name="date_closed"/>
+                    <field name="date_action_last"/>
+                    <field name="date_action_next"/>
+                        <field name="som"/>
+                    <separator colspan="4" string="History"/>
+                    <field name="history_line" colspan="4" nolabel="1" mode="tree,form">
+                        <form string="Communication history">
+                            <group col="6" colspan="4">
+                                <field name="date"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                </page>
+                <page string="History">
+                    <field name="log_ids" nolabel="1" colspan="4">
+                        <form string="Actions">
+                            <separator string="Action Information" colspan="4"/>
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                            <field name="som"/>
+                            <field name="canal_id"/>
+                        </form>
+                    </field>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="crm_case_claims_calendar_view">
-		<field name="name">CRM - Claims Calendar</field>
-		<field name="model">crm.case</field>
-		<field name="type">calendar</field>
-		<field name="priority" eval="2"/>
-		<field name="arch" type="xml">
-			<calendar string="Claims" date_start="date" color="user_id">
-				<field name="name"/>
-				<field name="partner_name"/>
-				<field name="categ_id"/>
-			</calendar>
-		</field>
-	</record>
-	</data>
+    <record model="ir.ui.view" id="crm_case_claims_calendar_view">
+        <field name="name">CRM - Claims Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Claims" date_start="date" color="user_id">
+                <field name="name"/>
+                <field name="partner_name"/>
+                <field name="categ_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index 0377d4002e0..5f287f3253b 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -96,12 +96,11 @@ class crm_menu_config_wizard(osv.osv_memory):
         'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"),
         'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
         'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
-        'claims' : fields.boolean('Supplier Claims', help="Manages the supplier complaints."),
-        'phonecall' : fields.boolean('Phone Calls', help="Help you to encode the result of a phone call"),
+        'claims' : fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
+        'phonecall' : fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to planify a list of phone calls to process."),
     }
     _defaults = {
         'meeting': lambda *args: True,
-        'jobs': lambda *args: True,
         'opportunity': lambda *args: True,
         'phonecall': lambda *args: True,
     }
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 275a509b102..7801e341e0f 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -14,14 +14,14 @@
                     <label colspan="4" align="0.0" string="The CRM module of OpenERP is able to manage any kind of relationship. But, as to help you to start quickly on the system, we configured a few of them for you."/>
                     <newline/>
                     <field name="meeting"/>
-                    <field name="lead"/>
                     <field name="opportunity"/>
-                    <field name="jobs"/>
+                    <field name="phonecall"/>
+                    <field name="lead"/>
+                    <field name="claims"/>
                     <field name="bugs"/>
                     <field name="helpdesk"/>
+                    <field name="jobs"/>
                     <field name="fund"/>
-                    <field name="claims"/>
-                    <field name="phonecall"/>
                     <separator colspan="4" string="Calendar Sharing"/>
                     <field name="document_ics"/>
                     <newline/>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 81eded15237..be8184a3f5d 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -51,7 +51,7 @@
                     </group>
                  </page>
 
-                 <page string="Extra Info">
+                 <page string="Extra Info" groups="base.group_extended">
                     <field name="id"/>
                     <field name="active" select="2"/>
                     <field name="email_cc" colspan="2"/>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 937ff3a13c6..a8360cf06d3 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -48,7 +48,7 @@
                     </group>
                 </page>
 
-                <page string="Extra Info">
+                <page string="Extra Info" groups="base.group_extended">
                     <field name="id"/>
                     <field name="active"/>
                     <field name="email_cc" colspan="4"/>
diff --git a/addons/crm_configuration/crm_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index 431ea2ab424..d072e0669f6 100644
--- a/addons/crm_configuration/crm_phonecall_menu.xml
+++ b/addons/crm_configuration/crm_phonecall_menu.xml
@@ -4,7 +4,7 @@
     
     <act_window
         id="crm_case_categ_phone_create_partner"
-        name="New Phone Call"
+        name="Schedule Phone Call"
         res_model="crm.case"
         src_model="res.partner"
         view_mode="calendar,tree,form"
@@ -14,303 +14,219 @@
     <record model="ir.actions.act_window" id="crm_case_categ_phone_create_partner">
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+')]'"/>
     </record>
-	######################## PHONE CALLS (menu) ###########################
-	<record model="ir.actions.act_window" id="crm_case_categ_phone0">
-		<field name="name">Phone Calls</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone0"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone0"/>
-	</record>
-	<menuitem name="Phone Calls" id="menu_crm_case_phone"  parent="crm.menu_crm" action="crm_case_categ_phone0"/>
+    ######################## PHONE CALLS (menu) ###########################
+    <record model="ir.actions.act_window" id="crm_case_categ_phone0">
+        <field name="name">Phone Calls</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone0"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_phone_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone0"/>
+    </record>
+    <menuitem name="Phone Calls" id="menu_crm_case_phone"  parent="crm.menu_crm" action="crm_case_categ_phone0"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
-		<field name="name">Inbound</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
-	</record>
-	<menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
+        <field name="name">Inbound</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_phone_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
+    </record>
+    <menuitem name="Inbound" id="menu_crm_case_categ_phone_incoming0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming1">
-		<field name="name">New Incoming Call</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
-	</record>
-	<menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1"/>
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming1">
+        <field name="name">New Incoming Call</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
+    </record>
+    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming2">
-		<field name="name">Planned Calls</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+'), (\'stage_id\',\'=\','+str(ref('stage_phone1'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
-	</record>
-	<menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2"/>
-
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming3">
-		<field name="name">Calls Held</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+'), (\'stage_id\',\'=\','+str(ref('stage_phone2'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming3"/>
-	</record>
-	<menuitem name="Calls Held" id="menu_crm_case_categ_phone_incoming3"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming3"/>
-
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming4">
-		<field name="name">Calls Not Held</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+'), (\'stage_id\',\'=\','+str(ref('stage_phone3'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming4">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming4">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_incoming4"/>
-	</record>
-	<menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_incoming4"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming4"/>
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming2">
+        <field name="name">Planned Calls</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+'), (\'state\',\'=\',\'\open\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming2">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_phone_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming2">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
+    </record>
+    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2"/>
 
 ################################################################
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
-		<field name="name">Outbound</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-	</record>
-	<menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
+        <field name="name">Outbound</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_phone_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
+    </record>
+    <menuitem name="Outbound" id="menu_crm_case_categ_phone_outgoing0"  parent="menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing1">
-		<field name="name">New Outgoing Call</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
-	</record>
-	<menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1"/>
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing1">
+        <field name="name">New Outgoing Call</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing1">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
+    </record>    
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
+    </record>
+    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing2">
-		<field name="name">Planned Calls</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'stage_id\',\'=\','+str(ref('stage_phone1'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
-	</record>
-	<menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2"/>
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing2">
+        <field name="name">Planned Calls</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'state\',\'=\',\'open\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing2">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_phone_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing2">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
+    </record>
+    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing3">
-		<field name="name">Calls Held</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'stage_id\',\'=\','+str(ref('stage_phone2'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing3"/>
-	</record>
-	<menuitem name="Calls Held" id="menu_crm_case_categ_phone_outgoing3"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing3"/>
-
-	<record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing4">
-		<field name="name">Calls Not Held</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'stage_id\',\'=\','+str(ref('stage_phone3'))+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing4">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_phone_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_phone_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing4">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_phone_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
-	</record>
-	<menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4"/>
+    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing4">
+        <field name="name">Calls Not Held</field>
+        <field name="res_model">crm.case</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'state\',\'=\',\'pending\')]'"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing4">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing4">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="crm_case_phone_calendar_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing4">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
+    </record>
+    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4"/>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index d8ded666283..ad5f3be6a07 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -1,137 +1,139 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-	# ------------------------------------------------------ 
-	# Phone Calls
-	# ------------------------------------------------------ 
+    <data>
+    # ------------------------------------------------------ 
+    # Phone Calls
+    # ------------------------------------------------------ 
 
-	<record model="ir.ui.view" id="crm_case_phone_tree_view">
-		<field name="name">CRM - Phone Calls Tree</field>
-		<field name="model">crm.case</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Phone Calls"  colors="red:state=='open'">
-				<field name="id"/>
-				<field name="name" string="Subject"/>
-				<field name="categ_id" string="Direction" select="1"/>
-				<field name="partner_id" string="Related to"/>
-				<field name="date" string="Start Date"/>
-				<field name="partner_address_id" string="Contact"/>
-				<field name="user_id" string="Assigned to"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="crm_case_phone_tree_view">
+        <field name="name">CRM - Phone Calls Tree</field>
+        <field name="model">crm.case</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Phone Calls"  colors="red:state=='open'">
+                <field name="id"/>
+                <field name="name" string="Subject"/>
+                <field name="categ_id" string="Direction" select="1"/>
+                <field name="partner_id" string="Partner"/>
+                <field name="partner_address_id" string="Contact"/>
+                <field name="date" string="Date"/>
+                <field name="user_id" string="Assigned to"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="crm_case_phone_form_view">
-		<field name="name">CRM - Phone Call Form</field>
-		<field name="model">crm.case</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Claims">
-				<group colspan="4" col="6">
-					<field name="name" string="Subject"/>
-					<field name="section_id" colspan="1"/>
-					<newline/>
-					<field name="date" string="Start Date &amp; Time"/>
-					<field name="duration"/>
-				</group>
-				<notebook>
-				<page string="General">
-						<field name="partner_id" string="Related to"/>
-						<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-						<newline/>
-						<field name="partner_phone"/>
-						<field name="partner_mobile"/>
-						<newline/>
-						<field name="email_from"/>
-						<field name="user_id" string="Assigned to" select="2"/>
-						<field name="priority"/>
-						<field name="active" string="Reminder"/>
-						<separator colspan="4"/>
-						<field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)"/>
-						<field name="stage_id"/>
-						<separator string= "Description" colspan="4"/>
-						<field name="note" nolabel="1" colspan="4"/>
-						<separator colspan="4"/>
-						<group col="8" colspan="4">
-							<field name="state" select="1"/> 
-					 		<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-							<button name="case_open" string="Open" states="draft,pending" type="object"/>
-							<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-							<button name="case_pending" string="Pending" states="draft,open" type="object"/>
-							<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
-						</group>
-				</page>
-				<page string="Extra Info">
-					<field name="id" colspan="4"/>
-					<field name="email_cc"/>
-					<field name="canal_id"/>
-					<separator colspan="4" string="Dates"/>
-					<field name="create_date"/>
-					<field name="date_closed"/>
-					<field name="date_action_last"/>
-					<field name="date_action_next"/>
-					<separator colspan="4"/>
-					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-						<form string="Communication history">
-							<group col="6" colspan="4">
-								<field name="date"/>
-								<field name="email"/>
-								<field name="canal_id"/>
-							</group>
-							<newline/>
-							<field name="description" colspan="4" nolabel="1"/>
-						</form>
-						<tree string="Communication history">
-							<field name="description"/>
-							<field name="email"/>
-							<field name="date"/>
-						</tree>
-					</field>
-					<group col="2" colspan="2" expand="1">
-						<field name="som"/>
-						<button name="add_reply" string="Add Last Mail for Replying"
-							states="open" type="object" colspan="2"/>
-						<field name="description" colspan="2" nolabel="1"/>
-						<button name="case_log_reply"
-							string="Send Partner &amp; Historize" states="open"
-							type="object"/>
-						<button name="case_log" string="Historize" states="open"
-							type="object"/>
-					</group>
-					<separator colspan="4" string="References"/>
-					<field name="ref" colspan="4"/>
-					<field name="ref2" colspan="4"/>
-				</page>
-				<page string="History">
-					<field name="log_ids" nolabel="1" colspan="4">
-						<form string="Actions">
-							<separator string="Action Information" colspan="4"/>
-							<field name="name" colspan="4"/>
-							<field name="date"/>
-							<field name="user_id"/>
-							<field name="som"/>
-							<field name="canal_id"/>
-						</form>
-					</field>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="crm_case_phone_form_view">
+        <field name="name">CRM - Phone Call Form</field>
+        <field name="model">crm.case</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Claims">
+                <group colspan="4" col="6">
+                    <field name="name" string="Subject"/>
+                    <field name="section_id" colspan="1"/>
+                    <field name="user_id" string="Assigned to" select="2"/>
+                    <newline/>
+                    <field name="date" string="Date"/>
+                    <field name="duration"/>
+                    <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"/>
+                </group>
+                <notebook colspan="4">
+                <page string="General">
+                    <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1"/>
+                    <field name="active" string="Reminder"/>
+                    <field name="partner_id" string="Partner"/>
+                    <field name="partner_address_id" string="Contact"/>
+                    <newline/>
+                    <field name="partner_phone"/>
+                    <field name="partner_mobile"/>
+                    <newline/>
+                    <field name="som"/>
+                    <field name="priority" string="Relevant"/>
+                    <separator string= "Description" colspan="4"/>
+                    <field name="note" nolabel="1" colspan="4"/>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="1"/> 
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                        <button name="case_pending" string="Not Held" states="open" type="object"/>
+                        <button name="case_close" string="Held" states="open,draft,pending" type="object"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                    </group>
+                </page>
+                <page string="Extra Info" groups="base.group_extended">
+                    <field name="id" colspan="4"/>
+                    <field name="email_cc"/>
+                    <field name="canal_id"/>
+                    <separator colspan="4" string="Dates"/>
+                    <field name="create_date"/>
+                    <field name="date_closed"/>
+                    <field name="date_action_last"/>
+                    <field name="date_action_next"/>
+                    <field name="planned_cost"/>
+                    <field name="planned_revenue"/>
+                    <field name="probability"/>
+                    <field name="categ_id"/>
+                    <separator colspan="4"/>
+                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+                        <form string="Communication history">
+                            <group col="6" colspan="4">
+                                <field name="date"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <group col="2" colspan="2" expand="1">
+                        <button name="add_reply" string="Add Last Mail for Replying"
+                            states="open" type="object" colspan="2"/>
+                        <field name="description" colspan="2" nolabel="1"/>
+                        <button name="case_log_reply"
+                            string="Send Partner &amp; Historize" states="open"
+                            type="object"/>
+                        <button name="case_log" string="Historize" states="open"
+                            type="object"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref" colspan="4"/>
+                    <field name="ref2" colspan="4"/>
+                </page>
+                <page string="History">
+                    <field name="log_ids" nolabel="1" colspan="4">
+                        <form string="Actions">
+                            <separator string="Action Information" colspan="4"/>
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                            <field name="som"/>
+                            <field name="canal_id"/>
+                        </form>
+                    </field>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="crm_case_phone_calendar_view">
-		<field name="name">CRM - Phone Calls Calendar</field>
-		<field name="model">crm.case</field>
-		<field name="type">calendar</field>
-		<field name="priority" eval="2"/>
-		<field name="arch" type="xml">
-			<calendar string="Phone Calls" date_start="date" color="user_id" date_delay="duration">
-				<field name="name"/>
-				<field name="partner_id"/>
-				<field name="categ_id"/>
-			</calendar>
-		</field>
-	</record>	
-	</data>
-</openerp>
\ No newline at end of file
+    <record model="ir.ui.view" id="crm_case_phone_calendar_view">
+        <field name="name">CRM - Phone Calls Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Phone Calls" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="categ_id"/>
+            </calendar>
+        </field>
+    </record>    
+    </data>
+</openerp>
diff --git a/addons/document_ics/document.py b/addons/document_ics/document.py
index e131ecaa9a4..f447a0eb660 100644
--- a/addons/document_ics/document.py
+++ b/addons/document_ics/document.py
@@ -128,7 +128,7 @@ class document_directory_content(osv.osv):
                         dt = dt+' 09:00:00'
                     value = datetime.datetime.strptime(dt, '%Y-%m-%d %H:%M:%S')
                     if field.name=='dtend':
-                        value += datetime.timedelta(hours=2)
+                        value += datetime.timedelta(hours=3)
                     event.add(field.name).value = value
         s= StringIO.StringIO(cal.serialize().encode('utf8'))
         s.name = node
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index 013c990c71a..72b1e60f0f8 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -2,6 +2,11 @@
 <openerp>
 <data noupdate="1">
 
+    <record model="crm.case.section" id="section_meeting">
+        <field name="name">Shared Calendar Meetings</field>
+        <field name="code">shcal</field>
+    </record>
+
     <record model="document.directory" id="dir_calendars">
         <field name="name">Calendars</field>
     </record>
@@ -13,7 +18,7 @@
         <field name="extension">.ics</field>
         <field name="include_name" eval="False"/>
         <field name="ics_object_id" ref="crm.model_crm_case"/>
-        <field name="ics_domain">[('section_id','=','Calendar')]</field>
+        <field name="ics_domain" eval="'[(\'section_id\',\'=\','+ref('section_meeting')+')]'"/>
     </record>
 
     <record model="document.directory.ics.fields" id="dir_field1">