From 2a9f1ae7e1322a8452cd6e1dbaa6d2b2829a0d1d Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 2 Feb 2010 18:40:24 +0530
Subject: [PATCH 01/24] [MOD] Improvement in Sql view

bzr revid: vir@tinyerp.com-20100202131024-ohz2u0s3hfxe2ko2
---
 .../board_warehouse/board_warehouse_view.xml  | 13 +++++-
 addons/stock/stock.py                         | 44 ++++++++++++++-----
 addons/stock/stock_view.xml                   |  2 +-
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/board_warehouse/board_warehouse_view.xml
index 0ea7fb48297..cdc93d9a274 100644
--- a/addons/board_warehouse/board_warehouse_view.xml
+++ b/addons/board_warehouse/board_warehouse_view.xml
@@ -5,6 +5,15 @@
             <field name="name">Warehouse</field>
         </record>
 
+		<record id="action_reception_picking_move_board" model="ir.actions.act_window">
+            <field name="name">Reception Picking Stock Move</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in'),('date','&lt;=',time.strftime('%Y-%m-%d 23:59:59'))]</field>
+            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
+        </record>
 
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
@@ -15,11 +24,11 @@
                     <hpaned position="100">
                         <child1>
 					    	<action colspan="4" name="%(mrp.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
-					    	<action colspan="4" name="%(stock.action_reception_picking_move)d" string="Products To Receive" />
+					    	<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
                         </child1>
 
                         <child2>
-					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Products To Receive" width="510"/>
+					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
 					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
                         </child2>
                     </hpaned>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1e91f182568..cc4da8bdbbd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1656,12 +1656,21 @@ class report_products_to_received_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
         cr.execute("""
             create or replace view report_products_to_received_planned as (
-               select
-                     distinct current_date as date,
-                     min(id) as id,
-                     (select sum(product_qty)  from  stock_move where to_char(date,'YYYY-MM-DD')::date = current_date ) as qty,
-                     (select sum(product_qty)  from  stock_move where to_char(date_planned,'YYYY-MM-DD')::date = current_date) as planned_qty
-                from  stock_move
+               select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty
+                   from stock_picking picking
+                    inner join stock_move stock
+                    on picking.id = stock.picking_id and picking.type = 'in'
+                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+                    group by stock.date
+
+                    union
+
+               select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
+                    from stock_picking picking
+                    inner join stock_move stock
+                    on picking.id = stock.picking_id and picking.type = 'in'
+                    where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+        group by stock.date_planned
                 )
         """)
 report_products_to_received_planned()
@@ -1681,12 +1690,23 @@ class report_delivery_products_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
         cr.execute("""
             create or replace view report_delivery_products_planned as (
-                select
-                     distinct current_date as date,
-                     min(sm.id) as id,
-                     (select sum(product_qty)  from  stock_move join stock_picking sp on (sm.picking_id = sp.id ) where to_char(sm.date,'YYYY-MM-DD')::date = current_date ) as qty,
-                     (select sum(product_qty)  from  stock_move join stock_picking sp on (sm.picking_id = sp.id ) where to_char(sm.date_planned,'YYYY-MM-DD')::date = current_date) as planned_qty
-                from  stock_move sm join stock_picking sp on (sm.picking_id = sp.id ) where sp.type = 'out' group by sm.picking_id, sm.date, sm.date_planned
+                select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty
+                   from stock_picking picking
+                    inner join stock_move stock
+                    on picking.id = stock.picking_id and picking.type = 'out'
+                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+                    group by stock.date
+
+                    union
+
+               select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
+                    from stock_picking picking
+                    inner join stock_move stock
+                    on picking.id = stock.picking_id and picking.type = 'out'
+                    where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+        group by stock.date_planned
+
+
                 )
         """)
 report_delivery_products_planned()
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9adf0bbecba..42bef7b13d7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1515,7 +1515,7 @@
 	    </record>
 
 	    <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-	        <field name="name">Reception Picking Stock Move</field>
+	        <field name="name">Number of Products to receive Vs planned</field>
 	        <field name="res_model">report.products.to.received.planned</field>
 	        <field name="type">ir.actions.act_window</field>
 	        <field name="view_type">form</field>

From 9840d0a5049e4d0c42caa0a06610cc8753995961 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 3 Feb 2010 16:51:42 +0530
Subject: [PATCH 02/24] [Fix] : Problem reporting menu displaying twice in
 project management

bzr revid: vir@tinyerp.com-20100203112142-jl2msxvgzjdddzzn
---
 addons/crm_project/report_crm_project_bug_view.xml | 14 +++++++-------
 addons/report_task/report_task_view.xml            |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml
index 4bd1a24ebcc..669707ab346 100644
--- a/addons/crm_project/report_crm_project_bug_view.xml
+++ b/addons/crm_project/report_crm_project_bug_view.xml
@@ -35,7 +35,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_crm_project_bug_user_graph" model="ir.ui.view">
             <field name="name">report.crm.project.bug.user.graph</field>
             <field name="model">report.crm.project.bug.user</field>
@@ -59,7 +59,7 @@
                </field>
             </field>
         </record>
-        
+
         <record id="action_report_crm_project_bug_user_tree" model="ir.actions.act_window">
             <field name="name">Project Bug by User and Section</field>
             <field name="res_model">report.crm.project.bug.user</field>
@@ -68,11 +68,11 @@
             <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 id="menu_project_report" name="Reporting" parent="project.menu_main" sequence="50"/>
-        <menuitem name="Project Bug" id="menu_crm_project_bug_tree" parent="menu_project_report"/>
+
+        <menuitem id="base.menu_project_report" name="Reporting" parent="project.menu_main" 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"/>
-        
+
         <!-- # Project Bug by section and category of case -->
 
         <record id="view_crm_project_bug_categ_tree" model="ir.ui.view">
@@ -188,6 +188,6 @@
             <field name="view_id" ref="view_report_crm_project_bug_section_graph"/>
             <field name="search_view_id" ref="view_report_crm_project_bug_section_filter"/>
         </record>
-        <menuitem action="action_report_crm_project_bug_section_tree" id="menu_crm_project_bug_section_tree" parent="menu_crm_project_bug_tree"/>        
+        <menuitem action="action_report_crm_project_bug_section_tree" id="menu_crm_project_bug_section_tree" parent="menu_crm_project_bug_tree"/>
   </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index e86abd878e6..331351803fb 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -81,8 +81,9 @@
             <field name="domain">[]</field>
             <field name="search_view_id" ref="view_report_task_user_pipeline_open_search"/>
         </record>
-        <menuitem id="next_id_57" name="Reporting" parent="project.menu_main" sequence="50"/>
-        <menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_57"/>
+        <menuitem id="base.menu_project_report" name="Reporting" parent="project.menu_main" sequence="50"/>
+<!--        <menuitem id="next_id_57" name="Reporting" parent="project.menu_main" sequence="50"/>-->
+        <menuitem action="action_project_task" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
         <!-- Closed Task in Random Acitivities dashboard -->
 

From d6cdc061be78c6a7a69c4302447e95e7ae0de898 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Wed, 3 Feb 2010 17:14:21 +0530
Subject: [PATCH 03/24] [Fix] : Removed unwanted dependency from Project module

bzr revid: vir@tinyerp.com-20100203114421-9hpcy38sn13w8un1
---
 .../account_analytic_analysis_menu.xml        |  2 +-
 .../crossovered_budget_view.xml               |  8 ++++++
 addons/crm_project/crm_bugs_menu.xml          | 20 +++++++--------
 addons/hr_attendance/hr_attendance_wizard.xml |  6 +++++
 .../hr_timesheet_sheet_view.xml               |  8 ++++++
 addons/project/__terp__.py                    |  2 +-
 addons/project/project_view.xml               | 25 ++++---------------
 .../report_analytic_planning_view.xml         |  2 +-
 .../report_timesheet_view.xml                 |  7 ++++++
 addons/scrum/scrum_view.xml                   |  2 +-
 10 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 232ba274769..6dafe28af8e 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 id="next_id_71" name="Financial Project Management" parent="project.menu_main" groups="account.group_account_invoice" sequence="20"/>
+        <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"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 86516f35bfa..bdb8bfd4c8f 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -294,6 +294,14 @@
             auto="False"
             menu="False"/>-->
 
+		<!--Menu for project management-->
+		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+		<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"/>
+        <menuitem parent="menu_pm_budget"
+             id="menu_act_pm_crossovered_budget_view"
+             action="act_crossovered_budget_view" />
     </data>
 </openerp>
 
diff --git a/addons/crm_project/crm_bugs_menu.xml b/addons/crm_project/crm_bugs_menu.xml
index 627fab57aba..442744ade3d 100644
--- a/addons/crm_project/crm_bugs_menu.xml
+++ b/addons/crm_project/crm_bugs_menu.xml
@@ -6,34 +6,34 @@
     <record model="crm.case.categ" id="categ1">
         <field name="name">Bugs</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ2">
         <field name="name">Patches</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ3">
         <field name="name">Feature Requests</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage2">
         <field name="name">Fixed</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage5">
         <field name="name">Awaiting Response</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
-    </record>    
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
+    </record>
     <record model="crm.case.stage" id="stage7">
         <field name="name">Future</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>   
-    </record>       
-    
+        <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
+    </record>
+
 
     ######################## BUG TRACKING (menu) ###########################
     <!--
@@ -67,7 +67,7 @@
         <field name="act_window_id" ref="crm_case_categ_act0"/>
     </record>
 
-    <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
+    <!--<menuitem id="menu_aftertask" name="Bug" parent="base.menu_main_pm" visible="False"/>-->
     <menuitem name="Issues" id="menu_crm_case_bug_track"  parent="project.menu_project_management" action="crm_case_categ_act0"/>
 </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index dcfadeb105b..bdec6414246 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -11,6 +11,12 @@
 
         <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
+             id="base.menu_project_management_time_tracking"
+             name="Time Tracking"
+             parent="base.menu_main_pm" sequence="3"/>
+        <menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="base.menu_project_management_time_tracking" type="wizard" sequence="9"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 79650ce2a59..c9cfc6caeaf 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -219,6 +219,14 @@
             <field name="view_id" eval="False"/>
             <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
+             id="base.menu_project_management_time_tracking"
+             name="Time Tracking"
+             parent="base.menu_main_pm" sequence="3"/>
+         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
+             groups="hr.group_hr_manager" sequence="5"/>
         <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
             groups="hr.group_hr_manager"/>
diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 5c7030a8acb..7f78e3722c0 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["product", "account", "hr", "process", "mail_gateway","hr_timesheet_sheet","report_timesheet","account_budget"],
+    "depends" : ["product", "account", "hr", "process", "mail_gateway"],
     "description": """Project management module that track multi-level projects, tasks,
 works done on tasks, eso. It is able to render planning, order tasks, eso.
     """,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1e75b2a9a82..a4a23ec8194 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
-         <menuitem id="menu_project_management" name="Project Management" parent="menu_main" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
 
-        <menuitem id="menu_pm_invoicing" name="Invoicing" parent="menu_main" sequence="7"/>
-        <menuitem id="menu_pm_budget" name="Budgets" parent="menu_pm_invoicing"/>
-        <menuitem action="account_budget.open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
-        <menuitem parent="menu_pm_budget"
-             id="menu_act_pm_crossovered_budget_view"
-             action="account_budget.act_crossovered_budget_view" />
-         <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="60"/>
-         <!--Time Tracking menu-->
-         <menuitem
-             id="menu_project_management_time_tracking"
-             name="Time Tracking"
-             parent="menu_main" sequence="3"/>
-         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="menu_project_management_time_tracking"
-             groups="hr.group_hr_manager"/>
-        <menuitem action="report_timesheet.action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="menu_project_management_time_tracking"/>
-        <menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="menu_project_management_time_tracking" type="wizard"/>
+         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -146,7 +131,7 @@
                 </tree>
             </field>
         </record>
-        <!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
+        <!--<menuitem id="menu_all_project" parent="base.menu_main_pm" name="Projects"/> -->
 
         <record id="open_view_project_all" model="ir.actions.act_window">
             <field name="name">Projects</field>
@@ -661,7 +646,7 @@
             <field name="view_id" ref="view_project_message_tree"/>
        </record>
 
-        <!--<menuitem id="menu_message_main" name="Message" parent="menu_main"/>-->
+        <!--<menuitem id="menu_message_main" name="Message" parent="base.menu_main_pm"/>-->
         <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
 
         <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 5d5c6aa37aa..c9c746fbd79 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -217,7 +217,7 @@
 			<field name="view_mode">tree,form</field>
 			<field name="search_view_id" ref="account_analytic_planning_view_search"/>
 		</record>
-		<menuitem id="base.menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
+		<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
 		<menuitem id="planning_main" name="Long Term Planning"
 			parent="base.menu_pm_planning" />
 
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index ed9c0666c48..087dda92817 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -369,6 +369,13 @@
             <field name="view_mode">tree,form</field>
             <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
+             id="base.menu_project_management_time_tracking"
+             name="Time Tracking"
+             parent="base.menu_main_pm" sequence="3"/>
+        <menuitem action="action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="base.menu_project_management_time_tracking" sequence="7"/>
 	  <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
             parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
        <menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index fb6c3a716d6..521f2c53838 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -47,7 +47,7 @@
             <field name="view_id" ref="view_scrum_project_tree"/>
             <field name="domain">[('parent_id','=',False),('scrum','=',1)]</field>
         </record>
-        <menuitem id="next_id_67" name="Scrum" parent="project.menu_main"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
+        <menuitem id="next_id_67" name="Scrum" parent="base.menu_main_pm"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
 
         <record id="action_scrum_project_form" model="ir.actions.act_window">
             <field name="name">Edit Projects</field>

From ff2834cf5452b578306180d8d88f7b3f4ab830bd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 17:28:03 +0530
Subject: [PATCH 04/24] [Fix] crm: changed the field tinycrm and set the object
 name

bzr revid: sbh@tinyerp.com-20100203115803-mjcmnro35uawh340
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 3 ++-
 addons/crm/wizard/wizard_crm_send_email.py     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 836edf0ba0b..660830bbf03 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -93,7 +93,8 @@ def _mass_mail_send(self, cr, uid, data, context):
         case_pool.format_body(body),
         attach=attach,
         reply_to=case.section_id.reply_to,
-        tinycrm=str(case.id)
+        
+        openobject_id=str(case.id)
     )
     if flag:
         if data['form']['state'] == 'unchanged':
diff --git a/addons/crm/wizard/wizard_crm_send_email.py b/addons/crm/wizard/wizard_crm_send_email.py
index d5a4be358ff..181ff2926c6 100644
--- a/addons/crm/wizard/wizard_crm_send_email.py
+++ b/addons/crm/wizard/wizard_crm_send_email.py
@@ -51,7 +51,7 @@ email_send_fields = {
 # this sends an email to ALL the addresses of the selected partners.
 def _mass_mail_send(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
-    case_pool=pool.get('crm.case')
+    case_pool=pool.get(data['model'])
 
     hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
     case = hist_obj.log_id.case_id
@@ -71,7 +71,7 @@ def _mass_mail_send(self, cr, uid, data, context):
         data['form']['subject'],
         case_pool.format_body(body),
         reply_to=case.section_id.reply_to,
-        tinycrm=str(case.id)
+        openobject_id=str(case.id)
     )
     return {}
 

From 5a4bfb89ef2a0a6da1cd57f3cbd18bcafd7bd4c4 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Feb 2010 17:30:51 +0530
Subject: [PATCH 05/24] [CHANGE]: organised imports

bzr revid: mga@tinyerp.com-20100203120051-edrk1ho6ka019ftb
---
 addons/crm/crm.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 32035d06973..6ed5be068f0 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -22,14 +22,14 @@
 import time
 import re
 import os
-
-import mx.DateTime
 import base64
+import tools
+import mx.DateTime
 
 from tools.translate import _
-
-import tools
-from osv import fields,osv,orm
+from osv import fields 
+from osv import osv 
+from osv import orm
 from osv.orm import except_orm
 
 MAX_LEVEL = 15

From 7dc05435ff40cd9d48d66646c63715d2c1283add Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 3 Feb 2010 17:48:35 +0530
Subject: [PATCH 06/24] [FIX]:minor bug related to groupby

bzr revid: nch@tinyerp.com-20100203121835-abth6i33yy6lftxi
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 9975cf1e5a3..d6ae570ef09 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1836,7 +1836,7 @@ class orm(orm_template):
             if fget.has_key(groupby):
                 if fget[groupby]['type'] == 'many2one':
                     d[groupby] = d[groupby] and d[groupby][1] or ''
-                if fget[groupby]['type'] in ('date','datetime'):
+                if d[groupby] and fget[groupby]['type'] in ('date','datetime'):
                    today = datetime.date.today()
                    if d[groupby][:10] == str(today):
                        d[groupby] = 'Today'

From b4d109af3101da71fe236d37284ef658d960ca01 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 17:52:44 +0530
Subject: [PATCH 07/24] [IMP] crm: lead and opportunity form

bzr revid: hmo@tinyerp.com-20100203122244-5p46alko2qwnmx87
---
 addons/crm/crm_lead.py              |  5 ++-
 addons/crm/crm_lead_view.xml        | 61 ++++++++++++++---------------
 addons/crm/crm_opportunity.py       |  1 +
 addons/crm/crm_opportunity_view.xml | 60 ++++++++++++++++------------
 4 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 04a5a09da3d..cb97f8b4c6b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -33,10 +33,11 @@ class crm_lead(osv.osv):
     _order = "id desc"
     _inherit = 'crm.case'    
     _columns = {
+            'name': fields.char('Lead Subject', size=64),
             'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
             'type_id': fields.many2one('crm.case.resource.type', 'Lead Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-            'partner_name': fields.char("Employee's Name", size=64),
-            'partner_name2': fields.char('Employee Email', size=64),
+            'partner_name': fields.char("Lead Name", size=64),
+            'partner_name2': fields.char('Email', size=64),
             'partner_phone': fields.char('Phone', size=32),
             'partner_mobile': fields.char('Mobile', size=32),
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2c5024ebd0f..f16402e5bd8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -26,33 +26,20 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
-                <group colspan="4" col="7">
-                    <field name="name" select="1" string="Lead Subject"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="opportunity_id" string="Opportunity Case"/>
-	                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"  attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
-
-                    <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" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
-                    <field name="type_id" string="Campaign Type" select="1"/>
+                <group colspan="4" col="5">
+                    <field name="partner_name" string="Lead Name" required="1"/>
+                    <field name="name" string="Lead Subject"/>                                       
+                    <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
                     <newline/>
-                    <field name="date"/>
-                	<field name="date_deadline"/>
-                    <field name="user_id" select="2"/>
+                    <field name="partner_name2" string="Contact Name"/>                    
+                    <field name="email_from" string="Email"/>                    
+                    
                 </group>
                 <notebook colspan="4">
                 <page string="Leads">
-                    <separator string="Lead Information" colspan="4"/>
-                    <field name="partner_name" string="Lead Name"/>
-                    <field name="partner_name2" string="Contact Name"/>
+                    <separator colspan="4" string="Communication"/>
                     <field name="partner_phone"/>
                     <field name="partner_mobile"/>
-                    <field name="email_from" string="Lead Email"/>
-                    <newline/>
                     <label string="Partner:" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="partner_id" nolabel="1" colspan="1"/>
@@ -63,9 +50,23 @@
                     </group>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
-                    <field name="priority" string="Priority"/>
-                    <newline/>
-                    <separator colspan="4" string="Lead Details"/>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                        <field name="user_id" select="2"/>
+                        <label string="Status: " 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" 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="create_date"/>
+	                </group>
+                    <separator colspan="4" string="Details"/>
                     <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
@@ -115,14 +116,12 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">
-                <field name="id"/>
-                <field name="name" string="Lead Subject"/>
-                <field name="partner_phone"/>
-                <field name="partner_name2" string="Contact Name"/>
-                <field name="stage_id"/>
+            <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="categ_id" string="Lead Source"/>
-                <field name="type_id" string="Campaign Type"/>
+                <field name="email_from" string="Email"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 4e2e6902f7f..9a90eb8ccd7 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -44,6 +44,7 @@ class crm_opportunity(osv.osv):
         'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
         'date_closed': fields.datetime('Closed', readonly=True),
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
+        'partner_phone': fields.char('Phone', size=32),
     }
 
 crm_opportunity()
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 0268ffc0b3c..8e7f17fcfff 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -39,37 +39,47 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
-                <group colspan="4" col="7">
-                    <field name="name" select="1" string="Opportunity" colspan="2"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" select="2" string="Responsible"/>
-					<button string="Schedule a Meeting"
+                <group colspan="4" col="5">                    
+                    <field name="name" select="1" string="Opportunity" colspan="4"/>
+                    <button string="Schedule a Meeting"
                         name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
-                        <newline/>
+                    <newline/>
+                    <field name="planned_revenue" required="1"/>
+                    <field name="planned_cost"/>
+                    <button string="Schedule a Phone Call"
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
+                    <newline/>
+                    <field name="probability"/>
+                    <field name="date_deadline" string="Excepted Close Date"/>
+                    
+                </group>
+                <notebook colspan="4">
+                <page string="Opportunity">
+                    <separator colspan="4" string="Communication"/>                    
+                    <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" string="Email"/>
+                    <field name="partner_phone" colspan="2"/>
+
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                        <field name="user_id" select="2" string="Responsible"/>
                         <label string="Sales 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="date" />
-                    <field name="date_deadline"/>
-                    <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
-                </group>
-                <notebook colspan="4">
-                <page string="Description">
-                    <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"/>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Source"/>
-                    <field name="priority" string="Priority"/>
-                    <field name="type_id" select="1" string="Type"/>
-                    <separator colspan="4" string="Estimates"/>
-                    <field name="planned_revenue"/>
-                    <field name="planned_cost"/>
-                    <field name="probability"/>
-                    <separator colspan="4" string="Description Information"/>
-                        <field name="description" nolabel="1" colspan="4"/>
+                        <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" select="1" string="Campaign"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="priority" string="Priority"/>
+                    
+                    </group>
+                    
+                    
+                    
+                    <separator colspan="4" string="Details"/>
+                    <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">

From ace9d947151a7a990f34a3504080ed34354e6864 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 17:56:19 +0530
Subject: [PATCH 08/24] [IMP] crm: change the name of field name in wizard

bzr revid: sbh@tinyerp.com-20100203122619-r52yovo10ooszj6o
---
 addons/crm/crm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 32035d06973..4c32ac9515e 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -653,7 +653,7 @@ class crm_case(osv.osv):
                     "Reminder: [%s] %s" % (str(case.id), case.name, ),
                     self.format_body(body),
                     reply_to=case.section_id.reply_to,
-                    tinycrm=str(case.id),
+                    openobject_id=str(case.id),
                     attach=attach_to_send
                 )
                 if flag:
@@ -713,7 +713,7 @@ class crm_case(osv.osv):
                 '['+str(case.id)+'] '+case.name,
                 self.format_body(body),
                 reply_to=case.section_id.reply_to,
-                tinycrm=str(case.id)
+                openobject_id=str(case.id)
             )
         return True
 
@@ -885,7 +885,7 @@ class crm_email_add_cc_wizard(osv.osv_memory):
             subject or '['+str(case.id)+'] '+case.name,
             crm_case.format_body(body),
             email_cc = [email],
-            tinycrm=str(case.id)
+            openobject_id=str(case.id)
         )
         if flag:
             crm_case.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc +','+ email or email})

From 5c119663a033c4a89c93caded88860ba77f06c7c Mon Sep 17 00:00:00 2001
From: "VIR(OpenERP)" <>
Date: Wed, 3 Feb 2010 17:56:25 +0530
Subject: [PATCH 09/24] [FIX] Ir.sequence : removed unrelated field from view

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

bzr revid: jvo@tinyerp.com-20100203122625-2eog64zqhxpz5mog
---
 bin/addons/base/ir/ir.xml | 1 -
 bin/osv/orm.py            | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 59ccd5dde7c..31e2f8a9eb3 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -115,7 +115,6 @@
                         <field name="padding"/>
                         <field name="number_increment"/>
                         <field name="number_next"/>
-            <field name="weight" />
                         <separator colspan="4" string="Legend (for prefix, suffix)"/>
                         <group col="8" colspan="4">
                             <group>
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index d6ae570ef09..77b0362a5b1 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1450,6 +1450,7 @@ class orm_template(object):
                     'client_action_relate', [(self._name, False)], False,
                     context)
             resprint = map(clean, resprint)
+            print "resprintresprint",resprint
             resaction = map(clean, resaction)
             resaction = filter(lambda x: not x.get('multi', False), resaction)
             resprint = filter(lambda x: not x.get('multi', False), resprint)

From 675ce3c190d7c0757cf3c21cdacfd25aa9f0723f Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 3 Feb 2010 18:12:38 +0530
Subject: [PATCH 10/24] [FIX]: improve view for planing and done time

bzr revid: mga@tinyerp.com-20100203124238-2j1e3cv8zx2rbdre
---
 addons/project/project_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1e75b2a9a82..5c7e7fd953c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -43,6 +43,7 @@
                             <field name="priority"/>
                             <field name="resource_calendar_id"/>
                             <field name="active" select="2"/>
+                            <newline/>
                             <field name="planned_hours" widget="float_time"/>
                             <field name="effective_hours" widget="float_time"/>
 

From b82e3e3f59952ef439355737f0ac52312b0a8aef Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 18:15:59 +0530
Subject: [PATCH 11/24] [IMP] event: change the name of tinycrm to object_id

bzr revid: sbh@tinyerp.com-20100203124559-umg234i850lywpjx
---
 addons/crm/wizard/wizard_crm_new_send_email.py | 1 -
 addons/event/event.py                          | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index 660830bbf03..42b2f244b68 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -89,7 +89,6 @@ def _mass_mail_send(self, cr, uid, data, context):
         case.user_id.address_id.email,
         emails,
         data['form']['subject'],
-        body,
         case_pool.format_body(body),
         attach=attach,
         reply_to=case.section_id.reply_to,
diff --git a/addons/event/event.py b/addons/event/event.py
index c91c6880f39..e5485edc44e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -201,7 +201,7 @@ class event_registration(osv.osv):
             if reg_id.email_cc:
                 dest += [reg_id.email_cc]
             if dest and src:
-                tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, tinycrm = str(reg_id.case_id.id))
+                tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
             if not src:
                 raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
         return False
@@ -216,9 +216,9 @@ class event_registration(osv.osv):
             if reg_id.event_id.mail_auto_confirm or reg_id.event_id.mail_auto_registr:
                 if dest and src:
                     if reg_id.event_id.state in ['draft', 'fixed', 'open','confirm','running'] and reg_id.event_id.mail_auto_registr:
-                        tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, tinycrm = str(reg_id.case_id.id))
+                        tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, openobject_id = str(reg_id.case_id.id))
                     if (reg_id.event_id.state in ['confirm','running']) and reg_id.event_id.mail_auto_confirm:
-                        tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, tinycrm = str(reg_id.case_id.id))
+                        tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
                 if not src:
                     raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
         return False

From 3798745666cd3ef4288b2f681a3db308f9223f54 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Wed, 3 Feb 2010 18:22:31 +0530
Subject: [PATCH 12/24] [IMP]: caldav: Changed relation of attendee's delegated
 users information to calendar.attendee, Improvement in delegation function

bzr revid: rpa@openerp.co.in-20100203125231-nj9l0euorn893qlg
---
 addons/caldav/caldav.py | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 38a2dcacd78..ff35a8492c8 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -188,13 +188,6 @@ class calendar_attendee(osv.osv):
         name = name[0]
         result = {}
 
-        def get_delegate_data(user):
-            if not user.address_id.email:
-                raise osv.except_osv(_('Error!'), \
-                                ("User does not have an email Address"))
-            email = (user.address_id and ('MAILTO:' + user.address_id.email)) or ''
-            return email
-
         for attdata in self.browse(cr, uid, ids, context=context):
             id = attdata.id
             result[id] = {}
@@ -213,13 +206,10 @@ class calendar_attendee(osv.osv):
                 else:
                     result[id][name] = self._get_address(None, attdata.email)
             if name == 'delegated_to':
-                user_obj = self.pool.get('res.users')
-                todata = map(get_delegate_data, attdata.del_to_user_ids)
+                todata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_to_user_ids)
                 result[id][name] = ', '.join(todata)
             if name == 'delegated_from':
-                dstring = []
-                user_obj = self.pool.get('res.users')
-                fromdata = map(get_delegate_data, attdata.del_from_user_ids)
+                fromdata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_from_user_ids)
                 result[id][name] = ', '.join(fromdata)
             if name == 'event_date':
                 if attdata.ref:
@@ -288,11 +278,11 @@ class calendar_attendee(osv.osv):
                 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('res.users', 'att_del_to_user_rel', 
+        'del_to_user_ids': fields.many2many('calendar.attendee', 'att_del_to_user_rel', 
                                   'attendee_id', 'user_id', 'Users'), 
         '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('res.users', 'att_del_from_user_rel', \
+        'del_from_user_ids': fields.many2many('calendar.attendee', 'att_del_from_user_rel', \
                                       'attendee_id', 'user_id', 'Users'), 
         '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'),
@@ -1169,6 +1159,9 @@ class invite_attendee_wizard(osv.osv_memory):
               }
 
     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 {}
@@ -1178,7 +1171,9 @@ class invite_attendee_wizard(osv.osv_memory):
         res_obj = obj.browse(cr, uid, context['active_id'])
         type = datas.get('type')
         att_obj = self.pool.get('calendar.attendee')
-        vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
+        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', []):
@@ -1189,7 +1184,7 @@ class invite_attendee_wizard(osv.osv_memory):
                 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, {'attendee_ids': [(4, att_id)]})
+                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
 
         elif  type == 'external' and datas.get('email'):
             vals.update({'email': datas['email']})
@@ -1200,7 +1195,7 @@ class invite_attendee_wizard(osv.osv_memory):
                              (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, {'attendee_ids': [(4, att_id)]})
+            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)
@@ -1217,22 +1212,25 @@ class invite_attendee_wizard(osv.osv_memory):
             body = html_invitation % body_vals
             mail_to = [datas['email']]
             tools.email_send(
-                    tools.config.get('email_from',False), 
+                    tools.config.get('email_from', False), 
                     mail_to, 
                     sub, 
                     body, 
                     subtype='html', 
-                    reply_to=tools.config.get('email_from',False)
+                    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, {'attendee_ids': [(4, att_id)]})
+                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
         return {}
 
 

From dfdc779ca5fac698f44d3414cb4aebd86ecbf8d8 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 18:40:02 +0530
Subject: [PATCH 13/24] [IMP] crm: lead, opportinuty view

bzr revid: hmo@tinyerp.com-20100203131002-4bx3nn2040ekycrg
---
 addons/crm/crm_lead_view.xml        | 162 +++++++++++++++-------------
 addons/crm/crm_opportunity_view.xml |  24 +++--
 addons/sale_crm/sale_crm_view.xml   |  10 +-
 3 files changed, 101 insertions(+), 95 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f16402e5bd8..41ad721336f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -26,88 +26,96 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
-                <group colspan="4" col="5">
-                    <field name="partner_name" string="Lead Name" required="1"/>
-                    <field name="name" string="Lead Subject"/>                                       
-                    <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
-                    <newline/>
-                    <field name="partner_name2" string="Contact Name"/>                    
-                    <field name="email_from" string="Email"/>                    
-                    
-                </group>
-                <notebook colspan="4">
-                <page string="Leads">
-                    <separator colspan="4" string="Communication"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <label string="Partner:" align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="partner_id" nolabel="1" colspan="1"/>
-                        <button string="Convert to Partner"
-                            icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                            type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                        />
+                <group>
+                    <group colspan="3" col="4">
+                        <field name="partner_name" string="Lead Name" required="1"/>
+                        <field name="name" string="Lead Subject"/>
+                        <field name="partner_name2" string="Contact Name"/>                    
+                        <field name="email_from" string="Email"/>                    
+                        
                     </group>
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-
-                    <separator colspan="4" string="Status and Categarization"/>
-                    <group colspan="4" col="6">
-                        <field name="user_id" select="2"/>
-                        <label string="Status: " align="1.0"/>
+                    <group colspan="1" col="1">
+                    <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
+                    <label string=""/>
+                    </group>
+                    <group colspan="3" col="4">
+                    <notebook>
+                    <page string="Leads">
+                        <separator colspan="4" string="Communication"/>
+                        <field name="partner_phone"/>
+                        <field name="partner_mobile"/>
+                        <label string="Partner:" 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"/>
+                            <field name="partner_id" nolabel="1" colspan="1"/>
+                            <button string="Convert to Partner"
+                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                            />
                         </group>
-                        <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="create_date"/>
-	                </group>
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
+                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="2"/>
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
-                    </group>
-                 </page>
-                 <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="7" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                                <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
+                        <separator colspan="4" string="Status and Categarization"/>
+                        <group colspan="4" col="6">
+                            <field name="user_id" select="2"/>
+                            <label string="Status: " align="1.0"/>
+                            <group colspan="1" col="2">
+                                <field name="stage_id" select="1" nolabel="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                                <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                             </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <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"/>
-                 </page>
-                </notebook>
+                            <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="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"/>
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                            <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+                        </group>
+                     </page>
+                     <page string="Emails" groups="base.group_extended">
+                       <group colspan="4">
+                           <field colspan="4" name="email_cc" string="CC"/>
+                       </group>
+                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                            <form string="Communication history">
+                                <group col="7" colspan="4">
+                                    <field name="date"/>
+                                    <field name="email"/>
+                                    <field name="canal_id"/>
+                                    <button
+                                       string="Add a CC"
+                                        name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                        icon="gtk-add" type="action"/>
+                                </group>
+                                <newline/>
+                                <field name="description" colspan="4" nolabel="1"/>
+                                <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
+                            </form>
+                            <tree string="Communication history">
+                                <field name="description"/>
+                                <field name="email"/>
+                                <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"/>
+                     </page>
+                    </notebook>
+                    </group>
+
+                </group>
+
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 8e7f17fcfff..3185be1a457 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -39,24 +39,25 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
-                <group colspan="4" col="5">                    
+                <group colspan="3" col="4">                    
                     <field name="name" select="1" string="Opportunity" colspan="4"/>
-                    <button string="Schedule a Meeting"
-                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
-                    <newline/>
                     <field name="planned_revenue" required="1"/>
                     <field name="planned_cost"/>
-                    <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
-                    <newline/>
                     <field name="probability"/>
-                    <field name="date_deadline" string="Excepted Close Date"/>
+                    <field name="date_deadline" string="Excepted Close Date" required="1"/>
                     
                 </group>
-                <notebook colspan="4">
+                <group colspan="1" col="1">
+                    <button string="Schedule Meeting"
+                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
+                    <button string="Schedule Call"
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
+                </group>
+                <group colspan="3" col="4">
+                <notebook>
                 <page string="Opportunity">
                     <separator colspan="4" string="Communication"/>                    
-                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                    <field name="partner_id" required="1" 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" string="Email"/>
                     <field name="partner_phone" colspan="2"/>
@@ -66,7 +67,7 @@
                         <field name="user_id" select="2" string="Responsible"/>
                         <label string="Sales Stage: " align="1.0"/>
                         <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1"/>
+                        <field name="stage_id" select="1" nolabel="1" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                         <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
@@ -146,6 +147,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/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index a6f6868dc21..30700eb0487 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,13 +8,9 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
-            <field name="user_id" position="replace">
-                <label string="Responsible: " align="1.0"/>
-                <group colspan="1" col="2">
-                    <field name="user_id" select="2" nolabel="1" string="Responsible"/>
-                    <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
-                </group>
-            </field>
+            <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
+                <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> 
+            </xpath>           
         </field>
     </record>
 

From 1cc4bda393758e1cd503945ef40f5b98a5a5ca98 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 18:57:10 +0530
Subject: [PATCH 14/24] [IMP] crm: improve view of lead and oopt.

bzr revid: hmo@tinyerp.com-20100203132710-bc2tzv3aqf0e1969
---
 addons/crm/crm_lead_view.xml        | 27 +++++++++------------------
 addons/crm/crm_opportunity_view.xml | 10 +++-------
 addons/sale_crm/sale_crm_view.xml   |  2 +-
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 41ad721336f..f54114ab885 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -36,32 +36,23 @@
                     </group>
                     <group colspan="1" col="1">
                     <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
-                    <label string=""/>
+                    <button string="Convert to Partner"
+                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                            />
                     </group>
                     <group colspan="3" col="4">
                     <notebook>
                     <page string="Leads">
-                        <separator colspan="4" string="Communication"/>
+                        <separator colspan="4" string="Communication"/>                                                                        
+                        <field name="partner_id" string="Partner"/>
+                        <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"/>
-                        <label string="Partner:" align="1.0"/>
-                        <group colspan="1" col="2">
-                            <field name="partner_id" nolabel="1" colspan="1"/>
-                            <button string="Convert to Partner"
-                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                            />
-                        </group>
-                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-
                         <separator colspan="4" string="Status and Categarization"/>
                         <group colspan="4" col="6">
-                            <field name="user_id" select="2"/>
-                            <label string="Status: " align="1.0"/>
-                            <group colspan="1" col="2">
-                                <field name="stage_id" select="1" nolabel="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                                <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                            </group>
+                            <field name="user_id" select="2"/>                                                        
+                            <field name="stage_id" select="1" string="Status" 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"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3185be1a457..2c1f6aa0550 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -64,12 +64,8 @@
 
                     <separator colspan="4" string="Status and Categarization"/>
                     <group colspan="4" col="6">
-                        <field name="user_id" select="2" string="Responsible"/>
-                        <label string="Sales Stage: " align="1.0"/>
-                        <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                        </group>
+                        <field name="user_id" select="2" string="Responsible"/>                        
+                        <field name="stage_id" select="1" string="Sales Stage" required="1" 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" select="1" string="Campaign"/>
                         <field name="section_id" colspan="1" widget="selection"/>
@@ -163,7 +159,7 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="planned_revenue"/>
                 <field name="probability"/>
-                <field name="date_deadline"/>
+                <field name="date_deadline" string="Excepted Close Date"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 30700eb0487..fdd96186e34 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
             <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
-                <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> 
+                <button string="Quotation" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> 
             </xpath>           
         </field>
     </record>

From 9287f30a5e1b149a669d4076e4a5c58827dc6792 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Wed, 3 Feb 2010 19:10:39 +0530
Subject: [PATCH 15/24] [IMP]: base_calendar: Added vtimezone mapping demo

bzr revid: rpa@openerp.co.in-20100203134039-gnhqq9hwj2r3e0ko
---
 addons/base_calendar/base_calendar_data.xml | 16 +++++++++++++---
 addons/crm/crm_meeting_data.xml             |  9 +++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
index b15cd72874e..7ebab73aca5 100644
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">	
+	<data noupdate="1">
 		
 
 		<!--		Event attributes-->
@@ -54,7 +54,12 @@
 			<field name="name">valarm</field>
 			<field name="type">vevent</field>
 		</record>
-
+		
+		<record model="basic.calendar.attributes" id="field_event_vtimezone">
+			<field name="name">vtimezone</field>
+			<field name="type">vevent</field>
+		</record>
+		
 		<record model="basic.calendar.attributes" id="field_event_priority">
 			<field name="name">priority</field>
 			<field name="type">vevent</field>
@@ -172,7 +177,12 @@
 			<field name="name">seq</field>
 			<field name="type">vtodo</field>
 		</record>
-
+		
+		<record model="basic.calendar.attributes" id="field_todo_vtimezone">
+			<field name="name">vtimezone</field>
+			<field name="type">vtodo</field>
+		</record>
+		
 		<record model="basic.calendar.attributes" id="field_todo_url">
 			<field name="name">url</field>
 			<field name="type">vtodo</field>
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index a724d185e26..58982e4dc6c 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -53,8 +53,6 @@
 			<field name="object_id" search="[('model','=','calendar.attendee')]" />
 		</record>
 		
-		
-		
         <record model="basic.calendar.fields" id="map_event_1">
             <field name="name" ref="base_calendar.field_event_uid"/>
             <field name="type_id" ref="caldav.calendar_lines_event" />
@@ -68,6 +66,13 @@
 	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
+        
+        <record model="basic.calendar.fields" id="map_event_3">
+            <field name="name" ref="base_calendar.field_event_vtimezone"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
 
         <record model="basic.calendar.fields" id="map_event_4">
 			<field name="name" ref="base_calendar.field_event_attendee" />

From d60af5a5e97f7b2e4fcd8dc91dc36119e889dc3b Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Wed, 3 Feb 2010 19:17:51 +0530
Subject: [PATCH 16/24] Improved project management

bzr revid: hda@tinyerp.com-20100203134751-u184vhz74jrphlhq
---
 addons/project/project.py                   | 13 ++++++++-----
 addons/project/project_view.xml             | 19 ++++++++++---------
 addons/project/project_wizard.xml           |  4 ++--
 addons/project/security/ir.model.access.csv |  2 ++
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index e35c94d264f..fc351f3be6e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -521,18 +521,21 @@ class message(osv.osv):
     _name = "project.message"
     _description = "Message"
     _columns = {
-        'subject': fields.char('Subject', size=128),
-        'description': fields.char('Description', size =128),
+        'subject': fields.char('Subject', size=128, required="True"),
+        'description': fields.text('Description'),
         'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
         'date': fields.date('Date'),
-        'user_id': fields.many2one('res.users', 'User'),
+        'user_id': fields.many2one('res.users', 'User', required="True"),
         }
     def _default_project(self, cr, uid, context={}):
         if 'project_id' in context and context['project_id']:
             return int(context['project_id'])
-        return False    
+        return False
+
     _defaults = {
-              'project_id':_default_project}    
+        'user_id' : lambda self,cr,uid,ctx : uid,                 
+        'project_id':_default_project}    
+
 message()
 
 def _project_get(self, cr, uid, context={}):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5c7e7fd953c..a289d5155bb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -463,7 +463,7 @@
                              <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute"/>
+                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -628,14 +628,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Messages">
-                    <group colspan="6">
-                        <field name="subject" select="1"/>
-                        <field name="description"/>
-                        <field name="project_id" />
-                        <field name="date" select="2"/>
-                        <field name="user_id" select="1"/>
-                    </group>
-                </form>
+					<group colspan="6">
+                        <field name="subject" select="1" string="Title"/>
+                        <field name="project_id"/>
+						<field name="user_id" select="1"/>
+                      	<field name="date" select="2"/>
+					 </group>
+						<separator string="Description"  colspan="4"/>
+						<field name="description"  nolabel="1" colspan="4"/>
+				</form>
             </field>
        </record>
 
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index 785dd9f599c..edb5c90a18a 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -5,11 +5,11 @@
         <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
 
         <wizard id="wizard_compute_task" model="project.task" name="wizard.compute.tasks" string="Compute Task Scheduling"/>
-		<menuitem icon="terp-project" id="menu_main" name="Project Management"/>
+		<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
 		<menuitem
             action="wizard_compute_task"
             id="menu_wizard_compute_task"
-            parent="menu_main"
+            parent="base.menu_pm_planning"
             type="wizard"
             sequence="1"/>
 
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 29d201c4c02..15f5609c88e 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
+"access_account_analytic_account_manager","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,1,1,1
 "access_project_project","project.project","model_project_project","project.group_project_user",1,0,0,0
+"access_account_analytic_account","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,0,0,0
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,1
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1

From c37f0eda2896f09f57299ed5158274522cf69250 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 19:29:26 +0530
Subject: [PATCH 17/24] [IMP]crm : lead, oppu. view

bzr revid: hmo@tinyerp.com-20100203135926-c4p57tkrp8qhhwfx
---
 addons/crm/crm_lead_view.xml        | 28 +++++++++++++++-------------
 addons/crm/crm_opportunity_view.xml | 11 ++++++-----
 addons/sale_crm/sale_crm_view.xml   |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f54114ab885..6ca24492eed 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -26,22 +26,24 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
-                <group>
-                    <group colspan="3" col="4">
+                
+                    <group colspan="4" col="4">
                         <field name="partner_name" string="Lead Name" required="1"/>
                         <field name="name" string="Lead Subject"/>
                         <field name="partner_name2" string="Contact Name"/>                    
-                        <field name="email_from" string="Email"/>                    
-                        
+                        <field name="email_from" string="Email"/>  
+                        <newline/>                  
+                        <group colspan="4" col="5">
+                            <label string="" colspan="2"/>
+                            <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
+                            <button string="Convert to Partner"
+                                        icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                                        type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                                    />
+                        </group>
                     </group>
-                    <group colspan="1" col="1">
-                    <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
-                    <button string="Convert to Partner"
-                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                            />
-                    </group>
-                    <group colspan="3" col="4">
+                    
+                    <group colspan="4" col="4">
                     <notebook>
                     <page string="Leads">
                         <separator colspan="4" string="Communication"/>                                                                        
@@ -105,7 +107,7 @@
                     </notebook>
                     </group>
 
-                </group>
+                
 
             </form>
         </field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 2c1f6aa0550..b65542e68cf 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -39,21 +39,22 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
-                <group colspan="3" col="4">                    
+                <group colspan="4" col="4">                    
                     <field name="name" select="1" string="Opportunity" colspan="4"/>
                     <field name="planned_revenue" required="1"/>
                     <field name="planned_cost"/>
                     <field name="probability"/>
                     <field name="date_deadline" string="Excepted Close Date" required="1"/>
-                    
-                </group>
-                <group colspan="1" col="1">
+                    <group colspan="4" col="5">
+                    <label string="" colspan="2"/>
                     <button string="Schedule Meeting"
                         name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
                     <button string="Schedule Call"
                         name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
                 </group>
-                <group colspan="3" col="4">
+                </group>
+                
+                <group colspan="4" col="4">
                 <notebook>
                 <page string="Opportunity">
                     <separator colspan="4" string="Communication"/>                    
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index fdd96186e34..f877dc8f825 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,7 +8,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
-            <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
+            <xpath expr="/form[@string='Opportunities']/group/group/button[@string='Schedule Call']" position="after">
                 <button string="Quotation" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/> 
             </xpath>           
         </field>

From 732d3c955f07bc2e2f28ac8aced2f81c1c71a2f3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 19:39:31 +0530
Subject: [PATCH 18/24] [IMP] crm: add the lead source into opportunity

bzr revid: sbh@tinyerp.com-20100203140931-hzzeaauia28c00bn
---
 addons/crm/wizard/crm_lead_wizard.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
index c5a2a63f2ec..bc204dc44b4 100644
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ b/addons/crm/wizard/crm_lead_wizard.py
@@ -117,6 +117,7 @@ class lead2opportunity(wizard.interface):
                 'date_deadline': lead.date_deadline,
                 'partner_address_id':lead.partner_address_id.id, 
                 'priority':lead.priority,
+                'categ_id':lead.categ_id.id,
                 'date': lead.date,
             })       
             

From ab0bc4033f14d7bd1ea08fb6b6aa61761a48c5dc Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 20:02:46 +0530
Subject: [PATCH 19/24] [Add] report_sale: add the group by in report

bzr revid: sbh@tinyerp.com-20100203143246-k9we0qe89oar3t9v
---
 addons/report_sale/report_sale_view.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 476cb5ac11b..66df3a5a80c 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -64,6 +64,11 @@
 	                    <field name="month" select="1"/>
 	                    <field name="product_id" select="1"/>
 	                    <field name="state" select="1"/>
+                   		<group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by'name"/>
+                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month"/>
+                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                    </group>	                    
                 	</group>
                 </search>
             </field>
@@ -145,6 +150,12 @@
 	                    <field name="month" select="1"/>
 	                    <field name="category_id" select="1"/>
 	                    <field name="state" select="1"/>
+                   		<group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by'name"/>
+                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month"/>
+                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="By Category" icon="terp-sale" domain="[]" context="{'group_by':'category_id'}"/>
+						</group>	                    
 					</group>
                 </search>
             </field>

From 5632cb145d00109fcbbf4da46670f13c1067cdf6 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Wed, 3 Feb 2010 20:16:18 +0530
Subject: [PATCH 20/24] Replaced resource to members in project

bzr revid: hda@tinyerp.com-20100203144618-36t0l86bpj4tiwvm
---
 addons/project/project.py       | 2 +-
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index fc351f3be6e..2a85dd7aa2f 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -108,7 +108,7 @@ class project(osv.osv):
         'category_id': fields.many2one('account.analytic.account','Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
         'priority': fields.integer('Sequence'),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."),
-        'resource_ids': fields.many2many('resource.resource', 'project_resource_rel', 'project_id', 'resource_id', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
+        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
         'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project."),
         'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project."),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c5f45397f1b..cc0d3a24ff3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -34,7 +34,7 @@
 
                             <newline/>
                             <separator colspan="4" string="Project's members"/>
-                            <field colspan="4" name="resource_ids" nolabel="1"/>
+                            <field colspan="4" name="members" nolabel="1"/>
                             <group col="9" colspan="8">
                                 <field name="state" select="1"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>

From 6a0cfe5df29e61b70bd853286ddc6d0a7c855526 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 20:20:39 +0530
Subject: [PATCH 21/24] [FIX] menu problem

bzr revid: hmo@tinyerp.com-20100203145039-yelop201b9dj0hss
---
 .../account_analytic_analysis_menu.xml                      | 1 +
 addons/crm_project/report_crm_project_bug_view.xml          | 6 +++---
 addons/hr_attendance/hr_attendance_wizard.xml               | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 6dafe28af8e..2862f7b7657 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,5 +1,6 @@
 <openerp>
     <data>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
         <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/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml
index 669707ab346..75f9818e7af 100644
--- a/addons/crm_project/report_crm_project_bug_view.xml
+++ b/addons/crm_project/report_crm_project_bug_view.xml
@@ -68,8 +68,8 @@
             <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 id="base.menu_project_report" name="Reporting" parent="project.menu_main" sequence="50"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <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"/>
 
@@ -190,4 +190,4 @@
         </record>
         <menuitem action="action_report_crm_project_bug_section_tree" id="menu_crm_project_bug_section_tree" parent="menu_crm_project_bug_tree"/>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index bdec6414246..d95c9d86d50 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -12,6 +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
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"

From 4b27f3b782d6e8dd27d9b13a98ad3e6423f372ca Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 3 Feb 2010 20:23:33 +0530
Subject: [PATCH 22/24] [Add] sale: add the group by in list view

bzr revid: sbh@tinyerp.com-20100203145333-1kx73igen389vm9q
---
 addons/report_sale/report_sale_view.xml | 9 +++++----
 addons/sale/sale_view.xml               | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 66df3a5a80c..8992e889dcd 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -65,9 +65,10 @@
 	                    <field name="product_id" select="1"/>
 	                    <field name="state" select="1"/>
                    		<group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by'name"/>
-                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month"/>
+                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by'name'}"/>
+                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>	                    
                 	</group>
                 </search>
@@ -151,8 +152,8 @@
 	                    <field name="category_id" select="1"/>
 	                    <field name="state" select="1"/>
                    		<group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by'name"/>
-                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month"/>
+                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by'name'}"/>
+                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Category" icon="terp-sale" domain="[]" context="{'group_by':'category_id'}"/>
 						</group>	                    
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f8a388cc561..df89d65c06f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -242,6 +242,11 @@
                             <filter icon="terp-sale" domain="[('user_id','child_of',[uid])]" help="My Departments Sale Orders"/>
                         </field>
                         <field name="date_order" select="1"/>
+                   		<group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By User" icon="terp-sale" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="By Parnter" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+						</group>                        
                    </group>
                </search>
             </field>

From 0610c05a4931aeca03b8077f04668101c134b00b Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 3 Feb 2010 20:46:12 +0530
Subject: [PATCH 23/24] [FIX] report_task: menu problem

bzr revid: hmo@tinyerp.com-20100203151612-u9pxaeui2b9il77p
---
 addons/crm/crm_lead_view.xml            | 2 +-
 addons/report_task/report_task_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6ca24492eed..778cf41d756 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -61,7 +61,7 @@
                             <field name="section_id" colspan="1" widget="selection"/>
                             <field name="priority" string="Priority"/>
             
-                            <field name="create_date"/>
+                            <field name="date" string="Create Date"/>
 	                    </group>
                         <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 331351803fb..77ea6e1aa5c 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -8,6 +8,7 @@
             sequence="40" />
 
         <!-- Tasks by projects and users -->
+        
 
         <record id="view_task_project_form" model="ir.ui.view">
             <field name="name">report.project.task.form</field>
@@ -81,8 +82,7 @@
             <field name="domain">[]</field>
             <field name="search_view_id" ref="view_report_task_user_pipeline_open_search"/>
         </record>
-        <menuitem id="base.menu_project_report" name="Reporting" parent="project.menu_main" sequence="50"/>
-<!--        <menuitem id="next_id_57" name="Reporting" parent="project.menu_main" sequence="50"/>-->
+        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
         <menuitem action="action_project_task" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
         <!-- Closed Task in Random Acitivities dashboard -->

From 6da6d27f86af348b918e365d3f5a22c14b8ef51b Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 4 Feb 2010 04:48:01 +0000
Subject: [PATCH 24/24] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100204044720-cy27elm82ffszrpq
bzr revid: codehost@crowberry-20100204044801-x8b3a2pt3w7kiybv
---
 addons/account/i18n/it.po                   | 15 ++++++++++-----
 addons/account_analytic_analysis/i18n/nl.po |  2 +-
 addons/account_anglo_saxon/i18n/pl.po       |  2 +-
 addons/account_followup/i18n/nl.po          |  2 +-
 addons/account_reporting/i18n/ru.po         |  2 +-
 addons/auction/i18n/pt_BR.po                |  2 +-
 addons/base_contact/i18n/nl.po              |  2 +-
 addons/base_module_merge/i18n/ru.po         |  8 ++++----
 addons/base_module_quality/i18n/ru.po       |  2 +-
 addons/base_report_creator/i18n/zh_CN.po    |  2 +-
 addons/base_setup/i18n/ru.po                |  2 +-
 addons/base_vat/i18n/ru.po                  |  2 +-
 addons/board_crm_configuration/i18n/it.po   |  2 +-
 addons/crm/i18n/es.po                       |  2 +-
 addons/crm/i18n/it.po                       |  2 +-
 addons/crm/i18n/pt_BR.po                    |  2 +-
 addons/document/i18n/nl.po                  |  2 +-
 addons/document/i18n/zh_CN.po               |  2 +-
 addons/google_map/i18n/hi.po                |  2 +-
 addons/hr/i18n/nl.po                        |  2 +-
 addons/hr_expense/i18n/nl.po                |  2 +-
 addons/olap/i18n/it.po                      |  2 +-
 addons/report_project/i18n/nl.po            |  2 +-
 addons/thunderbird/i18n/it.po               |  2 +-
 bin/addons/base/i18n/ja.po                  |  4 ++--
 25 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 58ad4f5346d..f10931214ac 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-29 14:02+0000\n"
-"Last-Translator: Carlo <Unknown>\n"
+"PO-Revision-Date: 2010-02-03 19:01+0000\n"
+"Last-Translator: Davide Corio <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -288,6 +288,11 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Se vengono utilizzati i termini di pagamento, la data di scadenza verrà "
+"calcolata automaticamente alla generazione dei movimenti contabili. Se i "
+"termini di pagamento e la data di scadenza non vengono valorizzati, equivale "
+"al pagamento diretto. Il termine di pagamento può essere calcolato a fronte "
+"di diverse scadenze, per esempio 50% subito e 50% dopo un mese."
 
 #. module: account
 #: selection:account.tax,type:0
@@ -321,7 +326,7 @@ msgstr "Origine"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Nome Movimento"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -353,7 +358,7 @@ msgstr "Tassa"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Debito Trans."
 
 #. module: account
 #: field:account.analytic.line,account_id:0
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index c3f12aef08c..e9332b8394f 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index aab9ded1466..e945c85b380 100644
--- a/addons/account_anglo_saxon/i18n/pl.po
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index d756121ab3b..c0a481b6cbc 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_reporting/i18n/ru.po b/addons/account_reporting/i18n/ru.po
index 0fac8e23859..091a5087244 100644
--- a/addons/account_reporting/i18n/ru.po
+++ b/addons/account_reporting/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index c6a12f8f1aa..8b92024b5fd 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index 21dacd2804b..7a20a160d31 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_module_merge/i18n/ru.po b/addons/base_module_merge/i18n/ru.po
index 0cb1fec8c32..33266cc8bea 100644
--- a/addons/base_module_merge/i18n/ru.po
+++ b/addons/base_module_merge/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 06:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-03 23:27+0000\n"
+"Last-Translator: Artyom Packhomov <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
@@ -60,7 +60,7 @@ msgstr "Версия"
 #: wizard_view:base_module_merge.module_merge,info:0
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module Recording"
-msgstr ""
+msgstr "Запись модуля"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po
index bd6fee8b068..4c567fde222 100644
--- a/addons/base_module_quality/i18n/ru.po
+++ b/addons/base_module_quality/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 6b64eeb3280..a702b009170 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 853d609b31b..7a50baf7b14 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index fc16d1b23f8..affbcdb6e83 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm_configuration/i18n/it.po
index dad58efb8b1..956b3c2a9f0 100644
--- a/addons/board_crm_configuration/i18n/it.po
+++ b/addons/board_crm_configuration/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 85c3f0e87cf..ebc6d8ff4fb 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 6d3527522a9..60888cc6f94 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 462d0108159..da5c5c12369 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index 5197edaa718..7baf0c24ee4 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index e13dba025e8..4a7d5cf004a 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po
index c7c53978b40..fe604b9620b 100644
--- a/addons/google_map/i18n/hi.po
+++ b/addons/google_map/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 62faff002b0..3e5abeb21e5 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index 98deba3e919..62b28b70d48 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/olap/i18n/it.po b/addons/olap/i18n/it.po
index 42cda6497d5..c50cfc04098 100644
--- a/addons/olap/i18n/it.po
+++ b/addons/olap/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/report_project/i18n/nl.po b/addons/report_project/i18n/nl.po
index 4e1ac9ed0ff..6e3ae2a1be8 100644
--- a/addons/report_project/i18n/nl.po
+++ b/addons/report_project/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/thunderbird/i18n/it.po b/addons/thunderbird/i18n/it.po
index cb65706f8ff..7bc8087525e 100644
--- a/addons/thunderbird/i18n/it.po
+++ b/addons/thunderbird/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 357c26a7786..27a26e2b559 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-02 06:00+0000\n"
+"PO-Revision-Date: 2010-02-03 05:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base