From d802ed107b1f80b36897faa9cda66c175ce5d5c9 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 5 Feb 2010 18:03:21 +0530
Subject: [PATCH 01/27] [IMP] Set sequence for Financial Management menu and
 Project Management menu

bzr revid: vir@tinyerp.com-20100205123321-73a02663xixrt8rc
---
 addons/account/account_menuitem.xml                   | 2 +-
 addons/account_budget/crossovered_budget_view.xml     | 2 +-
 addons/base_contact/base_contact_view.xml             | 3 +--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +-
 addons/project/project_view.xml                       | 2 +-
 addons/report_timesheet/report_timesheet_view.xml     | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index f1dda334830..260d14e38e8 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index bdb8bfd4c8f..063594553e3 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -295,7 +295,7 @@
             menu="False"/>-->
 
 		<!--Menu for project management-->
-		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
 		<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
         <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
         <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index d4b99e11a85..bbc251d4b5f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -115,8 +115,6 @@
         <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
     <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
-    <menuitem name="Addresses" id="base.menu_partner_address_form" parent = "base.menu_address_book" sequence="3"/>
-
 
     <!-- Views for Partners -->
 
@@ -353,6 +351,7 @@
         </field>
     </record>
 
+
     <!-- Views for res.partner.job -->
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c9cfc6caeaf..e47662152c2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -220,7 +220,7 @@
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
         <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
           <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7703142e4d9..995fdcfbe51 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
 
          <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 087dda92817..79086640262 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -370,7 +370,7 @@
             <field name="view_id" ref="view_random_timesheet_lines_tree"/>
         </record>
          <!--Time Tracking menu in project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"

From 8c10c350129ae53f4f3fdd43b3897ca0e5c5ffb3 Mon Sep 17 00:00:00 2001
From: "RCH(OpenERP)" <>
Date: Fri, 5 Feb 2010 19:19:07 +0530
Subject: [PATCH 02/27] [IMP] Set sequence for all main menus

bzr revid: vir@tinyerp.com-20100205134907-3aczul2ggfqo0h7a
---
 .../account_analytic_analysis_menu.xml         |  2 +-
 addons/base_contact/base_contact_view.xml      |  2 +-
 .../base_report_designer_wizard.xml            |  2 +-
 addons/board/board_view.xml                    |  2 +-
 .../report_crm_project_bug_view.xml            |  2 +-
 addons/document/document_view.xml              |  2 +-
 addons/event/event_view.xml                    |  2 +-
 addons/hr/hr_view.xml                          |  2 +-
 addons/hr_attendance/hr_attendance_wizard.xml  |  2 +-
 addons/idea/idea_view.xml                      |  2 +-
 addons/lunch/lunch_view.xml                    |  2 +-
 addons/mrp/mrp_view.xml                        |  8 ++++----
 addons/olap/data/olap_view.xml                 |  2 +-
 addons/point_of_sale/pos_view.xml              |  2 +-
 addons/purchase/purchase_view.xml              |  4 ++--
 addons/resource/hr_view.xml                    |  2 +-
 addons/resource/resource_view.xml              |  2 +-
 addons/stock/stock_view.xml                    | 18 +++++++++---------
 addons/subscription/subscription_view.xml      |  2 +-
 addons/wiki/wiki_view.xml                      |  2 +-
 20 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 2862f7b7657..f9ea49e3b03 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
         <menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index bbc251d4b5f..74c31c4203f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -427,7 +427,7 @@
         src_model="res.partner.address"
         />
 
-    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"/>
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management" sequence="7"/>
     <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
             parent="base.menu_purchase_root" sequence="3"/>
     <menuitem name="Contacts" id="menu_partner_contact_supplier_form" action="action_partner_contact_form" parent = "base.menu_procurement_management_supplier" sequence="2"/>
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index 3485428fbf5..8882d2de9e9 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -8,7 +8,7 @@
 			name="base_report_designer.modify"
 			id="wizard_report_designer_modify"/>
 
-		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
     	<menuitem
             id="base.next_id_50"
             name="Configuration"
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 2b9341decd3..4b55e43c4dd 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
 <!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
diff --git a/addons/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml
index 75f9818e7af..4c6ea353ec7 100644
--- a/addons/crm_project/report_crm_project_bug_view.xml
+++ b/addons/crm_project/report_crm_project_bug_view.xml
@@ -68,7 +68,7 @@
             <field name="view_id" ref="view_crm_project_bug_user_graph"/>
             <field name="search_view_id" ref="view_crm_project_bug_user_filter"/>
         </record>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
         <menuitem name="Project Bug" id="menu_crm_project_bug_tree" parent="base.menu_project_report" sequence="1"/>
         <menuitem action="action_report_crm_project_bug_user_tree" id="menu_crm_project_bug_user_tree" parent="menu_crm_project_bug_tree"/>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 3fa805388c0..658dfc3630e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 03110015779..58a1c4ea997 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" />
+		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
 		<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
 	<!-- EVENTS  -->
 		<!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b93e7f658cd..66d9ee88dce 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
         <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
       <!--  <menuitem
             id="menu_hr_reporting"
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index d95c9d86d50..a1ea01ea764 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -12,7 +12,7 @@
         <menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
             groups="group_hr_attendance"/>
         <!--Time Tracking menu for Project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index fb705f820ca..177792966d5 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" />
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="30"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 61844e099cb..2011586c9b6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
         <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8d84a8c01fd..29d2ad7afc6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager"/>
+            groups="group_mrp_user,group_mrp_manager" sequence="3"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
 
@@ -544,7 +544,7 @@
                         <filter string="By Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-					</group>                         
+					</group>
                </search>
             </field>
         </record>
@@ -762,7 +762,7 @@
                         <filter string="By Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-					</group>  
+					</group>
                 </search>
             </field>
         </record>
@@ -782,7 +782,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>            
+            <field name="view_mode">tree,form</field>
         </record>
 
       <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index 306f9a29084..ac6b50711e6 100755
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -8,7 +8,7 @@
 <!--        id="menu_bi"-->
 <!--        icon="terp-account" parent="base.next_id_50"/>-->
 
-    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
     <menuitem
             id="base.next_id_50"
             name="Configuration"
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index f0afcd1aac1..c05df176d56 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -165,7 +165,7 @@
                 </tree>
             </field>
         </record>
-        <menuitem name="Point of Sale" id="menu_point_root" />
+        <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="New Sale" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
 		<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 215add767d2..283192b2162 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -4,7 +4,7 @@
         <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
-            groups="group_purchase_user"/>
+            groups="group_purchase_user" sequence="7"/>
 	   <menuitem id="menu_procurement_management" name="Procurement Management"
             parent="base.menu_purchase_root" sequence="1"/>
 
@@ -165,7 +165,7 @@
 					<filter string="By Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
 					<filter string="By State" icon="terp-purchase" domain="[]"  context="{'group_by':'state'}"/>
 					<filter string="By Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
-				</group>                   
+				</group>
               </search>
             </field>
         </record>
diff --git a/addons/resource/hr_view.xml b/addons/resource/hr_view.xml
index abf3c5f023f..c0fc3c54ffd 100755
--- a/addons/resource/hr_view.xml
+++ b/addons/resource/hr_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
         <menuitem
             id="menu_hr_reporting"
             name="Reporting"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 5892b78fe5b..783f9c28bf2 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
         <menuitem id="base.menu_pm_resources" name="Resources" parent="base.menu_main" sequence="2"/>
 
         <record id="resource_calendar_form" model="ir.ui.view">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e071ced7ae2..6aa2044ff2d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
    		<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
@@ -669,7 +669,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                   
+					</group>
               </search>
             </field>
         </record>
@@ -794,8 +794,8 @@
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="By Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="By Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>                        
-					</group>                  
+						<filter string="By Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+					</group>
               </search>
             </field>
         </record>
@@ -953,7 +953,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1113,7 +1113,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1166,7 +1166,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1285,7 +1285,7 @@
 						<filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Destion Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>                       
+					</group>
             	</search>
             </field>
         </record>
@@ -1409,7 +1409,7 @@
 						<filter string="By Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
 						<filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>                        
+					</group>
             	</search>
             </field>
         </record>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 0466d4501cf..67e641b54df 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
        <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 2188accd668..d2fa06d4fd5 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
         <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
         <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
         <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>

From 8b33e20c8a9d609ced4e21b2c5f43832d4808cde Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 8 Feb 2010 10:13:31 +0530
Subject: [PATCH 03/27] [IMP] Changed the sequence for the Tools menus

bzr revid: vir@tinyerp.com-20100208044331-2ltdza8onybywva1
---
 addons/idea/idea_view.xml                 | 2 +-
 addons/lunch/lunch_view.xml               | 2 +-
 addons/subscription/subscription_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 177792966d5..f80e7156f04 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="30"/>
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 2011586c9b6..449c0400905 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
         <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 67e641b54df..699896e3040 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
        <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->

From 070d0a433825000baf8a84c6c5cea0b5498eaee2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 11:00:00 +0530
Subject: [PATCH 04/27] [FIX]: crm: typo

lp bug: https://launchpad.net/bugs/518657 fixed

bzr revid: rpa@openerp.co.in-20100208053000-oadjf8w578f9nuev
---
 addons/crm/crm_opportunity_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index faf829e5e51..5cb39d37119 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -44,7 +44,7 @@
                     <field name="planned_revenue" required="1"/>
                     <field name="planned_cost"/>
                     <field name="probability"/>
-                    <field name="date_deadline" string="Excepted Close Date" required="1"/>
+                    <field name="date_deadline" string="Expected Close Date" required="1"/>
                     <group colspan="4" col="5">
                     <label string="" colspan="2"/>
                     <button string="Schedule Meeting"

From 8615415e4f751f3851b2966cc927d2cad3bfbaf5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 11:35:22 +0530
Subject: [PATCH 05/27] [FIX] base: missing import pkg

bzr revid: hmo@tinyerp.com-20100208060522-gk6f6pzrqnumttgr
---
 bin/addons/base/res/res_user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 83b0827a98e..b8c6ff54251 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -26,6 +26,7 @@ import pytz
 import pooler
 from tools.translate import _
 from service import security
+import netsvc
 
 class groups(osv.osv):
     _name = "res.groups"

From 93be43df7eadd33ac4c3c11ffbdf1cfd19642108 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 8 Feb 2010 11:36:10 +0530
Subject: [PATCH 06/27] [IMP]:printscreen reports now use the context to not
 display invisible columns

bzr revid: nch@tinyerp.com-20100208060610-h9bwn80541ic2m6x
---
 bin/report/printscreen/ps_list.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 78729a571d5..8582514b19f 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -32,14 +32,16 @@ from datetime import datetime
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
+        self.context = {}
 
     def _parse_node(self, root_node):
         result = []
         for node in root_node:
-            if node.tag == 'field':
-                result.append(node.get('name'))
-            else:
-                result.extend(self._parse_node(node))
+            if not eval(str(node.attrib.get('invisible',False)),{'context':self.context}):
+                if node.tag == 'field':
+                    result.append(node.get('name'))
+                else:
+                    result.extend(self._parse_node(node))
         return result
 
     def _parse_string(self, view):
@@ -52,6 +54,7 @@ class report_printscreen_list(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if not context:
             context={}
+        self.context = context
         pool = pooler.get_pool(cr.dbname)
         model = pool.get(datas['model'])
         model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
@@ -64,7 +67,6 @@ class report_printscreen_list(report_int):
 
         datas['ids'] = ids
         model = pooler.get_pool(cr.dbname).get(datas['model'])
-
         result = model.fields_view_get(cr, uid, view_type='tree', context=context)
         fields_order = self._parse_string(result['arch'])
         rows = model.read(cr, uid, datas['ids'], result['fields'].keys(), context)
@@ -180,7 +182,7 @@ class report_printscreen_list(report_int):
                     d1 = datetime.strptime(line[f], '%Y-%m-%d %H:%M:%S')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
-                    
+
                 col = etree.SubElement(node_line, 'col', para='yes', tree='no')
                 if line[f] != None:
                     col.text = tools.ustr(line[f] or '')

From f6af6edc3b738a5a5ab12c825a4ce22a017979b5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:02:25 +0530
Subject: [PATCH 07/27] [IMP] quality_integration_server: Improve create db
 command after remove base_setup wizard

bzr revid: hmo@tinyerp.com-20100208063225-vf92p12wlran6yej
---
 .../base_quality_interrogation.py             | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 96c04e72ca6..afb8ecd0def 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -174,28 +174,7 @@ def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
     if dbname in db_list:
         drop_db(uri, dbname)
     id = execute(conn,'create',admin_passwd, dbname, True, lang)
-    wait(id,uri)
-    uid = login_conn.login(dbname, user, pwd)
-
-    wiz_id = execute(wiz_conn,'create', dbname, uid, user, 'base_setup.base_setup')
-
-    state = 'init'
-    datas = {'form':{}}
-
-    while state!='config':
-        res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
-        if state=='init':
-            datas['form'].update( res['datas'] )
-        if res['type']=='form':
-            for field in res['fields'].keys():
-                datas['form'][field] = datas['form'].get(field,False)
-            state = res['state'][-1][0]
-            datas['form'].update({
-                'profile': -1
-            })
-        elif res['type']=='state':
-            state = res['state']
-    res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+    wait(id,uri)    
     install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd)
     return True
 

From f86e18f3fd76d60cc369e35b78f47f72f913a8c9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 12:25:26 +0530
Subject: [PATCH 08/27] [IMP] sale: add field in reporting and set default in
 search view

bzr revid: sbh@tinyerp.com-20100208065526-j30p0d711o1yuouo
---
 addons/sale/report_sale_view.xml | 20 +++++++++++---------
 addons/sale/sale_view.xml        |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml
index 6bb33ad754b..1dc69f63bd3 100644
--- a/addons/sale/report_sale_view.xml
+++ b/addons/sale/report_sale_view.xml
@@ -7,33 +7,34 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sale Orders">
-                	<field name="partner_id"/>
+                	<field name="partner_id" invisible="True"/>
                     <field name="date_order"/>
                     <field name="invoiced_rate"/>
                     <field name="picked_rate"/>
                     <field name="amount_untaxed"/>
                     <field name="amount_tax"/>
-                    <field name="amount_total"/>
+                    <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
         <record id="action_sale_order_report_all" model="ir.actions.act_window">
-            <field name="name">Sale Orders By Month </field>
+            <field name="name">Sale Orders By Customer </field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="context">{'report':True}</field>
+            <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
         </record>        
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim01">
+	    <record model="ir.actions.act_window.view" id="action_sale_order_01">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="sale.view_sale_order_report_tree"/>
 	        <field name="act_window_id" ref="action_sale_order_report_all"/>
 	    </record>        
-		<record model="ir.actions.act_window.view" id="action_order_product02">
+		<record model="ir.actions.act_window.view" id="action_sale_order_02">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="sale.view_sale_order_graph"/>
@@ -51,10 +52,11 @@
                     <field name="name"/>
                     <field name="order_id" invisible="True"/>
                     <field name="product_uom_qty" />
-                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
                     <field name="product_id"/>
                     <field name="price_unit" />
-                    <field name="discount"/>
+                    <field name="price_net"/>
                     <field name="price_subtotal" sum="Total"/>
                     <field name="state"/>
                 </tree>
@@ -77,7 +79,7 @@
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
 	    </record>   
 	    <record model="ir.actions.act_window.view" id="action_order_product02">
-	        <field name="sequence" eval="1"/>
+	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="sale.view_order_line_graph"/>
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
@@ -86,7 +88,7 @@
 	<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
     <menuitem action="action_sale_order_report_all" id="menu_report_sale_order_all" parent="base.next_id_64" sequence="3"/>
     
-    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="3"/>
+    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="4"/>
      
       </data>
     </openerp>    
\ No newline at end of file
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ec7d9d0a081..9eee62b95d7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,7 +244,7 @@
                         <field name="date_order" select="1"/>
 					</group>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Parnter" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+						<filter string="By Parnter" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
 					</group>                        
@@ -412,7 +412,7 @@
                             <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                         </field>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+						<filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
 					</group>                        

From e0bdc8480658370cd6a02e32330ffad135d70374 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:46:56 +0530
Subject: [PATCH 09/27] [FIX] project: when delegrated user close task, parent
 task should reopen if pending

bzr revid: hmo@tinyerp.com-20100208071656-o2omd39a55oycx8p
---
 addons/project/project.py              | 15 ++++++++-------
 addons/project/wizard/task_delegate.py |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 9625db08fc1..9cd0dc65647 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -371,13 +371,14 @@ class task(osv.osv):
                         'ref_doc2': 'project.project,%d'% (project.id,),
                     })
             self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
-            if task.parent_ids and task.parent_ids.state in ('pending','draft'):
-                reopen = True
-                for child in task.parent_ids.child_ids:
-                    if child.id != task.id and child.state not in ('done','cancelled'):
-                        reopen = False
-                if reopen:
-                    self.do_reopen(cr, uid, [task.parent_ids.id])
+            for parent_id in task.parent_ids:
+                if parent_id.state in ('pending','draft'):
+                    reopen = True
+                    for child in parent_id.child_ids:
+                        if child.id != task.id and child.state not in ('done','cancelled'):
+                            reopen = False
+                    if reopen:
+                        self.do_reopen(cr, uid, [parent_id.id])
         return True
 
     def do_reopen(self, cr, uid, ids, *args):
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 35fe2019ea6..7716b90929c 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -52,12 +52,12 @@ class wizard_delegate(wizard.interface):
         task_obj = pooler.get_pool(cr.dbname).get('project.task')
         task = task_obj.browse(cr, uid, data['id'], context)
         newname = data['form']['prefix'] or ''
-        task_obj.copy(cr, uid, data['id'], {
+        new_task_id = task_obj.copy(cr, uid, data['id'], {
             'name': data['form']['name'],
             'user_id': data['form']['user_id'],
             'planned_hours': data['form']['planned_hours'],
             'remaining_hours': data['form']['planned_hours'],
-            'parent_id': data['id'],
+            'parent_ids': [(6, 0, [data['id']])],
             'state': 'open',
             'description': data['form']['new_task_description'] or '',
             'child_ids': [],
@@ -65,7 +65,8 @@ class wizard_delegate(wizard.interface):
         })
         task_obj.write(cr, uid, [data['id']], {
             'remaining_hours': data['form']['planned_hours_me'],
-            'name': newname
+            'name': newname,
+            'child_ids': [(6, 0, [new_task_id])]
         })
         if data['form']['state']=='pending':
             task_obj.do_pending(cr, uid, [data['id']])

From b183ca84b9b53bb13a7cca35ac7063f836aac4c4 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:54:32 +0530
Subject: [PATCH 10/27] [IMP] crm: lead list view

bzr revid: hmo@tinyerp.com-20100208072432-7x484pqg86qn4yyt
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index ede549d7c9f..b865bb5a1d0 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -123,7 +123,7 @@
             <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">                
                 <field name="partner_name" string="Lead Name"/>
                 <field name="stage_id" string="Status"/>
-                <field name="create_date"/>
+                <field name="date" string="Create Date"/>
                 <field name="categ_id" string="Lead Source"/>
                 <field name="email_from" string="Email"/>
                 <field name="user_id"/>

From 4a02735efcf5a7cda425daaabeaeb0aeb01bc9e6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 14:14:04 +0530
Subject: [PATCH 11/27] [IMP]: crm: Improvement in views

bzr revid: rpa@openerp.co.in-20100208084404-xsxa7zo5cslmflx5
---
 addons/crm/crm_claims_view.xml      |  63 ++++++++++-------
 addons/crm/crm_fund_view.xml        |  33 +++++----
 addons/crm/crm_helpdesk_view.xml    |   5 +-
 addons/crm/crm_lead_view.xml        |  18 ++---
 addons/crm/crm_meeting_view.xml     |   6 +-
 addons/crm/crm_opportunity_view.xml |   4 +-
 addons/crm/crm_phonecall_view.xml   | 105 +++++++++++++++-------------
 addons/crm/crm_view.xml             |   4 +-
 8 files changed, 135 insertions(+), 103 deletions(-)

diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 86387ec015d..fecf8ae8ee3 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -50,37 +50,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Claims">
-                <group colspan="4" col="6">
+                <group colspan="4" col="4">
                     <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" string="Responsible" select="2"/>
-                    <newline/>
-                    <field name="section_id" widget="selection"/>
                     <field name="date" string="Date of Claim"/>
-                    <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                    </group>
+                    <field name="planned_cost" string="Claim Cost"/>
                 </group>
+                <group colspan="4" col="4">
                 <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="probability"/>
-                    <newline/>
-                    <field name="priority"/>
-                    <field name="type_id" string="Type of Action" select="1"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+                		<field name="partner_id" string="Partner"
+                        	on_change="onchange_partner_id(partner_id)" />
+	                    <field name="partner_address_id" string="Contact"
+	                    	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+	                    <field name="partner_phone"/>
+	                    <field name="partner_mobile"/>
+	                    <field name="email_from"/>
+	                </group>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" string="Responsible" select="2"/>
+                    	<field name="section_id" widget="selection"/>
+                    	<field name="probability"/>
+                    	<label string="Stage: " align="1.0"/>
+                    	<group colspan="1" col="2">
+	                        <field name="stage_id" select="1" nolabel="1"/>
+	                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+	                    </group>
+                    	<field name="categ_id" select="1" widget="selection"
+                    		on_change="onchange_categ_id(categ_id)"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="type_id" string="Type of Action" select="1"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="priority"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <group colspan="4" col="4">
+	                    <field name="ref"/>
+	                    <field name="ref2"/>
+                    </group>
                     <separator colspan="4" string="Claim/Action Description"/>
                     <field name="description" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string="Status"/>
+                    <separator colspan="4" string=""/>
                     <group col="8" colspan="4">
                         <field name="state" select="1"/>
                         <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -90,7 +102,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="canal_id"/>
@@ -139,6 +151,7 @@
                     <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
                  </page>
                 </notebook>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 077b45af6ff..b172add3df0 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -60,25 +60,32 @@
         <field name="arch" type="xml">
             <form string="Funds Form">
                 <group colspan="4" col="6">
-                    <field name="name" select="1" string="Name" colspan="2"/>
+                    <field name="name" select="1" string="Name" colspan="4"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <newline/>
-                    <field name="date" string="Next Meeting"/>
-                    <field name="duration"/>
-                    <field name="type_id" select="1" string="Payment Mode"/>
+                    <field name="type_id" string="Payment Mode" select="1" widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
-                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <newline/>
-                    <field name="email_from" colspan="2"/>
-                    <field name="user_id" select="2" string="Responsible"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+	                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+	                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+	                    <field name="email_from" colspan="2"/>
+                    </group>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" select="2" string="Responsible"/>
+                    	<field name="categ_id" select="1"
+                    		on_change="onchange_categ_id(categ_id)"  widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                    	<field name="date"/>
+	                    <field name="duration"/>
+                    </group>
                     <separator colspan="4" string="Description Information"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
@@ -92,7 +99,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="priority" string="Priority"/>
@@ -119,7 +126,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 71274822f9c..6773bb160c6 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -35,6 +35,7 @@
                 </group>
                 <notebook colspan="4">
                     <page string="General">
+                    	<separator colspan="4" string="Communication"/>
                         <group col="8" colspan="4">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
                             <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
@@ -58,7 +59,7 @@
                             <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="History">
+                    <page string="History" groups="base.group_extended">
                         <field name="id" select="1"/>
                         <field name="active" select="2"/>
                         <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
@@ -86,7 +87,7 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Emails">
+                    <page string="Emails" groups="base.group_extended">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="CC"/>
                        </group>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b865bb5a1d0..a8e8c2cd3bb 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <group colspan="4" col="4">
                     <notebook>
                     <page string="Leads">
-                        <separator colspan="4" string="Communication"/>                                                                        
+                        <separator colspan="4" string="Communication"/>
                         <field name="partner_id" string="Partner"
                         	on_change="onchange_partner_id(partner_id)" />
                         <field name="partner_address_id"
@@ -58,17 +58,17 @@
                         <group colspan="4" col="6">
                             <field name="user_id" select="2"/>                                                        
                             <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>                                
-                            <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                       
+                            <field name="categ_id" select="1"
+                            	on_change="onchange_categ_id(categ_id)"
+                            	string="Lead Source" widget="selection"
+                            	domain="[('object_id.model', '=', 'crm.opportunity')]" />
                             <field name="type_id" string="Campaign" select="1"/>
                             <field name="section_id" colspan="1" widget="selection"/>
                             <field name="priority" string="Priority"/>
-            
                             <field name="date" string="Create Date"/>
 	                    </group>
                         <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
-
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="2"/>
@@ -105,13 +105,13 @@
                                 <field name="date"/>
                             </tree>
                         </field>
-                        <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                        <button colspan="4" string="Send New Email"
+                        	name="%(crm.wizard_crm_new_send_mail)d"
+                        	context="{'mail':'new'}" icon="gtk-go-forward"
+                        	type="action" />
                      </page>
                     </notebook>
                     </group>
-
-                
-
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 07bdd9438cd..08f55ade474 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -115,8 +115,8 @@
             <tree string="Meetings Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id" widget="char"/>
                 <field name="name" string="Title"/>
-                <field name="date" string="Next Meeting"/>
-                <field name="section_id" widget="selection"/>
+                <field name="date" string="Meeting Date"/>
+                <field name="section_id" />
                 <field name="priority"/>
                 <field name="categ_id"/>
                 <field name="user_id"/>
@@ -162,7 +162,7 @@
             	<search string="Search Meetings">
                		<group col="12" colspan="4">
                			<filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
-	               		<filter icon="terp-crm" string="Draft" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
+	               		<filter icon="terp-crm" string="Current" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
 	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5cb39d37119..4916fbe174a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -91,7 +91,7 @@
                     </group>
                 </page>
 
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="active"/>
                     <field name="canal_id"/>
                     <field name="som"/>
@@ -116,7 +116,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f64cf5fda54..9ae2533c85c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -77,53 +77,64 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Phone Call">
-                <group colspan="4" col="4">
-                    <field name="name" string="Subject"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" string="Assigned to" select="2"/>
-                    <field name="date" string="Planned Date"/>
-                    <field name="duration"/>
-                    <field name="opportunity_id" on_change="onchange_case_id(case_id, name, partner_id)"
-                    context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
-                           'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
-	                          'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
-					<newline/>
-					<group col="5" colspan="4">
-						<label string="" colspan="2"/>
-						<button string="Schedule a Meeting"
-	                        name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo" type="action" />
-	                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                	</group>
-                <notebook colspan="4">
-                <page string="General">
-                    <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1" readonly="1"/>
-                    <field name="active" string="Reminder"/>
-                    <group colspan="2" col="3">
-                        <field name="partner_id" string="Partner"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />
-                    </group>
-                    <field name="partner_address_id" string="Contact"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <newline/>
-                    <field name="som"/>
-                    <field name="priority" string="Relevant"/>
-                    <separator string= "Description" colspan="4"/>
-                    <field name="description" 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" icon="gtk-cancel"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
-                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-                    </group>
-                </page>
-               </notebook>
-               </group>
-           </form>
+        	<form string="Phone Call">
+        		<group colspan="4" col="4">
+        			<field name="name" string="Subject" />
+        			<field name="date" string="Planned Date" />
+        			<field name="partner_phone" />
+        			<field name="duration" />
+        			<newline />
+        			<group col="7" colspan="4">
+        				<label string="" colspan="2" />
+        				<button string="Schedule a Meeting"
+        					name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo"
+        					type="action" />
+        				<button string="Convert to Opportunity"
+        					name="%(wizard_crm_phonecall_opportunity_set)d"
+        					icon="gtk-index" type="action"
+        					attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+        				<button string="Convert to Partner"
+        					icon="terp-crm"
+        					name="%(wizard_crm_phonecall_partner_create)d"
+        					type="action"
+        					attrs="{'invisible':[('partner_id','!=',False)]}" />
+        			</group>
+        			<group colspan="4" col="4">
+        				<notebook colspan="4">
+        					<page string="General">
+        						<separator colspan="4" string="Communication" />
+        						<field name="partner_id" />
+        						<field name="partner_address_id" string="Contact" />
+        						<field name="partner_mobile" />
+        						<separator colspan="4" string="Status and Categarization" />
+        						<group colspan="4" col="6">
+	        						<field name="user_id" string="Assigned to" select="2" />
+	        						<field name="section_id" colspan="1" widget="selection" />
+	        						<field name="opportunity_id"
+	        							on_change="onchange_case_id(case_id, name, partner_id)"
+	        							context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
+                           					'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
+	                          				'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}" />
+	        						<field name="som" />
+	        						<field name="priority" />
+	        						<field name="active" string="Reminder" />
+	        					</group>
+	        					<separator string="Description" colspan="4" />
+	        					<field name="description" 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" icon="gtk-cancel"/>
+			                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+			                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
+			                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+			                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+        						</group>
+        					</page>
+        				</notebook>
+        			</group>
+        		</group>
+        	</form>
         </field>
     </record>
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index fe29f3125d8..9996ed372ad 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -372,7 +372,7 @@
                                 <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="History">
+                        <page string="History" groups="base.group_extended">
                             <field name="id" select="1"/>
                             <field name="active" select="2"/>
                             <separator colspan="4" string="Dates"/>
@@ -390,7 +390,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Emails">
+                        <page string="Emails" groups="base.group_extended">
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>

From a783606193b715ba65442f738703d3f0b03cb166 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 14:35:03 +0530
Subject: [PATCH 12/27] [IMP] caldav: invite attendee with delegration

bzr revid: hmo@tinyerp.com-20100208090503-hct2lgekj5cofunm
---
 addons/caldav/caldav.py         | 253 +++++++++++++++++---------------
 addons/caldav/caldav_view.xml   |   6 +-
 addons/crm/crm_meeting_view.xml |   2 +-
 3 files changed, 141 insertions(+), 120 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index d440902f9e2..96c2179dc50 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -172,6 +172,96 @@ html_invitation = """
 </html>
 """
 
+class invite_attendee_wizard(osv.osv_memory):
+    _name = "caldav.invite.attendee"
+    _description = "Invite Attendees"
+
+    _columns = {
+        'type': fields.selection([('internal', 'Internal User'), \
+              ('external', 'External Email'), \
+              ('partner', 'Partner Contacts')], 'Type', required=True), 
+        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
+                                  'invite_id', 'user_id', 'Users'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'email': fields.char('Email', size=124), 
+        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
+                                  'invite_id', 'contact_id', 'Contacts'), 
+              }
+
+    
+
+    def do_invite(self, cr, uid, ids, context={}):            
+        datas = self.read(cr, uid, ids)[0]
+        model = False
+        model_field = False
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        model_field = context.get('attendee_field', False)
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context['active_id'])
+        type = datas.get('type')
+        att_obj = self.pool.get('calendar.attendee')
+        vals = {}
+        mail_to = []
+        if not model == 'calendar.attendee':
+            vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
+
+        if type == 'internal':
+            user_obj = self.pool.get('res.users')
+            for user_id in datas.get('user_ids', []):
+                user = user_obj.browse(cr, uid, user_id)
+                if not user.address_id.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("User does not have an email Address"))
+                vals.update({'user_id': user_id, 
+                                     'email': user.address_id.email})
+                mail_to.append(user.address_id.email)
+                
+        elif  type == 'external' and datas.get('email'):
+            vals.update({'email': datas['email']})
+            mail_to.append(datas['email'])
+        elif  type == 'partner':
+            add_obj = self.pool.get('res.partner.address')
+            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
+                if not contact.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("Partner does not have an email Address"))
+                vals.update({
+                             'partner_address_id': contact.id, 
+                             'email': contact.email})
+                mail_to.append(contact.email)
+
+        if model == 'calendar.attendee':
+            att = att_obj.browse(cr, uid, context['active_id'])
+            vals.update({
+                'parent_ids' : [(4, att.id)],
+                'ref': att.ref
+            })
+        att_id = att_obj.create(cr, uid, vals)
+        if model_field:
+            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
+
+        att_obj._send_mail(cr, uid, [att_id], mail_to, email_from=tools.config.get('email_from', False))
+                
+        return {}
+
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
+        if not partner_id:
+            return {'value': {'contact_ids': []}}
+        cr.execute('select id from res_partner_address \
+                         where partner_id=%s' % (partner_id))
+        contacts = map(lambda x: x[0], cr.fetchall())
+        if not contacts:
+            raise osv.except_osv(_('Error!'), \
+                                ("Partner does not have any Contacts"))
+
+        return {'value': {'contact_ids': contacts}}
+
+invite_attendee_wizard()
+
 class calendar_attendee(osv.osv):
     _name = 'calendar.attendee'
     _description = 'Attendee information'
@@ -206,10 +296,14 @@ class calendar_attendee(osv.osv):
                 else:
                     result[id][name] = self._get_address(None, attdata.email)
             if name == 'delegated_to':
-                todata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_to_user_ids)
+                todata = []
+                for parent in attdata.parent_ids:
+                    todata.append('MAILTO:' + parent.email)
                 result[id][name] = ', '.join(todata)
             if name == 'delegated_from':
-                fromdata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_from_user_ids)
+                fromdata = []
+                for child in attdata.child_ids:
+                    fromdata.append('MAILTO:' + child.email)
                 result[id][name] = ', '.join(fromdata)
             if name == 'event_date':
                 if attdata.ref:
@@ -277,13 +371,11 @@ class calendar_attendee(osv.osv):
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"), 
-        'del_to_user_ids': fields.many2many('calendar.attendee', 'att_del_to_user_rel', 
-                                  'attendee_id', 'user_id', 'Users'), 
+request was delegated to"),         
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
-        'del_from_user_ids': fields.many2many('calendar.attendee', 'att_del_from_user_rel', \
-                                      'attendee_id', 'user_id', 'Users'), 
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated To'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated From'),  
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
@@ -326,6 +418,43 @@ request was delegated to"),
                 self.write(cr, uid, ids, {'state': status})
         return True
 
+    def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
+        for att in self.browse(cr, uid, ids, context=context):
+            sign = att.sent_by_uid and att.sent_by_uid.signature or ''
+            sign = '<br>'.join(sign and sign.split('\n') or [])
+            model, res_id = tuple(att.ref.split(','))            
+            res_obj = self.pool.get(model).browse(cr, uid, res_id)
+            if res_obj and len(res_obj):
+                res_obj = res_obj[0]
+            sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
+            att_infos = []
+            other_invitaion_ids = self.search(cr, uid, [('ref','=',att.ref)])
+            for att2 in self.browse(cr, uid, other_invitaion_ids):
+                att_infos.append(((att2.user_id and att2.user_id.name) or \
+                             (att2.partner_id and att2.partner_id.name) or \
+                                att2.email) +  ' - Status: ' + att2.state.title())
+            body_vals = {'name': res_obj.name, 
+                        'start_date': res_obj.date, 
+                        'end_date': res_obj.date_deadline or None, 
+                        'description': res_obj.description or '-', 
+                        'location': res_obj.location or '-', 
+                        'attendees': '<br>'.join(att_infos), 
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
+                        'sign': sign, 
+                        'company': company
+            }
+            body = html_invitation % body_vals
+            if mail_to and email_from:
+                tools.email_send(
+                        email_from, 
+                        mail_to, 
+                        sub, 
+                        body, 
+                        subtype='html', 
+                        reply_to=email_from
+                    ) 
+            return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         if not user_id:
             return {'value': {'email': ''}}
@@ -1140,112 +1269,4 @@ class res_users(osv.osv):
                     string='Free/Busy', method=True), 
     }
 res_users()
-
-class invite_attendee_wizard(osv.osv_memory):
-    _name = "caldav.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True), 
-        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
-                                  'invite_id', 'user_id', 'Users'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'email': fields.char('Email', size=124), 
-        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
-                                  'invite_id', 'contact_id', 'Contacts'), 
-              }
-
-    def do_invite(self, cr, uid, ids, context={}):
-        model2field = {
-                       'calendar.attendee': 'del_to_user_ids', 
-                       'crm.meeting': 'attendee_ids'}
-        datas = self.read(cr, uid, ids)[0]
-        if not context or not context.get('model'):
-            return {}
-        else:
-            model = context.get('model')
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context['active_id'])
-        type = datas.get('type')
-        att_obj = self.pool.get('calendar.attendee')
-        vals = {}
-        if not model == 'calendar.attendee':
-            vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
-        if type == 'internal':
-            user_obj = self.pool.get('res.users')
-            for user_id in datas.get('user_ids', []):
-                user = user_obj.browse(cr, uid, user_id)
-                if not user.address_id.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("User does not have an email Address"))
-                vals.update({'user_id': user_id, 
-                                     'email': user.address_id.email})
-                att_id = att_obj.create(cr, uid, vals)
-                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-
-        elif  type == 'external' and datas.get('email'):
-            vals.update({'email': datas['email']})
-            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
-            att_infos = []
-            for att in res_obj.attendee_ids:
-                att_infos.append(((att.user_id and att.user_id.name) or \
-                             (att.partner_id and att.partner_id.name) or \
-                                att.email) +  ' - Status: ' + att.state.title())
-            att_id = att_obj.create(cr, uid, vals)
-            obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-            sign = res_obj.user_id and res_obj.user_id.signature or ''
-            sign = '<br>'.join(sign and sign.split('\n') or [])
-            sub = '[%s Invitation][%d] %s'  % (company, att_id, res_obj.name)
-            body_vals = {'name': res_obj.name, 
-                        'start_date': res_obj.date, 
-                        'end_date': res_obj.date_deadline or None, 
-                        'description': res_obj.description or '-', 
-                        'location': res_obj.location or '-', 
-                        'attendees': '<br>'.join(att_infos), 
-                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
-                        'sign': sign, 
-                        'company': company
-            }
-            body = html_invitation % body_vals
-            mail_to = [datas['email']]
-            tools.email_send(
-                    tools.config.get('email_from', False), 
-                    mail_to, 
-                    sub, 
-                    body, 
-                    subtype='html', 
-                    reply_to=tools.config.get('email_from', False)
-                )
-
-        elif  type == 'partner':
-            add_obj = self.pool.get('res.partner.address')
-            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                if not contact.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("Partner does not have an email Address"))
-                vals.update({
-                             'partner_address_id': contact.id, 
-                             'email': contact.email})
-                att_id = att_obj.create(cr, uid, vals)
-                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-        return {}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('select id from res_partner_address \
-                         where partner_id=%s' % (partner_id))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        if not contacts:
-            raise osv.except_osv(_('Error!'), \
-                                ("Partner does not have any Contacts"))
-
-        return {'value': {'contact_ids': contacts}}
-
-invite_attendee_wizard()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 2d3a59892c7..a21d6a0366b 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -85,10 +85,10 @@
             			</page>
             			<page string="Delegation Info">
             				<separator string="Delegated to" colspan="4" />
-            				<field name="del_to_user_ids" nolabel="1"
+            				<field name="parent_ids" nolabel="1"
             					colspan="4" readonly="1" />
             				<separator string="Delegated from" colspan="4" />
-            				<field name="del_from_user_ids" nolabel="1"
+            				<field name="child_ids" nolabel="1"
             					colspan="4" readonly="1" />
             			</page>
             		</notebook>
@@ -105,7 +105,7 @@
 	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
 	                        	string="Delegate" type="action"
 	                        	icon="gtk-sort-descending"
-	                        	context="{'model' : 'calendar.attendee', 'state' : 'delegated'}" />
+	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
             		</group>
             	</form>
             </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 08f55ade474..76e462cffc7 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -58,7 +58,7 @@
             			<button string="Invite People"
             				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
             				icon="terp-partner" type="action"
-            				context="{'model' : 'crm.meeting'}" colspan="2"/>
+            				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
             			<field name="attendee_ids" colspan="4"
             				nolabel="1" widget="one2many" mode="tree,form">
             				<tree string="Atendee details" editable="top">

From 1a823ab32da5763a5df3467de16dcabb72aa1fa2 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 14:51:58 +0530
Subject: [PATCH 13/27] [IMP] crm: fundrising and helpdisk support view

bzr revid: hmo@tinyerp.com-20100208092158-1pfuuevh6olss9tx
---
 addons/crm/crm_fund_view.xml     | 10 +++++-----
 addons/crm/crm_helpdesk_view.xml | 27 +++++++++++++++------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index b172add3df0..7260ed1e513 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -59,9 +59,8 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Funds Form">
-                <group colspan="4" col="6">
-                    <field name="name" select="1" string="Name" colspan="4"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
+                <group colspan="4" col="4">
+                    <field name="name" select="1" string="Name"/>                    
                     <field name="type_id" string="Payment Mode" select="1" widget="selection"
                     		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
@@ -77,16 +76,17 @@
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
-                    <separator colspan="4" string="Status and Categarization"/>
+                    <separator colspan="4" string="Categarization"/>
                     <group colspan="4" col="6">
                     	<field name="user_id" select="2" string="Responsible"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
                     	<field name="categ_id" select="1"
                     		on_change="onchange_categ_id(categ_id)"  widget="selection"
                     		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                     	<field name="date"/>
 	                    <field name="duration"/>
                     </group>
-                    <separator colspan="4" string="Description Information"/>
+                    <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 6773bb160c6..9c9045c5f87 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -25,28 +25,31 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Helpdesk Support">
-                <group colspan="4" col="7">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="section_id" widget="selection"/>
-					<newline/>
+                <group colspan="4" col="4">
+                    <field colspan="4" name="name" select="1"/>                    					
                     <field name="date" select="1"/>
-                    <field name="date_deadline" select="2"/>
-                    <field name="priority"/>
+                    <field name="date_deadline" select="2"/>                    
                 </group>
                 <notebook colspan="4">
                     <page string="General">
                     	<separator colspan="4" string="Communication"/>
-                        <group col="8" colspan="4">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
-                            <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
-                            <newline/>
-                            <field colspan="3" name="email_from" select="2"/>
+                        <group col="7" colspan="4">
+                            <field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
+                            <field  name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
+                            
+                            <field  name="email_from" select="2"/>
                             <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                            
+                        </group>
+                        <separator colspan="4" string="Categarization"/>
+                        <group col="7" colspan="4">
+                            <field name="priority"/>
+                            <field name="section_id" widget="selection"/>
                             <field name="user_id" select="1"/>
                             <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
                         </group>
 
-                        <separator colspan="4" string="Description"/>
+                        <separator colspan="4" string="Details"/>
                         <field name="description" colspan="4" nolabel="1"/>
                         <separator colspan="4"/>
                         <group col="8" colspan="4">

From 9165d7aa7029eb6b10e2871902841d27b9d981c5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 15:05:14 +0530
Subject: [PATCH 14/27] [IMP] mail_gate: improve view of mail_gate history

bzr revid: hmo@tinyerp.com-20100208093514-r7zajo46by9qfksj
---
 addons/mail_gateway/mail_gateway.py       | 1 +
 addons/mail_gateway/mail_gateway_view.xml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 314168c4b03..c047c3840b4 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -388,6 +388,7 @@ class mail_gateway_history(osv.osv):
         'name': fields.char('Message Id', size=64, help="Message Id in Email Server."),
         'res_id': fields.integer("Resource ID"),        
         'gateway_id': fields.many2one('mail.gateway',"Mail Gateway", required=True),
+        'model_id':fields.related('gateway_id', 'object_id', type='many2one', relation='ir.model', string='Model'), 
         'note': fields.text('Notes'),
     }
     _order = 'id desc'
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 465eea92b44..fa4f1146311 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,6 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Gateway History">
                     <field name="name"/>
+                    <field name="gateway_id"/>
+                    <field name="model_id"/>
                     <field name="res_id"/>
                     <separator string="Note" colspan="4"/>
                     <field name="note" nolabel="1" colspan="4"/>
@@ -22,6 +24,7 @@
             <field name="arch" type="xml">
                 <tree string="Gateway History">
                     <field name="name" select="1"/>
+                    <field name="model_id"/>
                     <field name="res_id"/>
                     <field name="gateway_id"/>
                 </tree>

From e6213959fa6f143c0192061fd50423a2a640de2c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 15:27:04 +0530
Subject: [PATCH 15/27] [IMP]: caldav: Improvement in Invite Attendee

bzr revid: rpa@openerp.co.in-20100208095704-zvgmjs8pnkw6zyix
---
 addons/caldav/caldav.py       | 19 +++++++++++--------
 addons/caldav/caldav_view.xml | 13 +++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 96c2179dc50..05e108cf4e5 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -186,10 +186,10 @@ class invite_attendee_wizard(osv.osv_memory):
         'email': fields.char('Email', size=124), 
         'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
                                   'invite_id', 'contact_id', 'Contacts'), 
+        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
+ to send an Email to Invited Person')
               }
 
-    
-
     def do_invite(self, cr, uid, ids, context={}):            
         datas = self.read(cr, uid, ids)[0]
         model = False
@@ -241,9 +241,12 @@ class invite_attendee_wizard(osv.osv_memory):
             })
         att_id = att_obj.create(cr, uid, vals)
         if model_field:
-            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
-
-        att_obj._send_mail(cr, uid, [att_id], mail_to, email_from=tools.config.get('email_from', False))
+            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)], 
+                                            'state': 'delegated'})
+        
+        if datas.get('send_mail'):
+            att_obj._send_mail(cr, uid, [att_id], mail_to, \
+                   email_from=tools.config.get('email_from', False))
                 
         return {}
 
@@ -374,8 +377,8 @@ class calendar_attendee(osv.osv):
 request was delegated to"),         
         'delegated_from': fields.function(_compute_data, method=True, string=\
             'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated To'),
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated From'),  
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'),  
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
@@ -394,7 +397,7 @@ request was delegated to"),
         'state':  lambda *x: 'needs-action', 
     }
     
-    response_re = response_re = re.compile("Are you coming\?.*(YES|NO|MAYBE).*", re.UNICODE)
+    response_re = response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
     
     def msg_new(self, cr, uid, msg):        
         return False
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index a21d6a0366b..32038d3e3ee 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -11,6 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Invite People">
                 	<field name="type" />
+                	<field name="send_mail" />
                 	<newline/>
                 	<group col="1" colspan="4"
                 		attrs="{'invisible': [('type', '!=', 'external')]}">
@@ -84,27 +85,27 @@
             				<field name="ref" colspan="4" readonly="1"/>
             			</page>
             			<page string="Delegation Info">
-            				<separator string="Delegated to" colspan="4" />
+            				<separator string="Delegated From" colspan="4" />
             				<field name="parent_ids" nolabel="1"
             					colspan="4" readonly="1" />
-            				<separator string="Delegated from" colspan="4" />
+            				<separator string="Delegated To" colspan="4" />
             				<field name="child_ids" nolabel="1"
             					colspan="4" readonly="1" />
             			</page>
             		</notebook>
             		<group col="6" colspan="4">
 	                        <field name="state" select="2" />
-	                        <button name="do_tentative"
+	                        <button name="do_tentative" states="needs-action,declined,accepted"
 	                        	string="Uncertain" type="object"
 	                        	icon="terp-crm" />
-	                        <button name="do_accept" string="Accept"
+	                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined"
 	                        	type="object" icon="gtk-apply" />
-	                        <button name="do_decline" string="Decline"
+	                        <button name="do_decline" string="Decline"  states="needs-action,tentative,accepted"
 	                        	type="object" icon="gtk-cancel" />
 	                        <button
 	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
 	                        	string="Delegate" type="action"
-	                        	icon="gtk-sort-descending"
+	                        	icon="gtk-sort-descending" states="needs-action,tentative,declined,accepted"
 	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
             		</group>
             	</form>

From e2203a41c0dc0a9563643ed0432ccd54f7912a30 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 15:34:34 +0530
Subject: [PATCH 16/27] [IMP]:survey:Improved.(small changes).

bzr revid: apa@tinyerp.com-20100208100434-lwxit6u5h1gihmm2
---
 addons/survey/report/survey_browse_response.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 7192a6faeb3..986fb0ccb2f 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -158,7 +158,7 @@ class survey_browse_response(report_rml):
                               <para style="terp_tblheader_General_Centre">Response Create Date </para>
                             </td>
                             <td>
-                              <para style="terp_tblheader_General_Centre">Respose By </para>
+                              <para style="terp_tblheader_General_Centre">Response By </para>
                             </td>
                             <td>
                               <para style="terp_tblheader_General_Centre">Status</para>
@@ -243,17 +243,17 @@ class survey_browse_response(report_rml):
                                 ans_list = []
                                 for ans in answer[0].response_answer_ids:
                                     ans_list.append(to_xml(tools.ustr(ans.answer_id.answer)))
-                        
+
                                 answer_choice=[]
                                 _divide_columns_for_matrix = 20
                                 _display_ans_in_rows = 5
                                 _tbl_widths = 500
                                 for ans in que['answer_choice_ids']:
                                     answer_choice.append(to_xml(tools.ustr((ans.answer))))
-        
+
                                 def divide_list(lst, n):
                                     return [lst[i::n] for i in range(n)]
-        
+
                                 divide_list = divide_list(answer_choice,_display_ans_in_rows)
                                 for lst in divide_list:
                                     if que.type == 'multiple_choice_multiple_ans':

From 6012e8fb7051dc5465bf7019e491d6fd31b7353e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 15:38:53 +0530
Subject: [PATCH 17/27] [IMP] sale: change the name of filter string in serach
 view

bzr revid: sbh@tinyerp.com-20100208100853-2adsv054n1sp2aso
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9eee62b95d7..272117a132b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,7 +244,7 @@
                         <field name="date_order" select="1"/>
 					</group>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Parnter" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
+						<filter string="By Customer" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
 					</group>                        
@@ -414,7 +414,7 @@
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
 						<filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="By Scheduled" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
 					</group>                        
                         
                     </group>

From 10be0d9f33c6a09169b741a437b20b523dcfa721 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 16:00:26 +0530
Subject: [PATCH 18/27] [Fix] sale_crm: change the name of model_id

bzr revid: sbh@tinyerp.com-20100208103026-8f8268mr7b6qcv45
---
 addons/sale_crm/process/sale_crm_process.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index e3a81b3cd7e..1b469b32d46 100755
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -30,7 +30,7 @@
 
         <record id="process_node_contractanalytic0" model="process.node">
             <field name="menu_id" ref="account.account_analytic_def_account"/>
-            <field name="model_id" ref="account.model_account_analytic_account"/>
+            <field name="model_id" ref="analytic.model_account_analytic_account"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Analytic account&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Reflect the contract made with customer&quot;&quot;&quot;" name="note"/>

From 94b515475e1ffe9db0af3b395b0c801b45982bf7 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 16:06:04 +0530
Subject: [PATCH 19/27] [IMP] crm: meeting view

bzr revid: hmo@tinyerp.com-20100208103604-f64f42x8ut4madbt
---
 addons/crm/crm_meeting_view.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 76e462cffc7..7df73a7210b 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,19 +24,17 @@
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Meetings Form">
-            	<group col="4" colspan="6">
-            		<field name="name" select="1" string="Summary"
-            			colspan="3" />
-            		<field name="section_id" widget="selection"
-            			colspan="1" />
-            	</group>
-            	<group col="6" colspan="6">
+            <form string="Meetings Form">            	
+            	<group col="6" colspan="4">
+                    <field name="name" select="1" string="Summary"
+            			colspan="4" />
+                    <field name="location" />
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
-            		<field name="location" />
+            		
             		<field name="categ_id"/>
+                    <field name="alarm_id" string="Reminder" widget="selection" />
             		<group colspan="2" col="3" attrs="{'readonly':[('recurrent_uid','!=',False)]}">
                             <field name="rrule_type" string="Recurrency"
                             	on_change="onchange_rrule_type(rrule_type)"
@@ -87,10 +85,11 @@
             		</page>
             		<page string="Other Information">
             			<field name="priority"/>
-            			<field name="show_as"/>
-            			<field name="alarm_id" string="Reminder" widget="selection" />
+            			<field name="show_as"/>            			
             			<field name="class"/>
             			<field name="user_id"/>
+                        <field name="section_id" widget="selection"
+            			/>
             			<field name="vtimezone"/>
             			<field name="recurrent_id" invisible="1" />
             			<field name="recurrent_uid" invisible="1" />

From a59e83e73e9926ffdc78e92ac5813b172e93d280 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 16:43:06 +0530
Subject: [PATCH 20/27] [IMP]: caldav: Changed timezone on Changing user

bzr revid: rpa@openerp.co.in-20100208111306-pf9gvg1pd41ed2fo
---
 addons/caldav/caldav.py         | 14 ++++++++++++--
 addons/crm/crm_meeting_view.xml |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 05e108cf4e5..f8c30e10478 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -190,7 +190,7 @@ class invite_attendee_wizard(osv.osv_memory):
  to send an Email to Invited Person')
               }
 
-    def do_invite(self, cr, uid, ids, context={}):            
+    def do_invite(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
         model = False
         model_field = False
@@ -386,7 +386,7 @@ request was delegated to"),
         'language':  fields.function(_compute_data, method=True, string='Language', type="selection", selection=_lang_get, multi='language', store=True, help="To specify the language for text values in a property or property parameter."), 
         'user_id': fields.many2one('res.users', 'User'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
-        'partner_id':fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
+        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
         'email': fields.char('Email', size=124, required=True), 
         'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
         'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
@@ -753,6 +753,16 @@ rule or repeating pattern for anexception to a recurrence set"),
          'class': lambda *a: 'public', 
          'show_as': lambda *a: 'busy', 
     }
+    
+    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
+        if not user_id:
+            return {'value': {'vtimezone': ''}}
+        value = {}
+        cr.execute('select context_tz from res_users where id=%s' % (user_id))
+        timezone = cr.fetchone()
+        if timezone:
+            value.update({'vtimezone': timezone[0].lower()})
+        return {'value': value}
 
     def export_cal(self, cr, uid, ids, context={}):
         ids = map(lambda x: caldav_id2real_id(x), ids)
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 7df73a7210b..78a0fc6e776 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -87,7 +87,7 @@
             			<field name="priority"/>
             			<field name="show_as"/>            			
             			<field name="class"/>
-            			<field name="user_id"/>
+            			<field name="user_id" on_change="onchange_user_id(user_id)"/>
                         <field name="section_id" widget="selection"
             			/>
             			<field name="vtimezone"/>

From 7cee90359f08a2b59ba0b1f1233903b0e9efde52 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 16:49:05 +0530
Subject: [PATCH 21/27] [IMP] crm: lead+Opp

bzr revid: hmo@tinyerp.com-20100208111905-i0m9e2dxl99218so
---
 addons/crm/crm_lead_view.xml        |  7 +++++++
 addons/crm/crm_opportunity_view.xml | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a8e8c2cd3bb..856e1098c96 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -187,6 +187,13 @@
                            />
 					</field>
                </group>
+               <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
+                        <filter string="By Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
+                        <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="By Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
+                        
+                </group> 
            </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4916fbe174a..64b3d430d31 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -158,8 +158,8 @@
                 <field name="name" string="Opportunities"/>
                 <field name="stage_id"  string="Sales Stage"/>
                 <field name="partner_id" string="Partner"/>
-                <field name="planned_revenue"/>
-                <field name="probability"/>
+                <field name="planned_revenue" sum="Total of Planned Revenue"/>
+                <field name="probability" avg="Avg. of Probability"/>
                 <field name="date_deadline" string="Excepted Close Date"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -219,6 +219,12 @@
                                help="My section"/>
 			   		</field>
                </group>
+                <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
+                        <filter string="By Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
+                        <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        
+                </group>
            </search>
         </field>
     </record>

From 1413af2e652c93c72fa87d7fa088c528f9751afd Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 17:01:50 +0530
Subject: [PATCH 22/27] [IMP]:survey -improved the note in the survey form
 report. -improved the demo data of communit survey.

bzr revid: apa@tinyerp.com-20100208113150-4oqukenloo7uyra5
---
 addons/survey/report/survey_form.py |  7 +++++++
 addons/survey/survey_demo.xml       | 11 +----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 84d6de286fb..c273b7726de 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -144,6 +144,13 @@ class survey_form(report_rml):
                 <blockTable colWidths='"""+_tbl_widths+"""' style="title_tbl">
                     <tr><td><para style="title">""" + to_xml(tools.ustr(survey.title)) + """</para><para style="P2"><font></font></para></td></tr>
                 </blockTable>"""
+
+            if survey.note:
+                rml += """
+                <para style="P2"></para>
+                    <blockTable colWidths='"""+_tbl_widths+"""' style="note_table">
+                        <tr><td><para style="descriptive_text">""" + to_xml(tools.ustr(survey.note)) + """</para><para style="P2"><font></font></para></td></tr>
+                    </blockTable>"""
             seq = 0
             for page in survey.page_ids:
                 seq+=1
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 38784e23ce5..a65abbc9e96 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -2137,6 +2137,7 @@
 	<data noupdate="1">
 		<record id="survey_0_Community" model="survey">
 			<field name="title">Community Survey</field>
+			<field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
 			<field eval="1" name="response_user"/>
 			<field name="state">draft</field>
 			<field name="responsible_id" ref="base.user_root"/>
@@ -2146,7 +2147,6 @@
 	</data>
 	<data>
 		<record id="survey_page_0_Community" model="survey.page">
-			<field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
 			<field name="title">Service Characteristics</field>
 			<field name="survey_id" ref="survey_0_Community"/>
 			<field eval="1" name="sequence"/>
@@ -2805,13 +2805,4 @@
 			<field eval="8" name="sequence"/>
 		</record>
 	</data>
-
-
-
-
-
-
-
-
-
 </openerp>
\ No newline at end of file

From ab2924168e2e3e5443d604c0c406a96a4d497022 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 17:47:32 +0530
Subject: [PATCH 23/27] [IMP]:hr_evaluation -Improved demo data of Evaluation
 Form and Opinion.

bzr revid: apa@tinyerp.com-20100208121732-5sjmpz3jai2fghes
---
 addons/hr_evaluation/hr_evaluation_data.xml | 52 ++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index fdd66ca403c..cfa008964df 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -2,28 +2,28 @@
 <openerp>
 	<data>
 		<record id="survey_2" model="survey">
-			<field name="title">EMPLOYEE EVALUATION</field>
+			<field name="title">Employee Evaluation</field>
 			<field name="max_response_limit">20</field>
 			<field eval="[(6,0,[])]" name="users"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_3" model="survey">
-			<field name="title">EMPLOYEE OPINION</field>
+			<field name="title">Employee Opinion</field>
 			<field name="max_response_limit">20</field>
 			<field eval="[(6,0,[])]" name="users"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_page_1" model="survey.page">
-			<field name="title">EMPLOYEE EVALUATION FORM</field>
+			<field name="title">Employee Evaluation Form</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="1" name="sequence"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_page_2" model="survey.page">
-			<field name="title">PROCESS</field>
+			<field name="title">Process</field>
 			<field name="survey_id" ref="survey_3"/>
 			<field eval="1" name="sequence"/>
 		</record>
@@ -31,14 +31,14 @@
 
 	<data>
 		<record id="survey_page_5" model="survey.page">
-			<field name="title">WORK PLAN</field>
+			<field name="title">Work Plan</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="2" name="sequence"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_page_6" model="survey.page">
-			<field name="title">EMPLOYEE PERFORMANCE IN KEY AREAS</field>
+			<field name="title">Employee Performance In Key Areas</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="3" name="sequence"/>
 			<field name="note">The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below :
@@ -52,7 +52,7 @@
 
 	<data>
 		<record id="survey_page_16" model="survey.page">
-			<field name="title">PROFESSIONAL DEVELOPMENT AND PERFORMANCE PLAN (optional)</field>
+			<field name="title">Professional Development And Performance Plan (optional)</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="4" name="sequence"/>
 			<field name="note">Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. </field>
@@ -61,7 +61,7 @@
 
 	<data>
 		<record id="survey_page_26" model="survey.page">
-			<field name="title">EMPLOYEE COMMENTS</field>
+			<field name="title">Employee Comments</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="5" name="sequence"/>
 		</record>
@@ -69,7 +69,7 @@
 
 	<data>
 		<record id="survey_page_10" model="survey.page">
-			<field name="title">SURVEY</field>
+			<field name="title">Survey</field>
 			<field name="survey_id" ref="survey_3"/>
 			<field eval="5" name="sequence"/>
 		</record>
@@ -138,7 +138,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="1" name="sequence"/>
-			<field name="question">ENGAGEMENT</field>
+			<field name="question">Engagement</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -162,10 +162,10 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="1" name="sequence"/>
-			<field name="question">SUBJECT</field>
+			<field name="question">Subject</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field name="column_name">RECOMMENDATIONS / EVALUATIONS</field>
+			<field name="column_name">Recommendations / Evaluations</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
 			<field eval="0" name="make_comment_field"/>
 			<field eval="0" name="in_visible_menu_choice"/>
@@ -188,7 +188,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">LEADERSHIP</field>
+			<field name="question">Leadership</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field eval="0" name="in_visible_menu_choice"/>
@@ -209,7 +209,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">PROCESS</field>
+			<field name="question">Process</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -236,7 +236,7 @@
 			<field name="question">Supervisors only : </field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field name="column_name">RECOMMENDATIONS / EVALUATIONS </field>
+			<field name="column_name">Recommendations / Evaluations</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
 			<field eval="0" name="make_comment_field"/>
 			<field eval="0" name="in_visible_menu_choice"/>
@@ -259,7 +259,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="1" name="sequence"/>
-			<field name="question">WORK PLAN</field>
+			<field name="question">Work Plan</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">table</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -285,7 +285,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="3" name="sequence"/>
-			<field name="question">EFFECTIVENESS</field>
+			<field name="question">Effectiveness</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -312,7 +312,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="4" name="sequence"/>
-			<field name="question">CONTINUOUS IMPROVEMENT</field>
+			<field name="question">Continuous Improvement</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -362,7 +362,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="5" name="sequence"/>
-			<field name="question">OPENNESS</field>
+			<field name="question">Openness</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -389,7 +389,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="3" name="sequence"/>
-			<field name="question">OVERALL PERFORMANCE SUMMARY RATING</field>
+			<field name="question">Overall Performance Summary Rating</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">descriptive_text</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -415,7 +415,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">OVERALL PURPOSE OF EMPLOYEE APPRAISAL</field>
+			<field name="question">Overall Purpose Of Employee Appraisal</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">descriptive_text</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -442,7 +442,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="6" name="sequence"/>
-			<field name="question">MISCELLANEOUS</field>
+			<field name="question">Miscellaneous</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -590,7 +590,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="3" name="sequence"/>
-			<field name="question">EVALUATION PROCESS</field>
+			<field name="question">Evaluation Process</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">descriptive_text</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -634,7 +634,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">PROFESSIONAL DEVELOPMENT OBJECTIVES </field>
+			<field name="question">Professional Development Objectives </field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -659,7 +659,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">PERSONAL PERFORMANCE OBJECTIVES</field>
+			<field name="question">Personal Performance Objectives</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -684,7 +684,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="4" name="sequence"/>
-			<field name="question">PROJECT OBJECTIVES</field>
+			<field name="question">Project Objectives</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>

From 152fe65e7f4bfd3ae51eb474e1a706ecfaa9e015 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 18:23:46 +0530
Subject: [PATCH 24/27] [IMP]: base_calendar: Added validation for adding
 calendar lines

bzr revid: rpa@openerp.co.in-20100208125346-32zf4yjwbuo3c9kz
---
 addons/base_calendar/base_calendar.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 9849a5b012d..689d2d08459 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -421,6 +421,16 @@ class basic_calendar_line(osv.osv):
         'domain': lambda *a: '[]', 
     }
     
+    def create(self, cr, uid, vals, context={}):
+        cr.execute("Select count(id) from basic_calendar_lines \
+                                where name='%s' and calendar_id=%s" % (vals.get('name'), vals.get('calendar_id')))
+        res = cr.fetchone()
+        if res:
+            if res[0] > 0:
+                raise osv.except_osv(_('Warning !'), _('Can not create \
+line "%s" more than once' % (vals.get('name'))))
+        return super(basic_calendar_line, self).create(cr, uid, vals, context=context)
+
 basic_calendar_line()
 
 class basic_calendar_attribute(osv.osv):
@@ -482,7 +492,7 @@ class basic_calendar_fields(osv.osv):
         res = cr.fetchone()
         if res:
             if res[0] > 0:
-                raise osv.except_osv(_('Warning !'), _('Can not map same field more than once'))
+                raise osv.except_osv(_('Warning !'), _('Can not map the field more than once'))
         return super(basic_calendar_fields, self).create(cr, uid, vals, context=context)
     
     def write(self, cr, uid, ids, vals, context=None):

From 40920b5f49d2cedb6ae0a2e56434e3e0c454ab9a Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 18:25:48 +0530
Subject: [PATCH 25/27] [IMP] crm: Opp view

bzr revid: hmo@tinyerp.com-20100208125548-n1cc6au01ucmzjch
---
 addons/crm/crm_opportunity_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 64b3d430d31..988f07c4b64 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -71,7 +71,7 @@
                         <field name="type_id" select="1" string="Campaign"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="priority" string="Priority"/>
-                    
+                        <field name="date" string="Create Date"/>
                     </group>
                     
                     
@@ -160,6 +160,7 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
                 <field name="probability" avg="Avg. of Probability"/>
+                <field name="date" string="Create Date"/>
                 <field name="date_deadline" string="Excepted Close Date"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -223,6 +224,7 @@
                         <filter string="By Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
                         <filter string="By Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
                         <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="By Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
                         
                 </group>
            </search>

From 4b230a7a793d7904347a78ad7ccb072834430075 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 18:41:12 +0530
Subject: [PATCH 26/27] [IMP]:survey,hr_evaluation. -improved the table
 question type in survey form view. -improved demo data of hr_evaluation.

bzr revid: apa@tinyerp.com-20100208131112-isiahykret8ydt0i
---
 addons/hr_evaluation/hr_evaluation_data.xml |  2 +-
 addons/survey/report/survey_form.py         | 42 +++++++++++++--------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index cfa008964df..b7ef9777ffd 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -269,7 +269,7 @@
 			<field name="comment_label">Other</field>
 			<field eval="0" name="in_visible_rating_weight"/>
 			<field eval="0" name="allow_comment"/>
-			<field eval="5" name="no_of_rows"/>
+			<field eval="10" name="no_of_rows"/>
 		</record>
 	</data>
 
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index c273b7726de..d06be9dc44c 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -72,6 +72,21 @@ class survey_form(report_rml):
               <blockValign value="TOP"/>
               <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
             </blockTableStyle>
+            <blockTableStyle id="tbl_white">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
+            <blockTableStyle id="tbl_gainsboro">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <blockBackground colorName="gainsboro" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
             <blockTableStyle id="ans_tbl_white">
               <blockAlignment value="LEFT"/>
               <blockValign value="TOP"/>
@@ -106,20 +121,13 @@ class survey_form(report_rml):
               <blockAlignment value="LEFT"/>
               <blockValign value="TOP"/>
             </blockTableStyle>
-            <blockTableStyle id="Table4">
+            <blockTableStyle id="tbl">
               <blockAlignment value="LEFT"/>
               <blockValign value="TOP"/>
               <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
               <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
               <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
             </blockTableStyle>
-            <blockTableStyle id="Table5">
-              <blockAlignment value="LEFT"/>
-              <blockValign value="TOP"/>
-              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
-              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
-            </blockTableStyle>
             <initialize>
               <paraStyle name="all" alignment="justify"/>
             </initialize>
@@ -144,7 +152,6 @@ class survey_form(report_rml):
                 <blockTable colWidths='"""+_tbl_widths+"""' style="title_tbl">
                     <tr><td><para style="title">""" + to_xml(tools.ustr(survey.title)) + """</para><para style="P2"><font></font></para></td></tr>
                 </blockTable>"""
-
             if survey.note:
                 rml += """
                 <para style="P2"></para>
@@ -280,7 +287,6 @@ class survey_form(report_rml):
                                     <rect x="-0.1cm" y="-0.45cm" width='""" + tools.ustr(cols_widhts[-1] - 0.5) +"cm" + """' height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
                             elif que.type in ['matrix_of_choices_only_one_ans','rating_scale']:
                                 value = """ <fill color="white"/>
-                                    <!--rect x="0.25cm" y="-0.5cm" width="0.8 cm" height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/-->
                                     <circle x="0.35cm" y="-0.18cm" radius="0.25 cm" fill="yes" stroke="yes"/>"""
                             else:
                                 value = """ <fill color="white"/>
@@ -343,18 +349,22 @@ class survey_form(report_rml):
                             cols_widhts.append(tbl_width/float(len(que.column_heading_ids)))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = colWidths+'cm'
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table4"><tr>"""
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="tbl"><tr>"""
                         for col in que.column_heading_ids:
                             rml+="""<td><para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) + """</para></td>"""
-                        rml+="""</tr></blockTable>
-                        <blockTable colWidths=" """ + colWidths + """ " style="Table5">"""
+                        rml+="""</tr></blockTable>"""
+                        i=0
                         for r in range(0,que.no_of_rows):
-                            rml+="""<tr>"""
+                            if i%2!=0:
+                                style='tbl_white'
+                            else:
+                                style='tbl_gainsboro'
+                            i+=1
+                            rml+="""<blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'><tr>"""
                             for c in que.column_heading_ids:
                                rml+="""
                                 <td><para style="terp_default_9"><font color="white"> </font></para></td>"""
-                            rml+="""</tr>"""
-                        rml+="""</blockTable>"""
+                            rml+="""</tr></blockTable>"""
                 if datas.has_key('form') and not datas['form']['without_pagebreak']:
                     rml+="""<pageBreak/>"""
                 elif not datas.has_key('form'):

From f18ed41f4f360424b5ca0e693e0c1fea5ced48f0 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 18:46:07 +0530
Subject: [PATCH 27/27] [IMP] crm: search view of lead+Opp.

bzr revid: hmo@tinyerp.com-20100208131607-w3l61f3kc47cc3lo
---
 addons/crm/crm_lead_view.xml        | 65 +++++++++++++++--------------
 addons/crm/crm_opportunity_view.xml | 65 +++++++++++++++--------------
 2 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 856e1098c96..0a70799be46 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -156,37 +156,40 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-               <group col="3" colspan="1">
-                <filter icon="gtk-home" string="   Today   "
-                    separator="1"
-                    domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                    help="Todays's Leads"
-                />
-                <filter icon="gtk-media-rewind" string="    7 Days    "
-                    separator="1" help="Leads during last 7 days"
-                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                />
-               </group>
-               <separator orientation="vertical"/>
-               <group col="6" colspan="2">
-                   <field name="name" select="1"/>
-                   <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
-                               domain="[('user_id','=',uid)]" help="My Leads"
-                               default="1"
-                           />
-                   </field>
-                   <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads" default="1"/>
-                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
-                   </field>
-					<field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
- 						<filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"
-                           />
-					</field>
-               </group>
+                <group colspan="4">
+                   <group col="3" colspan="1">
+                    <filter icon="gtk-home" string="   Today   "
+                        separator="1"
+                        domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                        help="Todays's Leads"
+                    />
+                    <filter icon="gtk-media-rewind" string="    7 Days    "
+                        separator="1" help="Leads during last 7 days"
+                        domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                    />
+                   </group>
+                    <separator orientation="vertical"/>
+                   <group col="6" colspan="2">
+                       <field name="name" select="1"/>
+                       <field name="user_id" select="1" widget="selection">
+                               <filter icon="terp-partner"
+                                   domain="[('user_id','=',uid)]" help="My Leads"
+                                   default="1"
+                               />
+                       </field>
+                       <field name="state" select="1">
+                           <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads" default="1"/>
+                           <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
+                       </field>
+					    <field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
+     						<filter icon="terp-crm"
+                                   domain="[('section_id','=',context.get('section_id',False))]"
+                                   help="My section"
+                               />
+					    </field>
+                   </group>
+                </group>
+                <newline/>
                <group expand="1" string="Group By..." colspan="4" col="20">
                         <filter string="By Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
                         <filter string="By Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 988f07c4b64..4a74b9c970c 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -190,37 +190,40 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
-           		<group col="3" colspan="1">
-                <filter icon="gtk-home" string="   Today   "
-                	separator="1"
-                	domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                	help="Todays's Opportunities"
-                />
-                <filter icon="gtk-media-rewind" string="    7 Days    "
-                	separator="1" help="Opportunities during last 7 days"
-                	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                />
-           		</group>
-               <separator orientation="vertical"/>
-               <group col="6" colspan="2">
-                   <field name="name" select="1" string="Opportunity"/>
-                   <field name="user_id" select="1" widget="selection">
-                   	<filter icon="terp-partner"
-                   		domain="[('user_id','=',uid)]"
-                   		help="My Opportunities" default="1"
-                   	/>
-                   </field>
-                   <field name="partner_id" select="1"/>
-                   <field name="state" select="1">
-                       <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current " default="1"/>
-                   </field>
-					<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
-						<filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"/>
-			   		</field>
-               </group>
-                <group expand="1" string="Group By..." colspan="4" col="20">
+                <group colspan="4">
+               		<group col="3" colspan="1">
+                        <filter icon="gtk-home" string="   Today   "
+                        	separator="1"
+                        	domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                        	help="Todays's Opportunities"
+                        />
+                        <filter icon="gtk-media-rewind" string="    7 Days    "
+                        	separator="1" help="Opportunities during last 7 days"
+                        	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        />
+               		</group>
+                    <separator orientation="vertical"/>
+                   <group col="6" colspan="2">
+                       <field name="name" select="1" string="Opportunity"/>
+                       <field name="user_id" select="1" widget="selection">
+                       	<filter icon="terp-partner"
+                       		domain="[('user_id','=',uid)]"
+                       		help="My Opportunities" default="1"
+                       	/>
+                       </field>
+                       <field name="partner_id" select="1"/>
+                       <field name="state" select="1">
+                           <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current " default="1"/>
+                       </field>
+				        <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
+					        <filter icon="terp-crm"
+                                   domain="[('section_id','=',context.get('section_id',False))]"
+                                   help="My section"/>
+		           		</field>
+                   </group>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="4">
                         <filter string="By Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
                         <filter string="By Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
                         <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>