From 45e533c3b9a1d025ad60e4636779481ea5d08a88 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 22 Dec 2010 14:14:44 +0530
Subject: [PATCH 01/44] [IMP] hr_timesheet, project_timesheet: Usability
 improvements for menus.

bzr revid: uco@tinyerp.com-20101222084444-r5j9gplpgnd78z93
---
 addons/hr_timesheet/hr_timesheet_view.xml     |  6 +-----
 .../hr_timesheet_sheet_data.xml               |  7 -------
 .../hr_timesheet_sheet_view.xml               |  7 -------
 .../wizard/hr_timesheet_current_view.xml      |  4 ----
 addons/project_timesheet/__openerp__.py       |  2 +-
 .../project_timesheet_data.xml                | 20 +++++++++++++++++++
 .../project_timesheet_view.xml                |  9 +++++++--
 7 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 addons/project_timesheet/project_timesheet_data.xml

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 98c4413ade1..a8a71a19dc0 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                  parent="base.menu_main_pm" sequence="3"/>
 
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
@@ -97,8 +94,7 @@
             <field name="help">Working Hours allows you to log your working hours by project every day.</field>
         </record>
 
-    <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-    <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+        <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 14a3b51672f..be55c83e0fa 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -19,13 +19,6 @@
             <field name="icon">STOCK_JUSTIFY_FILL</field>
             <field name="action" ref="ir_actions_server_timsheet_sheet"/>
         </record>
-        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="ir_actions_server_timsheet_sheet"/>
-        </record>
 
     </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 a65a7578800..3acebb7c74a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -177,13 +177,6 @@
             <field name="help">This view allows you to check timesheet sheets following a specific period. You can also encode time spent on a project that is an analytic account and the time spent on a project generate costs on the analytic account.</field>
         </record>
 
-        <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem
-             id="base.menu_project_management_time_tracking"
-             name="Time Tracking"
-             parent="base.menu_main_pm" sequence="5"/>
-
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
              sequence="2"/>
 
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 2c87df69757..8c32cf924e7 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -28,9 +28,5 @@
 
     <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
-    <menuitem action="action_hr_timesheet_current_open"
-        id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
-        sequence="5"/>
-
     </data>
 </openerp>
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index fbf3d389739..e0defdb7e07 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -31,7 +31,7 @@
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
-    'init_xml': [],
+    'init_xml': ['project_timesheet_data.xml'],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
     'demo_xml': ["project_timesheet_demo.xml"],
     'test': [
diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml
new file mode 100644
index 00000000000..59a25c142b5
--- /dev/null
+++ b/addons/project_timesheet/project_timesheet_data.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+    
+        <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
+            <field name="name">Time Tracking</field>
+            <field eval="5" name="sequence"/>
+            <field name="parent_id" ref="base.menu_main_pm"/>
+        </record>
+
+        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
+            <field name="name">My Timesheet</field>
+            <field eval="5" name="sequence"/>
+            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
+            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
+        </record>
+    
+    </data>
+</openerp>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index d349292b997..3807271f959 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -128,7 +128,12 @@
                   parent="base.menu_main_pm" sequence="5"/>
         <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
             parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                parent="base.menu_main_pm" sequence="5"/>
+            
+        <!--
+            Time Tracking menu in project Management
+        -->
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
+        <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/>
+        
     </data>
 </openerp>

From 1e747bdebd80f9ea681fe92fa879e1324ede6425 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Wed, 22 Dec 2010 18:34:38 +0100
Subject: [PATCH 02/44] [IMP] usability : crm meeting view improvement

bzr revid: tfr@openerp.com-20101222173438-9npfct260bg1wkdu
---
 addons/base_calendar/base_calendar.py |  6 ++++--
 addons/crm/crm_meeting_view.xml       | 23 +++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 0e57c7cfb66..301780282e7 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1150,8 +1150,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                                 ('weekly', 'Weeks'),
                                 ('monthly', 'Months'),
                                 ('yearly', 'Years'), ], 'Frequency'),
-                                
-        'interval': fields.integer('Interval', help="Repeat every (Days/Week/Month/Year)"),
+          
+        'end_type' : fields.selection([('forever', 'Forever'), ('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'),
+        'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
         'count': fields.integer('Repeat', help="Repeat x times"),
         'mo': fields.boolean('Mon'),
         'tu': fields.boolean('Tue'),
@@ -1189,6 +1190,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         return res
 
     _defaults = {
+            'end_type' : 'forever',
             'state': 'tentative',
             'class': 'public',
             'show_as': 'busy',
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index c27a50cf37b..9a61fda01bd 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -169,18 +169,21 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />                               
-                                <label string="" colspan="2"/>                           
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
+                                <field name="interval" />                               
+                                                       
                                 
                                 <separator string="End of recurrency" colspan="4"/>
-                                <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
+                                <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
-                                <field name="end_date" attrs="{'readonly': [('count','!=',False)]}"/>
+                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
                                 <newline />
                            
-                                <separator string="Repeat interval" colspan="4"/>
-                                <field name="interval" /> <label string="" colspan="2"/>
+                      
                             </group>
                             <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                 <separator string="Choose day where repeat the meeting" colspan="8"/>
@@ -200,13 +203,13 @@
                                 <group col="2" colspan="1">
                                     <field name="select1" />
                                 </group>
-                                <group col="2" colspan="1"
-                                    attrs="{'invisible' : [('select1','=','day')]}">
+                                <group col="2" colspan="1">
                                     <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
                                 </group>
                                 <group col="3" colspan="1"
-                                    attrs="{'invisible' : [('select1','=','date'), ('rrule_type','=','monthly')]}">
+                                    attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
                                     <field name="byday" string="The"
                                         attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
                                     <field name="week_list" nolabel="1"

From 7d1a4cb28d6754ec55579c168be612dfe3c6311b Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Wed, 22 Dec 2010 18:36:01 +0100
Subject: [PATCH 03/44] [FIX] base_calendar view

bzr revid: tfr@openerp.com-20101222173601-y4g0x5obvc7riq41
---
 addons/base_calendar/base_calendar_view.xml | 23 ++++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a1bd8db9d54..c3e6acee07d 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -348,18 +348,21 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />                               
-                                <label string="" colspan="2"/>                           
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
+                                <field name="interval" />                               
+                                                       
                                 
                                 <separator string="End of recurrency" colspan="4"/>
-                                <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
+                                <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
-                                <field name="end_date" attrs="{'readonly': [('count','!=',False)]}"/>
+                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
                                 <newline />
                            
-                                <separator string="Repeat interval" colspan="4"/>
-                                <field name="interval" /> <label string="" colspan="2"/>
+                      
                             </group>
                             <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                 <separator string="Choose day where repeat the meeting" colspan="8"/>
@@ -379,13 +382,13 @@
                                 <group col="2" colspan="1">
                                     <field name="select1" />
                                 </group>
-                                <group col="2" colspan="1"
-                                    attrs="{'invisible' : [('select1','=','day')]}">
+                                <group col="2" colspan="1">
                                     <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
                                 </group>
                                 <group col="3" colspan="1"
-                                    attrs="{'invisible' : [('select1','=','date'), ('rrule_type','=','monthly')]}">
+                                    attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
                                     <field name="byday" string="The"
                                         attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
                                     <field name="week_list" nolabel="1"

From a057f85208852b110a849499c8d3b77f5fff438d Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 23 Dec 2010 11:00:45 +0530
Subject: [PATCH 04/44] [IMP] crm,project_issue,hr_recruitment: improve the
 tooltips and renmae the history tab to Communication history

bzr revid: sbh@tinyerp.com-20101223053045-jb6rfbwfr6ul1lin
---
 addons/crm/crm_lead.py                          | 2 +-
 addons/crm/crm_lead_view.xml                    | 6 +++---
 addons/crm/crm_opportunity_view.xml             | 2 +-
 addons/crm_claim/crm_claim_view.xml             | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml   | 2 +-
 addons/project_issue/project_issue_view.xml     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index fc2b38dcfb1..f8cf6b39930 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -125,7 +125,7 @@ class crm_lead(crm_case, osv.osv):
         'channel_id': fields.many2one('res.partner.canal', 'Channel'),
 
         'contact_name': fields.char('Contact Name', size=64), 
-        'partner_name': fields.char("Customer Name", size=64),
+        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity'),
         'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
         'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 63056b89539..119237c3824 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -57,8 +57,8 @@
                          help="Convert to Opportunity" icon="gtk-go-forward"
                          type="object"/>
                     <newline />
-                    <field name="section_id" widget="selection" />
                     <field name="user_id" />
+                    <field name="section_id" widget="selection" />
                     <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string=""
@@ -89,7 +89,7 @@
                         <field name="state_id"/>
                     </group>
                     <group colspan="2" col="3">
-                        <separator string="Communication" colspan="4" col="3"/>
+                        <separator string="Communication  History" colspan="4" col="3"/>
                         <field name="email_from" widget="email"/>
                         <newline/>
                         <field name="phone"/>
@@ -160,7 +160,7 @@
                         <field name="day_close"/>
                     </group>
                  </page>
-                 <page string="History" groups="base.group_extended">
+                 <page string="Communication &amp; History" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b5f3728443d..ee41e865b2d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -146,7 +146,7 @@
                             </group>
                         </page>
 
-                        <page string="History" groups="base.group_extended">
+                        <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                             </group>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 4b34da6a58e..520965537ba 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -168,7 +168,7 @@
                                             context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
                                             icon="terp-mail-replied" type="action" attrs="{'invisible': [('history', '!=', True)]}" />
                                     </tree>
-                                    <form string="History">
+                                    <form string="Communication &amp; History">
                                         <group col="4" colspan="4">
                                             <field name="email_from"/>
                                             <field name="date"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index c0b5fcd58d0..8c704347c67 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -140,7 +140,7 @@
                                     type="object" icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 55eaf16ff85..2fccc7cbcea 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -92,7 +92,7 @@
                                     icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 010a46faaf2..ebc22352e3a 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -135,7 +135,7 @@
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>
-                   <page string="Emails" groups="base.group_extended">
+                   <page string="Communication &amp; History" groups="base.group_extended">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                        </group>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0687c4fe26a..b40d0f42335 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -93,7 +93,7 @@
                             <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
                             <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>

From 8aaf1f2bdc2be08cb276b5ba2f89a41a46e92e5e Mon Sep 17 00:00:00 2001
From: "JAM (OpenERP)" <>
Date: Thu, 23 Dec 2010 11:04:20 +0530
Subject: [PATCH 05/44] [Fix] base_setup: Fix the currency without symbol
 returns

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

bzr revid: sbh@tinyerp.com-20101223053420-zvc2rdof61tawxa3
---
 addons/base_setup/todo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index c7478801598..f5c8c8d09a6 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -171,7 +171,7 @@ class res_currency(osv.osv):
         if isinstance(ids, (int, long)):
             ids = [ids]
         reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write')
-        return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['symbol']) + ')')   for x in reads]
+        return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads]
 
 res_currency()
 

From 8e815a464ddb49d351e25e33bea5ec5b4c0fd789 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 23 Dec 2010 11:22:10 +0530
Subject: [PATCH 06/44] [IMP] crm_claim: change string name of history tab

bzr revid: sbh@tinyerp.com-20101223055210-zmbrz83411j7uvg4
---
 addons/crm_claim/crm_claim_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 520965537ba..70772e6ebfd 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -155,7 +155,7 @@
                                     <field name="resolution" colspan="2" nolabel="1"/>
                                 </group>
                             </page>
-                            <page string="History" groups="base.group_extended">
+                            <page string="Communication &amp; History" groups="base.group_extended">
                                 <group colspan="4">
                                     <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>

From 2fd1445f10976e458110d1a20a686ec05533eaa4 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 23 Dec 2010 11:38:08 +0530
Subject: [PATCH 07/44] [IMP] project: set invisible on task work when state is
 draft

bzr revid: sbh@tinyerp.com-20101223060808-vz1u88ta4od5whgx
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5fb67b80a50..d0aa1f18e88 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -235,7 +235,7 @@
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
-                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
+                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>

From 7c46db34b05dd9ddcefc3fda55e32caf2c504886 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 23 Dec 2010 11:49:02 +0530
Subject: [PATCH 08/44] [IMP] project: Add the column in task list view

bzr revid: sbh@tinyerp.com-20101223061902-o3o2inzyd954c3n4
---
 addons/project/project_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d0aa1f18e88..fafb808ea37 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -312,8 +312,10 @@
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
-		    <field name="effective_hours" widget="float_time" sum="Spent Hours"/>                    
-		    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
+                    <field name="total_hours"/>
+                     <field name="planned_hours"/>
+                    <field name="effective_hours" widget="float_time" sum="Spent Hours"/>                    
+                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"

From abd780fd522228ebd0bb34612e1ea25ec8049999 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 23 Dec 2010 15:22:16 +0530
Subject: [PATCH 09/44] [Fix] : correct security rule of company_id

bzr revid: sbh@tinyerp.com-20101223095216-n6psmzicdcs8is8x
---
 addons/account/security/account_security.xml  | 28 +++++++++----------
 .../security/account_budget_security.xml      |  6 ++--
 .../security/account_security.xml             |  2 +-
 .../security/account_payment_security.xml     |  2 +-
 .../security/account_voucher_security.xml     |  4 +--
 .../analytic/security/analytic_security.xml   |  2 +-
 .../security/hr_timesheet_sheet_security.xml  |  2 +-
 addons/mrp/security/mrp_security.xml          |  6 ++--
 addons/product/security/product_security.xml  |  2 +-
 addons/project/security/project_security.xml  |  4 +--
 .../purchase/security/purchase_security.xml   |  4 +--
 .../security/purchase_tender.xml              |  4 +--
 addons/sale/security/sale_security.xml        |  6 ++--
 addons/stock/security/stock_security.xml      | 12 ++++----
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 5f429270e29..39ed61cc253 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -16,98 +16,98 @@
         <field name="name">Account Entry</field>
         <field ref="model_account_move" name="model_id"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_move_line_comp_rule" model="ir.rule">
          <field name="name">Entry lines</field>
         <field model="ir.model" name="model_id" ref="model_account_move_line"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
         <field name="name">Journal Period</field>
         <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_comp_rule" model="ir.rule">
         <field name="name">Journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_journal"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule_false" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
         <field name="name">Period multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_period"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
         <field name="name">Fiscal year multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
         <field name="name">Account multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_account"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
          <field name="name">Tax multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
         <field name="name">Tax code multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_invoice"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_model"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data></openerp>
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index 1fbcd82e86c..1d737d5ddd8 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -6,21 +6,21 @@
             <field name="name">Budget post multi-company</field>
             <field name="model_id" ref="model_account_budget_post"/>
             <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
         <record id="budget_comp_rule" model="ir.rule">
             <field name="name">Budget multi-company</field>
             <field name="model_id" ref="model_crossovered_budget"/>
             <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
         <record id="budget_lines_comp_rule" model="ir.rule">
             <field name="name">Budget lines multi-company</field>
             <field name="model_id" ref="model_crossovered_budget_lines"/>
             <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
     </data>
diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml
index b8fdd32ebe6..3035c8e608b 100644
--- a/addons/account_coda/security/account_security.xml
+++ b/addons/account_coda/security/account_security.xml
@@ -5,7 +5,7 @@
         <field name="name">Account Coda model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_coda"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data></openerp>
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 5977ea36365..dcd2826a65f 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -10,7 +10,7 @@
         <field name="name">Payment Mode company rule</field>
         <field model="ir.model" name="model_id" ref="model_payment_mode"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml
index df4e58484b5..d368ab858ed 100644
--- a/addons/account_voucher/security/account_voucher_security.xml
+++ b/addons/account_voucher/security/account_voucher_security.xml
@@ -5,13 +5,13 @@
             <field name="name">Voucher multi-company</field>
             <field model="ir.model" name="model_id" ref="model_account_voucher"/>
             <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
         <record id="voucher_line_comp_rule" model="ir.rule">
             <field name="name">Voucher Line multi-company</field>
             <field model="ir.model" name="model_id" ref="model_account_voucher_line"/>
             <field eval="True" name="global"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index dfa8c840bb6..58a687fee1b 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -5,7 +5,7 @@
         <field name="name">Analytic multi company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_account"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
     <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
         <field name="name">Useability / Analytic Accounting</field>
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
index af6786a2a77..f5b346af50e 100644
--- a/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
+++ b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
@@ -6,7 +6,7 @@
             <field name="name">Timesheet multi-company</field>
             <field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
+            <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
     </data>
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 1cc4c5cea9b..743432af745 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -19,21 +19,21 @@
         <field name="name">mrp_production multi-company</field>
         <field name="model_id" search="[('model','=','mrp.production')]" model="ir.model"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="mrp_workcenter_rule">
         <field name="name">mrp_workcenter multi-company</field>
         <field name="model_id" search="[('model','=','mrp.workcenter')]" model="ir.model"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="mrp_bom_rule">
         <field name="name">mrp_bom multi-company</field>
         <field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 32399358f68..ce33f8f6eec 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -20,7 +20,7 @@
         <field name="name" >Product multi-company</field>
         <field name="model_id" ref="model_product_template"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index b51a5a9c89a..3ec15131419 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -22,14 +22,14 @@
         <field name="name">Project multi-company</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">
         <field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_visibility_rule">
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index e1149c91466..e949070cc75 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -13,14 +13,14 @@
         <field name="name">Purchase Order multi-company</field>
         <field name="model_id" ref="model_purchase_order"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="purchase_order_line_comp_rule">
         <field name="name">Purchase Order Line multi-company</field>
         <field name="model_id" ref="model_purchase_order_line"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index 595b71008ef..05d76878228 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -14,14 +14,14 @@
         <field name="name">Purchase Requisition multi-company</field>
         <field name="model_id" ref="model_purchase_requisition"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="purchase_requisition_line_comp_rule">
         <field name="name">Purchase requisition Line multi-company</field>
         <field name="model_id" ref="model_purchase_requisition_line"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index e4a8a880e9c..ac4f7573c5a 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -21,14 +21,14 @@
         <field name="name">Sale Order multi-company</field>
         <field name="model_id" ref="model_sale_order"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="name">Sale Order Line multi-company</field>
         <field name="model_id" ref="model_sale_order_line"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="sale_order_personal_rule" model="ir.rule">
@@ -49,7 +49,7 @@
         <field name="name">Sale Shop multi-company</field>
         <field name="model_id" ref="model_sale_shop"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 717486413c6..dc36e193497 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -15,42 +15,42 @@
         <field name="name">stock_picking multi-company</field>
         <field name="model_id" search="[('model','=','stock.picking')]" model="ir.model"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="stock_warehouse_comp_rule">
         <field name="name">Warehouse multi-company</field>
         <field name="model_id" ref="model_stock_warehouse"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="stock_location_comp_rule">
         <field name="name">Location multi-company</field>
         <field name="model_id" ref="model_stock_location"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
      <record model="ir.rule" id="stock_move_rule">
          <field name="name">stock_move multi-company</field>
         <field name="model_id" search="[('model','=','stock.move')]" model="ir.model"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
      </record>
 
     <record model="ir.rule" id="stock_inventory_line_comp_rule">
         <field name="name">Inventory Line multi-company</field>
         <field name="model_id" ref="model_stock_inventory_line"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="stock_inventory_comp_rule">
         <field name="name">Inventory multi-company</field>
         <field name="model_id" ref="model_stock_inventory"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>

From b4e84192bb541f0d5a652fdb5c2650c60c50ca3a Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 23 Dec 2010 16:25:16 +0530
Subject: [PATCH 10/44] [Fix] add email field analyse claim report

bzr revid: sbh@tinyerp.com-20101223105516-ivc4ub35nkw0r6i9
---
 addons/crm_claim/report/crm_claim_report.py       | 4 +++-
 addons/crm_claim/report/crm_claim_report_view.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index ffb56340aac..d40bfedf2a6 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -73,6 +73,7 @@ class crm_claim_report(osv.osv):
         'date_closed': fields.date('Close Date', readonly=True), 
         'date_deadline': fields.date('Deadline', readonly=True), 
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
+        'email': fields.integer('# Emails', size=128, readonly=True),
     }
 
     def init(self, cr):
@@ -103,13 +104,14 @@ class crm_claim_report(osv.osv):
                     c.type_action as type_action,
                     date_trunc('day',c.create_date) as create_date,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
+                    (SELECT count(id) FROM mailgate_message WHERE model='crm.helpdesk' AND res_id=c.id AND history=True) AS email,
                     extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected
                 from
                     crm_claim c
                 group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\
                         c.state, c.user_id,c.section_id, c.stage_id,\
                         c.categ_id,c.partner_id,c.company_id,c.create_date,
-                        c.priority,c.type_action,c.date_deadline,c.date_closed
+                        c.priority,c.type_action,c.date_deadline,c.date_closed,c.id
             )""")
 
 crm_claim_report()
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index ca1c03a58ae..d1038ca4ec1 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -19,6 +19,7 @@
                     <field name="day" invisible="1"/>
                     <field name="nbr" string="#Claim" sum="#Claim"/>
                     <field name="delay_close" avg="Avg Closing Delay"/>
+                    <field name="email"/>
                     <field name="delay_expected"/>
                     <field name="state" invisible="1"/>
                     <field name="stage_id" invisible="1"/>

From d1aaeb22512d9ee730e706d950a0421c940f1169 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 23 Dec 2010 16:33:54 +0530
Subject: [PATCH 11/44] [Fix] add probability field analyse claim report

bzr revid: sbh@tinyerp.com-20101223110354-k2c25hfmvutipysp
---
 addons/crm_claim/report/crm_claim_report.py       | 4 +++-
 addons/crm_claim/report/crm_claim_report_view.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index d40bfedf2a6..a5d2f8e88be 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -74,6 +74,7 @@ class crm_claim_report(osv.osv):
         'date_deadline': fields.date('Deadline', readonly=True), 
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
         'email': fields.integer('# Emails', size=128, readonly=True),
+         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg")
     }
 
     def init(self, cr):
@@ -104,7 +105,8 @@ class crm_claim_report(osv.osv):
                     c.type_action as type_action,
                     date_trunc('day',c.create_date) as create_date,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.helpdesk' AND res_id=c.id AND history=True) AS email,
+                    (SELECT count(id) FROM mailgate_message WHERE model='crm.claim' AND res_id=c.id AND history=True) AS email,
+                    (SELECT avg(probability) FROM crm_case_stage WHERE type='claim' AND id=c.stage_id) AS probability,
                     extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected
                 from
                     crm_claim c
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index d1038ca4ec1..997720b2d64 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -20,6 +20,7 @@
                     <field name="nbr" string="#Claim" sum="#Claim"/>
                     <field name="delay_close" avg="Avg Closing Delay"/>
                     <field name="email"/>
+                    <field name="probability" widget="progressbar"/>
                     <field name="delay_expected"/>
                     <field name="state" invisible="1"/>
                     <field name="stage_id" invisible="1"/>

From 554050f254f3f7f8b3c1183e173fdd6e35fd16d7 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 23 Dec 2010 17:08:40 +0100
Subject: [PATCH 12/44] [IMP] caldav doc

bzr revid: tfr@openerp.com-20101223160840-c6fx1ffcfawy7kr5
---
 addons/base_calendar/base_calendar_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index c3e6acee07d..aeaaa356cd9 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!--        Attendee form view-->
+        <!-- Attendee form view-->
 
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>

From 4f384f74c8cbc53c3f5846b40386525bbcdb546a Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Fri, 24 Dec 2010 12:51:50 +0100
Subject: [PATCH 13/44] [IMP] email_template : use global server to send email

bzr revid: tfr@openerp.com-20101224115150-zs6zym9knapgc3e2
---
 .../email_template/email_template_mailbox.py  | 58 ++++++++++++++-----
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index 2fb3b0fa54c..acde96dafd4 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -25,6 +25,7 @@ import time
 import netsvc
 from tools.translate import _
 import tools
+import base64
 
 LOGGER = netsvc.Logger()
 
@@ -68,22 +69,49 @@ class email_template_mailbox(osv.osv):
             try:
                 account_obj = self.pool.get('email_template.account')
                 values = self.read(cr, uid, id, [], context) 
-                payload = {}
+                #payload = {}
+                attach_to_send = None
                 if values['attachments_ids']:
-                    for attid in values['attachments_ids']:
-                        attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
-                        payload[attachment.datas_fname] = attachment.datas
-                result = account_obj.send_mail(cr, uid,
-                              [values['account_id'][0]],
-                              {'To':values.get('email_to') or u'',
-                               'CC':values.get('email_cc') or u'',
-                               'BCC':values.get('email_bcc') or u'',
-                               'Reply-To':values.get('reply_to') or u''},
-                              values['subject'] or u'',
-                              {'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
-                              payload=payload,
-                              message_id=values['message_id'], 
-                              context=context)
+                    #for attid in values['attachments_ids']:
+                        #attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
+                        #payload[attachment.datas_fname] = attachment.datas
+                    attach_to_send = self.pool.get('ir.attachment').read(cr, uid, values['attachments_ids'], ['datas_fname','datas', 'name'])
+                    attach_to_send = map(lambda x: (x['datas_fname'] or x['name'], base64.decodestring(x['datas'])), attach_to_send)
+                #work around to uniformize send email while waiting for a merge of fetchmail, email_template, mailgate
+                #using tools.send_email instead
+                #No need to use email account
+                #result = account_obj.send_mail(cr, uid,
+                #              [values['account_id'][0]],
+                #              {'To':values.get('email_to') or u'',
+                #               'CC':values.get('email_cc') or u'',
+                #               'BCC':values.get('email_bcc') or u'',
+                #               'Reply-To':values.get('reply_to') or u''},
+                #              values['subject'] or u'',
+                #              {'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
+                #              payload=payload,
+                #              message_id=values['message_id'], 
+                #              context=context)
+                if values.get('body_html'):
+                    body = values.get('body_html')
+                    subtype = "html"
+                else :
+                    body = values.get('body_text')
+                    subtype = "plain"
+                    
+                result = tools.email_send(
+                    values.get('email_from') or u'',
+                    [values.get('email_to')],
+                    values['subject'] or u'', 
+                    body or u'',
+                    reply_to=values.get('reply_to') or u'',
+                    email_bcc=values.get('email_bcc') or u'',
+                    email_cc=values.get('email_cc') or u'',
+                    subtype=subtype,
+                    attach=attach_to_send,
+                    openobject_id=values['message_id']
+                )
+                
+
                 if result == True:
                     account = account_obj.browse(cr, uid, values['account_id'][0], context=context)
                     if account.auto_delete:

From 72fa0580cdf3bc113dde2a0eee75f04cdf7fe67a Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Mon, 27 Dec 2010 14:00:00 +0530
Subject: [PATCH 14/44] [REM] crm: remove print statement

bzr revid: sbh@tinyerp.com-20101227083000-6n5536k753i5t1y9
---
 addons/crm/crm.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index bcc0bfde273..311822376eb 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -192,7 +192,6 @@ class crm_case(object):
         return uid
 
     def _get_section(self, cr, uid, context=None):
-        print "<<<<<<_get_section_get_section<<<<<<<<<<<<<"
         """Gives section id for current User
         @param self: The object pointer
         @param cr: the current row, from the database cursor,

From 4c44688e015b6263db07d2c8aeac273158492461 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Dec 2010 16:10:46 +0530
Subject: [PATCH 15/44] [FIX] crm: Removed section_id field to fix type error
 on web-client.

bzr revid: uco@tinyerp.com-20101227104046-72l8uzq298rvwop5
---
 addons/crm/res_partner_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index e4b228e0bb9..dc689e25abd 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -22,8 +22,6 @@
                              <button name="stage_next" string="Next"
                                  states="open,pending" type="object"
                                  icon="gtk-go-forward" />
-                             <field name="section_id"
-                                 invisible="context.get('invisible_section', True)" />
                              <field name="user_id" />
                              <field name="state" />
                              <button name="case_cancel" string="Cancel"
@@ -73,8 +71,7 @@
 
                     <field name="date" required="1"/>
                     <field name="user_id"/>
-                    <field name="section_id" colspan="1" widget="selection" />
-                    <button string="aaaaaaaaaConvert to Opportunity"
+                    <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />

From c3098f4f437708c7b2d6d4a52cd02950c5b67f31 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 28 Dec 2010 16:14:45 +0530
Subject: [PATCH 16/44] [FIX] account..l10n_ch: Pass return {'type':
 'ir.actions.act_window_close'} instead of return {} in osv_memory/normal
 wizards.(lp:691544)

bzr revid: uco@tinyerp.com-20101228104445-h5q9jg8mq7dmdc51
---
 addons/account/wizard/account_change_currency.py            | 2 +-
 addons/account/wizard/account_fiscalyear_close.py           | 2 +-
 addons/account/wizard/account_fiscalyear_close_state.py     | 2 +-
 addons/account/wizard/account_invoice_state.py              | 4 ++--
 addons/account/wizard/account_open_closed_fiscalyear.py     | 2 +-
 addons/account/wizard/account_period_close.py               | 2 +-
 addons/account/wizard/account_reconcile.py                  | 6 +++---
 addons/account/wizard/account_reconcile_partner_process.py  | 2 +-
 addons/account/wizard/account_state_open.py                 | 2 +-
 addons/account/wizard/account_unreconcile.py                | 4 ++--
 addons/account/wizard/account_validate_account_move.py      | 4 ++--
 .../wizard/analytic_plan_create_model.py                    | 2 +-
 addons/account_payment/wizard/account_payment_order.py      | 4 ++--
 addons/account_payment/wizard/account_payment_pay.py        | 2 +-
 .../wizard/account_payment_populate_statement.py            | 2 +-
 .../wizard/account_statement_from_invoice.py                | 6 +++---
 .../account_voucher/wizard/account_voucher_unreconcile.py   | 2 +-
 addons/auction/wizard/auction_aie_send.py                   | 2 +-
 addons/auction/wizard/auction_aie_send_result.py            | 2 +-
 addons/auction/wizard/auction_lots_able.py                  | 2 +-
 addons/auction/wizard/auction_lots_auction_move.py          | 4 ++--
 addons/auction/wizard/auction_lots_buyer_map.py             | 2 +-
 addons/auction/wizard/auction_lots_cancel.py                | 2 +-
 addons/auction/wizard/auction_lots_enable.py                | 2 +-
 addons/auction/wizard/auction_lots_numerotate.py            | 2 +-
 addons/auction/wizard/auction_pay_buy.py                    | 2 +-
 addons/auction/wizard/auction_pay_sel.py                    | 2 +-
 addons/auction/wizard/auction_payer_sel.py                  | 4 ++--
 addons/auction/wizard/auction_transfer_unsold_object.py     | 2 +-
 .../base_calendar/wizard/base_calendar_invite_attendee.py   | 6 +++---
 addons/base_calendar/wizard/base_calendar_set_exrule.py     | 2 +-
 addons/base_calendar/wizard/calendar_event_edit_all.py      | 2 +-
 .../base_module_doc_rst/wizard/generate_relation_graph.py   | 2 +-
 addons/base_module_record/wizard/base_module_record_data.py | 2 +-
 .../base_module_record/wizard/base_module_record_objects.py | 2 +-
 addons/base_report_creator/wizard/report_menu_create.py     | 4 ++--
 addons/base_report_creator/wizard/wiz_set_filter_fields.py  | 4 ++--
 addons/board/wizard/board_menu_create.py                    | 2 +-
 addons/crm/wizard/crm_add_note.py                           | 2 +-
 addons/crm/wizard/crm_lead_to_opportunity.py                | 2 +-
 addons/crm/wizard/crm_merge_opportunities.py                | 2 +-
 addons/crm/wizard/crm_send_email.py                         | 4 ++--
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py  | 2 +-
 addons/delivery/wizard/delivery_sale_order.py               | 2 +-
 addons/event/wizard/event_confirm.py                        | 2 +-
 addons/event/wizard/event_confirm_registration.py           | 2 +-
 addons/event_project/wizard/event_project_retro.py          | 2 +-
 addons/hr_attendance/wizard/hr_attendance_sign_in_out.py    | 4 ++--
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py      | 6 +++---
 addons/idea/wizard/idea_post_vote.py                        | 2 +-
 addons/l10n_ch/wizard/bvr_import.py                         | 2 +-
 51 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index 47f9ac9c2c8..d915a1cd34b 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -72,7 +72,7 @@ class account_change_currency(osv.osv_memory):
                 new_price = (line.price_unit / old_rate ) * rate
             obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
         obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_change_currency()
 
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 42383341828..6190f792c7f 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -215,7 +215,7 @@ class account_fiscalyear_close(osv.osv_memory):
         cr.execute('UPDATE account_fiscalyear ' \
                     'SET end_journal_period_id = %s ' \
                     'WHERE id = %s', (ids[0], old_fyear.id))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close()
 
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 9a559d039da..abf054746ce 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -57,7 +57,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
             fy_pool = self.pool.get('account.fiscalyear')
             fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
             fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close_state()
 
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 2e7a519aa34..7adcb908a34 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -43,7 +43,7 @@ class account_invoice_confirm(osv.osv_memory):
             if record['state'] not in ('draft','proforma','proforma2'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
             wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_invoice_confirm()
 
@@ -67,7 +67,7 @@ class account_invoice_cancel(osv.osv_memory):
             if record['state'] in ('cancel','paid'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
             wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_invoice_cancel()
 
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index 582bbc36619..541e7b2cbdb 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -42,7 +42,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
             cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_open_closed_fiscalyear()
 
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 3b3acecc389..5b7589d7830 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -50,7 +50,7 @@ class account_period_close(osv.osv_memory):
                     # Log message for Period
                     for period_id, name in period_pool.name_get(cr, uid, [id]):
                         period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_period_close()
 
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index f89ffb47a76..8131f6a9668 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -101,7 +101,7 @@ class account_move_line_reconcile(osv.osv_memory):
                 context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                                         period_id, journal_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_move_line_reconcile()
 
@@ -145,7 +145,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         if context is None:
             context = {}
         account_move_line_obj.reconcile_partial(cr, uid, context['active_ids'], 'manual', context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def trans_rec_reconcile(self, cr, uid, ids, context=None):
         account_move_line_obj = self.pool.get('account.move.line')
@@ -169,7 +169,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                 period_id, journal_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_move_line_reconcile_writeoff()
 
diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index 9f91d1ec2d2..7cfeff70891 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -83,7 +83,7 @@ class account_partner_reconcile_process(osv.osv_memory):
             res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
         #TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
         #TODO: remove that comments when the client side dev is done
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     _columns = {
         'to_reconcile': fields.float('Remaining Partners', readonly=True, help='This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled.'),
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index 2a03a80aefa..81705771d67 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -37,7 +37,7 @@ class account_state_open(osv.osv_memory):
                 raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
             wf_service = netsvc.LocalService("workflow")
             res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_state_open()
 
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 3a067b4a598..0e6c38f9d7c 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -31,7 +31,7 @@ class account_unreconcile(osv.osv_memory):
             context = {}
         if context.get('active_ids', False):
             obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_unreconcile()
 
@@ -46,7 +46,7 @@ class account_unreconcile_reconcile(osv.osv_memory):
         rec_ids = context['active_ids']
         if rec_ids:
             obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_unreconcile_reconcile()
 
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index f840d2b5532..ddcfa2c5353 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -38,7 +38,7 @@ class validate_account_move(osv.osv_memory):
         if not ids_move:
             raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
         obj_move.button_validate(cr, uid, ids_move, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 validate_account_move()
 
@@ -60,7 +60,7 @@ class validate_account_move_lines(osv.osv_memory):
         if not move_ids:
             raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
         obj_move.button_validate(cr, uid, move_ids, context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 validate_account_move_lines()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index 0581197aaca..1cd3022f60b 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -53,7 +53,7 @@ class analytic_plan_create_model(osv.osv_memory):
                 'target': 'new',
             }
         else:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 analytic_plan_create_model()
 
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index b8328aee333..eb0d8b21926 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -65,7 +65,7 @@ class payment_order_create(osv.osv_memory):
         data = self.read(cr, uid, ids, [], context=context)[0]
         line_ids = data['entries']
         if not line_ids:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         payment = order_obj.browse(cr, uid, context['active_id'], context=context)
         t = None
@@ -90,7 +90,7 @@ class payment_order_create(osv.osv_memory):
                 'date': date_to_pay,
                 'currency': line.invoice and line.invoice.currency_id.id or False,
                 }, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def search_entries(self, cr, uid, ids, context=None):
         line_obj = self.pool.get('account.move.line')
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 6627ffaa614..ca9311b1f88 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -37,7 +37,7 @@ class account_payment_make_payment(osv.osv_memory):
 #        obj_act = self.pool.get('ir.actions.act_window')
 #        order = obj_payment_order.browse(cr, uid, context['active_id'], context)
         obj_payment_order.set_done(cr, uid, [context['active_id']], context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 #        t = order.mode and order.mode.type.code or 'manual'
 #        if t == 'manual':
 #            obj_payment_order.set_done(cr,uid,context['active_id'],context)
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index f99189a8444..340ab4bcb03 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -65,7 +65,7 @@ class account_payment_populate_statement(osv.osv_memory):
         data = self.read(cr, uid, ids, [], context=context)[0]
         line_ids = data['lines']
         if not line_ids:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         statement = statement_obj.browse(cr, uid, context['active_id'], context=context)
 
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index fa1a66e0135..a9fb7d10a32 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -39,11 +39,11 @@ class account_statement_from_invoice_lines(osv.osv_memory):
             context = {}
         statement_id = context.get('statement_id', False)
         if not statement_id:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
         data =  self.read(cr, uid, ids, context=context)[0]
         line_ids = data['line_ids']
         if not line_ids:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         line_obj = self.pool.get('account.move.line')
         statement_obj = self.pool.get('account.bank.statement')
@@ -115,7 +115,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 'voucher_id': voucher_id,
                 'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
             }, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_statement_from_invoice_lines()
 
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index 2bfdfd1ecf8..42a9e1c5ec2 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -55,7 +55,7 @@ class account_voucher_unreconcile(osv.osv_memory):
 #                wf_service = netsvc.LocalService("workflow")
 #                wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_voucher_unreconcile()
 
diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py
index 7c904cf850b..1caec13b852 100644
--- a/addons/auction/wizard/auction_aie_send.py
+++ b/addons/auction/wizard/auction_aie_send.py
@@ -220,7 +220,7 @@ class auction_lots_send_aie(osv.osv_memory):
     def send_pdf(self, cr, uid, ids, context=None):
         threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 auction_lots_send_aie()
 
diff --git a/addons/auction/wizard/auction_aie_send_result.py b/addons/auction/wizard/auction_aie_send_result.py
index 5b2b4eca7fd..d6102dd0522 100644
--- a/addons/auction/wizard/auction_aie_send_result.py
+++ b/addons/auction/wizard/auction_aie_send_result.py
@@ -137,7 +137,7 @@ class auction_lots_pay(osv.osv_memory):
         lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'],  ['obj_num','obj_price'])
         args = pickle.dumps(lots)
         self._catalog_send(datas['uname'], datas['password'], datas['dates'], args)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_pay()
 
diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
index 369d762727a..8604d691456 100644
--- a/addons/auction/wizard/auction_lots_able.py
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -41,6 +41,6 @@ class auction_lots_able(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'ach_emp':True})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_able()
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
index 97330f922fe..cc698887afd 100644
--- a/addons/auction/wizard/auction_lots_auction_move.py
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -52,7 +52,7 @@ class auction_lots_auction_move(osv.osv_memory):
         rec_ids =  auction_lots_obj.browse(cr, uid, context.get('active_ids', []))
         for current in self.browse(cr, uid, ids, context=context):
             if not (current.auction_id and len(context.get('active_ids', []))):
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
 
             for rec in rec_ids:
                 new_id = auction_lot_history_obj.create(cr, uid, {
@@ -70,7 +70,7 @@ class auction_lots_auction_move(osv.osv_memory):
                     'sel_inv_id': None,
                     'obj_num': None,
                     'state': 'draft'})
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 auction_lots_auction_move()
 
diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
index e50f11fd1ec..436d51a66c7 100644
--- a/addons/auction/wizard/auction_lots_buyer_map.py
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -90,7 +90,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
             for lots in lots_obj.browse(cr, uid, rec_ids, context=context):
                 if lots.ach_login == current.ach_login:
                     lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
                         context=None, toolbar=False, submenu=False):
diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
index 62313315bd9..3974241a071 100644
--- a/addons/auction/wizard/auction_lots_cancel.py
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -49,7 +49,7 @@ class auction_lots_cancel(osv.osv):
                     supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id])
             if lot.sel_inv_id:
                     customer_refund_inv_id = invoice_obj.refund(cr, uid, [lot.sel_inv_id.id])
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
                 
         _columns = {
         }
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
index ed6b8950d2e..290664ba697 100644
--- a/addons/auction/wizard/auction_lots_enable.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -38,6 +38,6 @@ class auction_lots_enable(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_id',False), {'ach_emp':False})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_enable()
diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py
index 0712e21565e..22bdac5a67f 100644
--- a/addons/auction/wizard/auction_lots_numerotate.py
+++ b/addons/auction/wizard/auction_lots_numerotate.py
@@ -178,7 +178,7 @@ class auction_lots_numerotate(osv.osv_memory):
         for rec_id in rec_ids:
             lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr})
             nbr+=1
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_numerotate()
 
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index dfad93dc759..b914dd1c643 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -100,7 +100,7 @@ class auction_pay_buy(osv.osv_memory):
                         })
                     for lot in lots:
                         lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 auction_pay_buy()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 7265a4e7f98..77484bbe988 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -52,6 +52,6 @@ class auction_pay_sel(osv.osv_memory):
             journal_id = datas.get('journal_id', False)
             if lot.sel_inv_id:
                 p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 auction_pay_sel()
diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py
index 808826cfc23..8ad2f5ca019 100644
--- a/addons/auction/wizard/auction_payer_sel.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -29,7 +29,7 @@ class auction_payer(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_payer()
 
@@ -50,7 +50,7 @@ class auction_payer_sel(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'paid_vnd':True})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_payer_sel()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
index 8bc0cb8cb5b..f593a36de2e 100644
--- a/addons/auction/wizard/auction_transfer_unsold_object.py
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -82,6 +82,6 @@ class auction_transfer_unsold_object(osv.osv):
                                                                                                 'ach_inv_id':None,
                                                                                                 'sel_inv_id':None,
                                                                                                 'state':'draft'})
-            return {}    
+            return {'type': 'ir.actions.act_window_close'}    
         
 auction_transfer_unsold_object()
\ No newline at end of file
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 48f39e609f9..ea4d5aca85f 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -68,7 +68,7 @@ send an Email to Invited Person')
         model = False
         context_id = context and context.get('active_id', False) or False
         if not context or not context.get('model'):
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
         else:
             model = context.get('model')
 
@@ -89,7 +89,7 @@ send an Email to Invited Person')
                 if context_id:
                     ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
                 else:
-                    return {}
+                    return {'type': 'ir.actions.act_window_close'}
             if type == 'internal':
                 
                 if not datas.get('user_ids'):
@@ -144,7 +144,7 @@ send an Email to Invited Person')
                 att_obj._send_mail(cr, uid, attendees, mail_to, \
                        email_from = current_user.user_email or tools.config.get('email_from', False))
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
index 4f5d57235e5..80fe1e44720 100644
--- a/addons/base_calendar/wizard/base_calendar_set_exrule.py
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py
@@ -150,7 +150,7 @@ class base_calendar_set_exrule(osv.osv_memory):
                                 + enddate + monthstring + yearstring
 
             model_obj.write(cr, uid, ex_id,{'exrule': exrule_string})
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         _defaults = {
          'freq': lambda *x: 'None',
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index a9b0a9f347e..23f67f579f2 100644
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -78,7 +78,7 @@ class calendar_event_edit_all(osv.osv_memory):
                 model = context.get('model', False)
                 model_obj = self.pool.get(model)
                 model_obj.modify_all(cr, uid, [context_id], datas, context=context)
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
 
     _name = "calendar.event.edit.all"
     _description = "Calendar Edit all event"
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph.py b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
index 7b04f183129..9f789f0cc7a 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph.py
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
@@ -35,7 +35,7 @@ def _get_graph(self, cr, uid, datas, context=None):
         module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
         if module_data['module_file']:
             mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 class create_graph(wizard.interface):
     states = {
diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py
index 8071a01ab11..fa9c8a6826e 100644
--- a/addons/base_module_record/wizard/base_module_record_data.py
+++ b/addons/base_module_record/wizard/base_module_record_data.py
@@ -100,7 +100,7 @@ def _record_objects(self, cr, uid, data, context):
         for s_id in search_ids:
              args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
              mod.recording_data.append(('query',args, {}, s_id))
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 def _check(self, cr, uid, data, context):
      pool = pooler.get_pool(cr.dbname)
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
index 065e69c171b..9b92a751cdc 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -90,7 +90,7 @@ def _record_objects(self, cr, uid, data, context):
         for s_id in search_ids:
              args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
              mod.recording_data.append(('query',args, {}, s_id))
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 def inter_call(self,cr,uid,data,context):
     res=base_module_save._create_module(self,cr, uid, data, context)
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index efa61c556d1..f209bd05526 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -49,7 +49,7 @@ class report_menu_create(osv.osv_memory):
         if context_id:
             data = self.browse(cr, uid, ids, context=context)
             if not data:
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
             data = data[0]
 
             board = obj_board.browse(cr, uid, context_id, context=context)
@@ -77,7 +77,7 @@ class report_menu_create(osv.osv_memory):
                 'action': 'ir.actions.act_window, ' + str(action_id)
                 }, context=context)
             obj_board.write(cr, uid, context_id, {'menu_id': menu_id})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 report_menu_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index dc7c977e694..0903f968eea 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -145,7 +145,7 @@ def _set_filter_value(self, cr, uid, data, context):
                            'condition' : form_data['condition']
                            }
             pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context)
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 def _set_form_value(self, cr, uid, data, context):
     field_id = data['form']['field_id']
@@ -199,7 +199,7 @@ def _set_operator(self, cr, uid, data, context):
     elif field.ttype in ('boolean', 'selection'):
         operator.append(('=','Equals'))
         operator.append(('<>','Not Equals'))
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 class set_filter_fields(wizard.interface):
     states = {
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 2b688962265..10d4d80a7f3 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -78,7 +78,7 @@ class board_menu_create(osv.osv_memory):
                 'action': 'ir.actions.act_window,' + str(action_id)
                 }, context=context)
         #End Loop
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     _name = "board.menu.create"
     _description = "Menu Create"
diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py
index 3c57156a23f..80e6fc6cad2 100644
--- a/addons/crm/wizard/crm_add_note.py
+++ b/addons/crm/wizard/crm_add_note.py
@@ -50,7 +50,7 @@ class crm_add_note(osv.osv_memory):
                 act = 'case_' + obj.state
                 getattr(case_pool, act)(cr, uid, [case.id])
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields, context=None):
         """
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 7fed3cc742c..b8cdb9feb79 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -48,7 +48,7 @@ class crm_lead2opportunity(osv.osv_memory):
         """
         record_id = context and context.get('active_id') or False
         if not record_id:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         leads = self.pool.get('crm.lead')
         models_data = self.pool.get('ir.model.data')
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 82463c29cf9..dde529b6002 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -108,7 +108,7 @@ class crm_merge_opportunity(osv.osv_memory):
             elif this.state in ['cancel', 'open', 'pending']:
                 act = 'case_' + this.state
                 getattr(opp_obj, act)(cr, uid, [record_id])
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     _columns = {
         'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index eeb635b7c3b..3ce5942272d 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -156,7 +156,7 @@ class crm_send_new_email(osv.osv_memory):
                 act = 'case_' + obj.state
                 getattr(case_pool, act)(cr, uid, [case.id])
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -217,7 +217,7 @@ class crm_send_new_email(osv.osv_memory):
 
             # In the case where the crm.case does not exist in the database
             if not model:
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
 
             model_pool = self.pool.get(model)
             res_id = hist.res_id
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index fdb7acff35c..64042c8954d 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -198,7 +198,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         to_write.update({'email_cc' : ', '.join(new_cc) })
         case_pool.write(cr, uid, case.id, to_write, context=context)
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
         body = []
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index f20426bbc35..f8bb87cf38c 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -113,7 +113,7 @@ class make_delivery(osv.osv_memory):
                     'type': 'make_to_stock'
                 })
     
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 make_delivery()
 
diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
index 8151c7ae9e9..e21d523bb12 100644
--- a/addons/event/wizard/event_confirm.py
+++ b/addons/event/wizard/event_confirm.py
@@ -30,7 +30,7 @@ class event_confirm(osv.osv_memory):
 
     def confirm(self, cr, uid, ids, context=None):
         self.pool.get('event.event').do_confirm(cr, uid, context.get('event_ids', []), context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 event_confirm()
 
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
index a2fe8170bfd..b122cde02a0 100644
--- a/addons/event/wizard/event_confirm_registration.py
+++ b/addons/event/wizard/event_confirm_registration.py
@@ -63,7 +63,7 @@ class event_confirm_registration(osv.osv_memory):
         registration_pool = self.pool.get('event.registration')
         registration_ids = context.get('registration_ids', [])
         registration_pool.do_open(cr, uid, registration_ids, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 event_confirm_registration()
 
diff --git a/addons/event_project/wizard/event_project_retro.py b/addons/event_project/wizard/event_project_retro.py
index ada9b7fa17b..c7eba5e0ec1 100644
--- a/addons/event_project/wizard/event_project_retro.py
+++ b/addons/event_project/wizard/event_project_retro.py
@@ -76,7 +76,7 @@ class event_project(osv.osv_memory):
                     })
             event_obj.write(cr, uid, [event.id], {'project_id': duplicate_project_id })
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 event_project()
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 4e079584053..ed08ee93174 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -160,7 +160,7 @@ class hr_sign_in_out(osv.osv_memory):
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
         except:
             raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
-        return {} # To do: Return Success message
+        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
 
     def sign_out(self, cr, uid, data, context=None):
         emp_id = data['emp_id']
@@ -172,7 +172,7 @@ class hr_sign_in_out(osv.osv_memory):
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
         except:
             raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
-        return {} # To do: Return Success message
+        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
 
 hr_sign_in_out()
 
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 596076cf336..90c9a5d7b8c 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -93,7 +93,7 @@ class hr_so_project(osv.osv_memory):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def sign_out_result(self, cr, uid, ids, context=None):
         emp_obj = self.pool.get('hr.employee')
@@ -101,7 +101,7 @@ class hr_so_project(osv.osv_memory):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 hr_so_project()
 
@@ -157,7 +157,7 @@ class hr_si_project(osv.osv_memory):
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(hr_si_project, self).default_get(cr, uid, fields_list, context=context)
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index 712f84d4053..b54c007549d 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -126,7 +126,7 @@ class idea_post_vote(osv.osv_memory):
 
             idea_pool._vote_save(cr, uid, vote_id, None, score, context)
             #vote = vote_pool.create(cr, uid, vote)
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 idea_post_vote()
 
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 26630bbdd53..3be42db982f 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -256,7 +256,7 @@ class bvr_import_wizard(osv.osv_memory):
         if res:
             data['form']['file'] = res['file']
         _import(self, cr, uid, data, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 bvr_import_wizard()
 

From acacf36ebb8dd7f2d736e19cbfc70ed22b867fdc Mon Sep 17 00:00:00 2001
From: "JAM(OpenERP)" <>
Date: Tue, 28 Dec 2010 16:20:18 +0530
Subject: [PATCH 17/44] [Fix] fetchmail: fix Fetchmail Services

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

bzr revid: sbh@tinyerp.com-20101228105018-yp98e3xyrsgxu08g
---
 addons/fetchmail/fetchmail.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 772771db915..a1209492490 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -84,9 +84,11 @@ class email_server(osv.osv):
     def check_model(self, cr, uid, ids, context = None):
         if context is None:
             context = {}
-        current_rec = self.read(cr, uid, ids, context)[0]
+        current_rec = self.read(cr, uid, ids, context)
         if current_rec:
-            model = self.pool.get(current_rec.get('object_id')[1])
+            current_rec = current_rec[0]
+            model_name = self.pool.get('ir.model').browse(cr, uid, current_rec.get('object_id')[0]).model
+            model = self.pool.get(model_name)
             if hasattr(model, 'message_new'):
                 return True
         return False

From e0432a6800c5161892b35f3af858f7c3892598e2 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Wed, 29 Dec 2010 11:15:21 +0530
Subject: [PATCH 19/44] [FIX-BUG: lp:695038 OO-OReport Desiner]

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

bzr revid: jam@tinyerp.com-20101229054521-p6lcfprxoi1ts4ib
---
 addons/base_report_designer/__openerp__.py    |   3 +--
 .../plugin/openerp_report_designer.zip        | Bin 116430 -> 116242 bytes
 .../bin/script/ServerParameter.py             |  12 ----------
 .../security/base_report_security.xml         |  22 ------------------
 4 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 addons/base_report_designer/security/base_report_security.xml

diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 9d39bba8a61..88f4d9d5a81 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -36,8 +36,7 @@ upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['security/base_report_security.xml',
-                 'wizard/base_report_design_view.xml'],
+    'init_xml': ['wizard/base_report_design_view.xml'],
     'update_xml': ['base_report_designer_installer.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip
index 50524b2e60d0c04c4d05d9e3f61b03d0c9cfdb5b..47ca560e47d87b5901a35b35aaa2cca4f7006603 100644
GIT binary patch
delta 24305
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

delta 24402
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
DI$#0`

diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index 123be9b9bc2..3cf759e7ada 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -140,28 +140,16 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
             ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
             self.win.endExecute()
         try:
-
-            ids  = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' ,  'search', [('name','=','OpenOfficeReportDesigner')])
             ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
-            dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
         except :
             import traceback,sys
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
             self.logobj.log_write('ServerParameter', LOG_ERROR, info)
 
-        if not len(ids) :
-            ErrorDialog("Group Not Found!!!  Create a group  named  \n\n"'"OpenOfficeReportDesigner"'"  \n\n  ","","Group Name Error")
-            self.logobj.log_write('Group Error',LOG_WARNING, ':Create a  group OpenOfficeReportDesigner   using database %s' % (sDatabase))
-            self.win.endExecute()
         if not len(ids_module):
             ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
             self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
             self.win.endExecute()
-
-        if UID not in dict_groups[0]['users']:
-            ErrorDialog("Connection Refuse...","You have not access these Report Designer")
-            self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
-            self.win.endExecute()
         else:
             desktop=getDesktop()
             doc = desktop.getCurrentComponent()
diff --git a/addons/base_report_designer/security/base_report_security.xml b/addons/base_report_designer/security/base_report_security.xml
deleted file mode 100644
index bd3854ebdba..00000000000
--- a/addons/base_report_designer/security/base_report_security.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data noupdate="1">
-		<record id="res_groups_openofficereportdesigner0" model="res.groups">
-			<field eval="[(6,0,[])]" name="menu_access"/>
-			<field eval="[(6,0,[])]" name="rule_groups"/>
-			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
-			<field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
-		</record>
-
-       <record id="ir_model_access_openofficereportdesigner0" model="ir.model.access">
-           <field name="model_id" ref="base.model_ir_actions_report_xml"/>
-           <field eval="1" name="perm_read"/>
-           <field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
-           <field eval="1" name="perm_unlink"/>
-           <field eval="1" name="perm_write"/>
-           <field eval="1" name="perm_create"/>
-           <field name="group_id" ref="res_groups_openofficereportdesigner0"/>
-       </record>
-	</data>
-
-</openerp>

From 53a8f58b426e1068cb823df2fa8cf08fec418147 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Wed, 29 Dec 2010 12:40:16 +0530
Subject: [PATCH 20/44] [FIX] Board : Access Rights Improvments

bzr revid: jam@tinyerp.com-20101229071016-8922l1nog2ilhnbg
---
 addons/board/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 0110e1678ae..f073975d79a 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -4,4 +4,4 @@
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
-
+"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1

From d8005ea8e111da9170cefc1ea5a55761579e8019 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Wed, 29 Dec 2010 12:59:42 +0530
Subject: [PATCH 21/44] [ADD] board: Add the access rule

bzr revid: sbh@tinyerp.com-20101229072942-gbv0k9lelmg4kdof
---
 addons/board/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 0110e1678ae..f073975d79a 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -4,4 +4,4 @@
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
-
+"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1

From d3f1870a5b287bb10a9fbc330829024d6e761f84 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Wed, 29 Dec 2010 14:46:47 +0530
Subject: [PATCH 22/44] [FIX] Buidbot warnings

bzr revid: jam@tinyerp.com-20101229091647-lyt3rkcizp04b5nt
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py             | 1 -
 .../mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py   | 1 -
 addons/product/pricelist.py                                     | 2 --
 addons/sale_layout/report/report_sale_layout.py                 | 1 -
 addons/wiki/wizard/wiki_wiki_page_open.py                       | 2 +-
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index fc9226551e3..215c98c02ac 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -52,7 +52,6 @@ class account_analytic_account(osv.osv):
             account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
 
         for account in self.browse(cr, uid, ids, context=context):
-            invoiced = {}
             invoice_ids = filter(None, list(set(account_to_invoice_map.get(account.id, []))))
             for invoice in obj_invoice.browse(cr, uid, invoice_ids, context=context):
                 res.setdefault(account.id, 0.0)
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 879d3d37029..85c92d63989 100644
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -25,7 +25,6 @@ import logging
 import optparse
 import sys
 import xmlrpclib
-import email
 
 class rpc_proxy(object):
     def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='openerp'):
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index ad11edff47c..8991d99d077 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -23,8 +23,6 @@ from osv import fields, osv
 
 from _common import rounding
 import time
-from tools import config
-from tools.misc import ustr
 from tools.translate import _
 import decimal_precision as dp
 
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 94b10c8ebf9..57839ecffeb 100644
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -41,7 +41,6 @@ class sale_order_1(report_sxw.rml_parse):
     def sale_order_lines(self, sale_order):
         result = []
         sub_total = {}
-        info = []
         order_lines = []
         res = {}
         obj_order_line = self.pool.get('sale.order.line')
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index d2458c796ff..215a49f29fe 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class wiki_wiki_page_open(osv.osv_memory):
     """ wizard Open Page """

From 22bced59631cd42996f9483a456fbec0886d17e0 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 30 Dec 2010 11:05:10 +0530
Subject: [PATCH 23/44] [FIX]: Fixed buildbot warning.

bzr revid: atp@tinyerp.co.in-20101230053510-3emb189tm9i4t4ea
---
 addons/account_anglo_saxon/invoice.py                         | 2 +-
 .../base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py   | 1 -
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py           | 1 -
 addons/l10n_gr/account_tax.xml                                | 4 ++--
 .../mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py | 4 +---
 addons/product/pricelist.py                                   | 2 --
 addons/sale_layout/report/report_sale_layout.py               | 1 -
 addons/wiki/wizard/wiki_wiki_page_open.py                     | 2 +-
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index a0aab8298dc..fd570c65219 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
index c51602cd82d..0fb69bb80a5 100644
--- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
+++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
@@ -344,7 +344,6 @@ if __name__ == "__main__":
         parser.error("incorrect number of arguments")
 
     import sys
-    import StringIO
 
     fname = sys.argv[1]
     f = fname
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 54d82ed2c79..f6837a79f49 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -52,7 +52,6 @@ class account_analytic_account(osv.osv):
             account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
 
         for account in self.browse(cr, uid, ids, context=context):
-            invoiced = {}
             invoice_ids = filter(None, list(set(account_to_invoice_map.get(account.id, []))))
             for invoice in obj_invoice.browse(cr, uid, invoice_ids, context=context):
                 res.setdefault(account.id, 0.0)
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
index 133a816d0be..7179eb8a4eb 100755
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/account_tax.xml
@@ -213,11 +213,11 @@
         <field name="ref_tax_code_id" ref="vat_code_input_S"/> -->
     </record>
 
-    <!-- *-* revise the ΦΠΑ.. -->
+    <!-- revise the tax.. -->
 
     <record id="ovat19" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_gr_chart_template"/>
-        <field name="name">Εκροές 19</field>
+        <field name="name">Outputs 19</field>
         <field eval="0.19" name="amount"/>
         <field name="type">percent</field>
     	<field name="type_tax_use">purchase</field>
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 879d3d37029..204cb2d5d03 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -25,7 +25,6 @@ import logging
 import optparse
 import sys
 import xmlrpclib
-import email
 
 class rpc_proxy(object):
     def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='openerp'):
@@ -56,11 +55,10 @@ class email_parser(object):
             # pass message as bytes because we don't know its encoding until we parse its headers
             # and hence can't convert it to utf-8 for transport
             res_id = self.rpc('email.server.tools', 'process_email', self.model, xmlrpclib.Binary(message), custom_values)
-        except Exception, e:
+        except Exception:
             logger = logging.getLogger('mail-gateway')
             logger.warning('Failed to process incoming email. Source of the failed mail is available at debug level.', exc_info=True)
             logger.debug('Source of the mail that failed to parse:', message)
-            res_id = False
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 1468cd45200..f3e2213795f 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -23,8 +23,6 @@ from osv import fields, osv
 
 from _common import rounding
 import time
-from tools import config
-from tools.misc import ustr
 from tools.translate import _
 import decimal_precision as dp
 
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 94b10c8ebf9..57839ecffeb 100755
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -41,7 +41,6 @@ class sale_order_1(report_sxw.rml_parse):
     def sale_order_lines(self, sale_order):
         result = []
         sub_total = {}
-        info = []
         order_lines = []
         res = {}
         obj_order_line = self.pool.get('sale.order.line')
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 1fe4f8acc49..1d70c49eb0b 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import  osv
 
 class wiki_wiki_page_open(osv.osv_memory):
     """ wizard Open Page """

From 922f7caae06dde643819f82ced744588dc225a06 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 30 Dec 2010 11:39:52 +0530
Subject: [PATCH 24/44] [Fix] Fix buildbot warning

bzr revid: sbh@tinyerp.com-20101230060952-p0ehq3mgx7cpbfqw
---
 addons/base_crypt/crypt.py                          | 2 --
 addons/hr_holidays/hr_holidays.py                   | 1 -
 addons/mrp/report/price.py                          | 3 ---
 addons/point_of_sale/wizard/pos_sales_user_today.py | 1 -
 addons/survey/report/survey_analysis_report.py      | 1 -
 addons/survey/report/survey_browse_response.py      | 1 -
 6 files changed, 9 deletions(-)

diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 259404dc95b..486f52cea02 100755
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -40,9 +40,7 @@ from random import seed, sample
 from string import letters, digits
 from osv import fields,osv
 import pooler
-import tools
 from tools.translate import _
-from service import security
 
 magic_md5 = '$1$'
 
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 83276ae63ee..9d6328af1eb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -21,7 +21,6 @@
 #
 ##############################################################################
 
-import time
 import datetime
 from itertools import groupby
 from operator import itemgetter
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 76bcc4b92da..f3d0a3d51ac 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
-import ir
 import pooler
 from report.interface import report_rml
 from report.interface import toxml
@@ -52,7 +50,6 @@ class report_custom(report_rml):
             prod_name = bom['name']
             prod_qtty = factor * bom['product_qty']
             product_uom = product_uom_pool.browse(cr, uid, bom['product_uom'], context=context)
-            level = 1
             main_sp_price, main_sp_name , main_strd_price = '','',''
             sellers, sellers_price = '',''
 
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
index d9dbc82d294..94d84647a7c 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
 
 
 class pos_sales_user_today(osv.osv_memory):
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index f171eb428b3..a12cac7f639 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -317,7 +317,6 @@ class survey_analysis(report_rml):
                                     rating_weight_sum += int(col_weight[1]) * tot_res
                                     tot_per = round((float(tot_res) * 100) / int(res_count), 2)
                                 else:
-                                    tor_res = 0
                                     tot_per = 0.0
                                 if tot_res:
                                     rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 282fea1832f..ba34b9c33e9 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -198,7 +198,6 @@ class survey_browse_response(report_rml):
 
         surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
-        surv_ans_obj = pooler.get_pool(cr.dbname).get('survey.answer')
 
         for response in surv_resp_obj.browse(cr, uid, response_id):
             for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):

From 4dff1eb5b60509cddcdc82bb17a4bf0e08627dfe Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 30 Dec 2010 12:15:58 +0530
Subject: [PATCH 25/44] [ADD]: ADD Gantt view in project module.

bzr revid: atp@tinyerp.co.in-20101230064558-xtiaspewu7y49qz4
---
 addons/project/project_view.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f4c837e5d21..6d1e47ba466 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -153,11 +153,25 @@
             </field>
         </record>
 
+       <record id="view_project_project_gantt" model="ir.ui.view">
+            <field name="name">project.project.gantt</field>
+            <field name="model">project.project</field>
+            <field name="type">gantt</field>
+            <field name="arch" type="xml">
+                <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Projects">
+                    <level object="project.project" link="id" domain="[]">
+                        <field name="complete_name"/>
+                    </level>
+                </gantt>
+            </field>
+        </record>
+
         <record id="open_view_project_all" model="ir.actions.act_window">
             <field name="name">Projects</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
+            <field name="view_mode">tree,form,gantt</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{'search_default_Current':1}</field>

From c27b78a2a00fe906fc83bf1106222bf199c65f26 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 30 Dec 2010 17:03:11 +0530
Subject: [PATCH 26/44] [FIX] crm: Corrected error on Merge Opportunity wizard.

bzr revid: uco@tinyerp.com-20101230113311-1viwgkqgo9qlr2w0
---
 addons/crm/wizard/crm_merge_opportunities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index dde529b6002..661180c0874 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -73,7 +73,7 @@ class crm_merge_opportunity(osv.osv_memory):
 
             for this in self.browse(cr, uid, ids, context=context):
                 for opp in this.opportunity_ids:
-                    opp_obj.write(cr, uid, opp.id, {
+                    opp_obj.write(cr, uid, [opp.id], {
                                     'stage_id': opp.stage_id.id or current_opp.stage_id.id or False,
                                     'priority': opp.priority or current_opp.priority,
                                     'email_from': opp.email_from or current_opp.email_from,

From 177e2675c98e4b156e26db8c1a0cc6659e79c054 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Thu, 30 Dec 2010 17:31:37 +0530
Subject: [PATCH 27/44] [BUG/FIX] lp:695596

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

bzr revid: jam@tinyerp.com-20101230120137-n641bb17egu24tl7
---
 addons/audittrail/audittrail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index b744a10b3d9..2f769246bcf 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from osv.osv import osv_pool
+from osv.osv import osv_pool, object_proxy
 from tools.translate import _
 import ir
 import pooler
@@ -184,7 +184,7 @@ class audittrail_log_line(osv.osv):
 audittrail_log_line()
 
 
-class audittrail_objects_proxy(osv_pool):
+class audittrail_objects_proxy(object_proxy):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
 
     def get_value_text(self, cr, uid, field_name, values, model, context=None):

From 13af7212a9710b0195522fb5579a613e5d515341 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 30 Dec 2010 18:18:54 +0530
Subject: [PATCH 28/44] [FIX] document,procurement,sale: Fixed record rules.

bzr revid: uco@tinyerp.com-20101230124854-dgd3rw4ghxahex5u
---
 addons/document/security/document_security.xml       | 4 ++--
 addons/procurement/security/procurement_security.xml | 4 ++--
 addons/sale/security/sale_security.xml               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index ca55a8219c1..ee669052fde 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -16,7 +16,7 @@
 
     <record id="ir_rule_readpublicdirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         <field name="name">Read public directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_user')])]" name="groups"/>
@@ -28,7 +28,7 @@
     
     <record id="ir_rule_documentmodifyowndirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">[ '|', ('user_id', '=', user.id), '&amp;', ('group_ids','in',[g.id for g in user.groups_id]), ('user_id','=',False), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">[ '|', ('user_id', '=', user.id), '&amp;', ('group_ids','in',[g.id for g in user.groups_id]), ('user_id','=',False), '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         <field name="name">Document modify own directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_document_user')])]" name="groups"/>
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index 7dd67c39f6c..2e250db461c 100644
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -6,14 +6,14 @@
             <field name="name">procurement multi-company</field>
             <field name="model_id" search="[('model','=','procurement.order')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
         <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
             <field name="name">stock_warehouse.orderpoint multi-company</field>
             <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
     </data>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 786b5d2a7ff..5cc873beb75 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -38,7 +38,7 @@
         <field name="name">Sale Shop multi-company</field>
         <field name="model_id" ref="model_sale_shop"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
 
     <!-- Multi - Salesmen sales order assignation rules -->

From ef644ffe46a17647121e09895d0f9ba7d35a62db Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Fri, 31 Dec 2010 11:36:34 +0530
Subject: [PATCH 29/44] [IMP] Outlook Addins Create Document

bzr revid: jam@tinyerp.com-20101231060634-4mfazr159td83qzy
---
 .../plugin/openerp-outlook-plugin/Register-plugin.bat        | 0
 .../plugin/openerp-outlook-plugin/Unregister-plugin.bat      | 0
 .../plugin/openerp-outlook-plugin/dialogs/dialog_map.py      | 3 +--
 .../openerp-outlook-plugin/{outlookaddin.iss => setup.iss}   | 4 +---
 addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py  | 5 +++--
 5 files changed, 5 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
 mode change 100755 => 100644 addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
 rename addons/outlook/plugin/openerp-outlook-plugin/{outlookaddin.iss => setup.iss} (94%)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index 7861beb9442..cef3e88e1c0 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -1382,12 +1382,11 @@ def OpenPartnerForm(txtProcessor,*args):
     try:
     	partner_text = ustr(mail.SenderName).encode('iso-8859-1')
         sender_mail = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
-
     except Exception:
     	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")
     	pass
     vals = NewConn.SearchPartner(sender_mail)
-    if vals == True:
+    if vals:
         win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Their is contact related to "+str(partner_text)+"  email address, but no partner is linked to contact>")
         txtProcessor.init_done=True
         return
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/outlookaddin.iss b/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
similarity index 94%
rename from addons/outlook/plugin/openerp-outlook-plugin/outlookaddin.iss
rename to addons/outlook/plugin/openerp-outlook-plugin/setup.iss
index b47f87c60d0..d19cc66f556 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/outlookaddin.iss
+++ b/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
@@ -24,8 +24,6 @@ UninstallDisplayIcon={app}\*
 VersionInfoVersion=1.0
 VersionInfoCompany=OpenERP
 VersionInfoDescription=OpenERP Outlook Addin
-VersionInfoProductName=OpenERP
-VersionInfoProductVersion=1.0
 ChangesAssociations=true
 
 [Languages]
@@ -52,7 +50,7 @@ Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
 
 [Files]
-Source: "C:\workspace\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Messages]
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 7c9af5d28b2..9a81c318dc4 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -284,10 +284,11 @@ class XMLRpcConn(object):
             headers = {}
             strheader = strheader.replace("\n ", " ").splitlines()
             for line in strheader:
-            	split_here = line.find(":")
-            	headers[line[:split_here]] = line[split_here:]
+                split_here = line.find(":")
+                headers[line[:split_here]] = line[split_here:]
             temp1 = headers.get('Message-ID')
             temp2 = headers.get('Message-Id')
+            referances = headers.get('References')
             if temp1 == None:    message_id = temp2
             if temp2 == None:    message_id = temp1
             startCut = message_id.find("<")

From 55228c84a7fb83208337300082b3e5d04dd39aca Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Fri, 31 Dec 2010 11:56:40 +0530
Subject: [PATCH 30/44] [Fix] Fix buildbot warning

bzr revid: sbh@tinyerp.com-20101231062640-p7j0wdq40su3r0cv
---
 addons/base_report_creator/base_report_creator.py            | 1 -
 addons/mrp/report/workcenter_load.py                         | 1 -
 addons/point_of_sale/wizard/pos_scan_product.py              | 4 ++--
 .../purchase_double_validation_installer.py                  | 1 -
 addons/stock/wizard/stock_change_product_qty.py              | 5 +----
 .../stock_planning/wizard/stock_planning_create_periods.py   | 1 -
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 663df95047b..773458fe3cb 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -196,7 +196,6 @@ class report_creator(osv.osv):
         res = super(report_creator, self).read(cr, user, ids, fields, context, load)
         if (not context) or 'report_id' not in context:
             return res
-        ctx = context or {}
         wp = ''
         for data in res:
             if not data.get('sql_query'):
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 145051f17fd..befde4d8667 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -21,7 +21,6 @@
 
 from report.render import render
 from report.interface import report_int
-from pychart import *
 import time
 from datetime import date, datetime, timedelta
 from dateutil.relativedelta import relativedelta
diff --git a/addons/point_of_sale/wizard/pos_scan_product.py b/addons/point_of_sale/wizard/pos_scan_product.py
index 391b6a70e87..8e1e4aace86 100644
--- a/addons/point_of_sale/wizard/pos_scan_product.py
+++ b/addons/point_of_sale/wizard/pos_scan_product.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import osv,fields
-from tools.translate import _
+
 
 class pos_scan_product(osv.osv_memory):
     _name = 'pos.scan.product'
@@ -43,7 +43,7 @@ class pos_scan_product(osv.osv_memory):
             context = {}
         data=self.read(cr, uid, ids)[0]
         record_id = context and context.get('active_id', False)
-        result =self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
+        self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
         return {'gencod': False}
 
 pos_scan_product()
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 4dc73b45fcb..791d1bf6dce 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import time
 from osv import fields, osv
 
 class purchase_double_validation_installer(osv.osv_memory):
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 56a62520bbf..897d5cd0e98 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import time
 
 class stock_change_product_qty(osv.osv_memory):
     _name = "stock.change.product.qty"
@@ -43,7 +42,6 @@ class stock_change_product_qty(osv.osv_memory):
          @return: A dictionary which of fields with values.
         """
         product_id = context and context.get('active_id', False) or False
-        prod_obj =self.pool.get('product.product')
         res = super(stock_change_product_qty, self).default_get(cr, uid, fields, context=context)
 
         if 'new_quantity' in fields:
@@ -64,7 +62,6 @@ class stock_change_product_qty(osv.osv_memory):
         if context is None:
             context = {}
 
-        move_ids = []
         rec_id = context and context.get('active_id', False)
         assert rec_id, _('Active ID is not set in Context')
 
@@ -83,7 +80,7 @@ class stock_change_product_qty(osv.osv_memory):
                 'product_uom' : res_original.uom_id.id,
                 'prod_lot_id' : data.prodlot_id.id
             }
-            line_id = inventry_line_obj.create(cr , uid, line_data, context=context)
+            inventry_line_obj.create(cr , uid, line_data, context=context)
 
             inventry_obj.action_confirm(cr, uid, [inventory_id], context=context)
             inventry_obj.action_done(cr, uid, [inventory_id], context=context)
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods.py b/addons/stock_planning/wizard/stock_planning_create_periods.py
index 47e19d1dda0..7d4012453de 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods.py
+++ b/addons/stock_planning/wizard/stock_planning_create_periods.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 

From 7121fd8c2ea9698a6932ed5e222a711e9db2cfc4 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 31 Dec 2010 11:56:50 +0530
Subject: [PATCH 31/44] [ADD]: ADD security file for crm_partner_assign module.

bzr revid: atp@tinyerp.co.in-20101231062650-jjsxhsl2xorfkhu3
---
 addons/crm_partner_assign/__openerp__.py               | 1 +
 addons/crm_partner_assign/security/ir.model.access.csv | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 addons/crm_partner_assign/security/ir.model.access.csv

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 3068bf25fbe..0c91627d518 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -31,6 +31,7 @@ based on geolocalization.
     'author': 'OpenERP SA',
     'depends': ['crm'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
         'crm_lead_view.xml',
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
new file mode 100644
index 00000000000..79e7611eedb
--- /dev/null
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_ crm_lead_report_assign"," crm.lead.report.assign","model_crm_lead_report_assign","base.group_sale_salesman",1,1,1,0
+"access_ crm_lead_report_assign_all","crm.lead.report.assign.all","model_crm_lead_report_assign","base.group_user",1,0,0,0
+"access_res_partner_grade","res.partner.grade","model_res_partner_grade","base.group_sale_salesman",1,1,1,0
+"access_res_partner_grade_manager","res.partner.grade.manager","model_res_partner_grade","base.group_sale_manager",1,1,1,1

From 856146b3cebf2b96c0e201906d15f1c6667277ae Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 31 Dec 2010 12:12:59 +0530
Subject: [PATCH 32/44] [ADD]: Added graph view in crm_partner_assign module
 for Opp. Assignment analysis.

bzr revid: atp@tinyerp.co.in-20101231064259-zfc75frf6ft5hwow
---
 .../report/crm_lead_report_view.xml           | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 33d297928e5..c71d19df49d 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -86,7 +86,20 @@
             </field>
         </record>
 
+<!-- Crm Lead Assign report Graph View -->
 
+        <record id="view_report_crm_lead_assign_graph" model="ir.ui.view">
+            <field name="name">crm.lead.assign.graph</field>
+            <field name="model">crm.lead.report.assign</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Lead Assign" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
 
         <record id="view_report_crm_opportunity_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.assign.report.tree</field>
@@ -139,6 +152,13 @@
             <field name="view_id" ref="view_report_crm_opportunity_assign_tree"/>
             <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
        </record>
+       
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_assign_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_lead_assign_graph"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
+       </record>       
 
        <menuitem id="menu_report_crm_opportunities_assign_tree"
            groups="base.group_extended"

From dc04fb6fa1dd269e4b117fef11413a18890e38d1 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 31 Dec 2010 12:43:17 +0530
Subject: [PATCH 33/44] [REMOVE]: Remove Graph view in crm claim module.

bzr revid: atp@tinyerp.co.in-20101231071317-chpifvqocoxvh4ad
---
 addons/crm_claim/crm_claim_menu.xml |  8 +-------
 addons/crm_claim/crm_claim_view.xml | 14 --------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index ea9797efc22..f33b6f7ad31 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -12,7 +12,7 @@
             <field name="name">Claims</field>
             <field name="res_model">crm.claim</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
             <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
@@ -40,12 +40,6 @@
             <field name="act_window_id" ref="crm_case_categ_claim0"/>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-            <field name="act_window_id" ref="crm_case_categ_claim0"/>
-        </record>
 
         <menuitem name="Claims" id="menu_crm_case_claims"
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 70772e6ebfd..114989c4e8c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -226,20 +226,6 @@
             </field>
         </record>
 
-        <!-- Claim Graph view -->
-
-        <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
-            <field name="name">CRM -Graph</field>
-            <field name="model">crm.claim</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
-                    <field name="stage_id"/>
-                    <field name="planned_cost" operator="+"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
         <!-- Crm claim Search view -->
 

From cb836a0746fa1da235a8ead0a608321e24b3990e Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Fri, 31 Dec 2010 14:36:10 +0530
Subject: [PATCH 34/44] [FIX] Outlook Buidbot Warning Fix

bzr revid: jam@tinyerp.com-20101231090610-zyigsrmxeokajyha
---
 .../dialogs/dialog_map.py                     |  5 ----
 .../openerp-outlook-plugin/tiny_xmlrpc.py     | 23 +++++++++----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index cef3e88e1c0..72d515c46a8 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -705,17 +705,12 @@ def GetSearchText(txtProcessor,*args):
     b = check()
     if not b:
         return
-    # Get the selected mail and set the default value for search_text_control to mail.SenderEmailAddress
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
     try:
         global objects_with_match
         list_hwnd = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
         objects_with_match = NewConn.SearchPartners()
         setList(list_hwnd)
     except Exception,e:
-        msg=getMessage(e)
         win32ui.MessageBox('Document can not be loaded.\n'+str(e), "Push", flag_error)
     txtProcessor.init_done=True
 
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 9a81c318dc4..0ab5d08a6ec 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -104,19 +104,19 @@ class XMLRpcConn(object):
         return db_list
 
     def login(self,dbname, user, pwd):
-    	self._dbname = dbname
-    	self._uname = user
-    	self._pwd = pwd
-    	conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
-    	uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
-    	return uid
+        self._dbname = dbname
+        self._uname = user
+        self._pwd = pwd
+        conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
+        uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
+        return uid
 
     def GetAllObjects(self):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
-    	objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
-    	obj_list = [item['model'] for item in objects]
-    	return obj_list
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
+        objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
+        obj_list = [item['model'] for item in objects]
+        return obj_list
 
     def GetObjList(self):
     	self._obj_list=list(self._obj_list)
@@ -288,7 +288,6 @@ class XMLRpcConn(object):
                 headers[line[:split_here]] = line[split_here:]
             temp1 = headers.get('Message-ID')
             temp2 = headers.get('Message-Id')
-            referances = headers.get('References')
             if temp1 == None:    message_id = temp2
             if temp2 == None:    message_id = temp1
             startCut = message_id.find("<")

From 69b2f58dac5c4021c83f7afffd5cdef721f5e5ab Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 4 Jan 2011 09:15:08 +0100
Subject: [PATCH 35/44] [IMP] unable to parse PDF reports

bzr revid: fp@tinyerp.com-20110104081508-rg2pq652dsggh3m1
---
 bin/tools/test_reports.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/tools/test_reports.py b/bin/tools/test_reports.py
index 2f27ed9d3df..6e4b08ece2c 100644
--- a/bin/tools/test_reports.py
+++ b/bin/tools/test_reports.py
@@ -79,8 +79,8 @@ def try_report(cr, uid, rname, ids, data=None, context=None, our_module=None):
             res_text = tools.ustr(fp.read())
             os.unlink(rfname)
         except Exception:
-            log.warning("Cannot extract report's text:", exc_info=True)
-        
+            log.debug("Unable to parse PDF report: install pdftotext to perform automated tests.")
+
         if res_text is not False:
             for line in res_text.split('\n'):
                 if ('[[' in line) or ('[ [' in line):
@@ -306,4 +306,4 @@ def try_report_action(cr, uid, action_id, active_model=None, active_ids=None,
 
     return True
 
-#eof
\ No newline at end of file
+#eof

From 8020189af74d3358042dbccb4d08682c78f85d11 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 4 Jan 2011 10:26:44 +0100
Subject: [PATCH 36/44] [IMP] mobile -> portable

bzr revid: fp@tinyerp.com-20110104092644-nz5nldyn8ej02vw3
---
 bin/addons/base/i18n/fr.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index d83406bc6e8..72864052558 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -689,7 +689,7 @@ msgstr "Espagnol (UY) / Español (UY)"
 #: field:res.partner,mobile:0
 #: field:res.partner.address,mobile:0
 msgid "Mobile"
-msgstr "Téléphone mobile"
+msgstr "Tél. portable"
 
 #. module: base
 #: model:res.country,name:base.om
@@ -3363,9 +3363,9 @@ msgid ""
 "the correct mobile number"
 msgstr ""
 "Fournissez les champs qui seront utilisés pour récupérer le numéro du "
-"mobile. Exemple: vous sélectionnez une facture, alors, "
+"portable. Exemple: vous sélectionnez une facture, alors, "
 "`object.invoice_address_id.mobile` est le champ qui représente le numéro du "
-"mobile correct."
+"portable correct."
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -9274,7 +9274,7 @@ msgstr "%j - Jour dans l'année [001,366]."
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
-msgstr "N° de téléphone mobile"
+msgstr "N° de portable"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_by_category

From 204613eee343951e20c90e2db84c9b96ba33bb7c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 4 Jan 2011 10:36:36 +0100
Subject: [PATCH 37/44] [IMP] testing lp to have two po terms different
 context, same id: warehouse, fr

bzr revid: fp@tinyerp.com-20110104093636-hxvrtkgm16mzj6tv
---
 addons/stock/i18n/fr.po | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index e17796027d7..6346aa1af74 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -2806,11 +2806,15 @@ msgstr "Nom de révision"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_root
 #: view:stock.warehouse:0
 msgid "Warehouse"
 msgstr "Entrepôt"
 
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_root
+msgid "Warehouse"
+msgstr "Stocks"
+
 #. module: stock
 #: view:stock.location.product:0
 msgid ""

From 5134ceaff7f472be463fcd3d9b85d7761c18b283 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 4 Jan 2011 11:02:35 +0100
Subject: [PATCH 38/44] [IMP] french translation

bzr revid: fp@tinyerp.com-20110104100235-id212wyrrgl4l167
---
 addons/mrp/i18n/fr.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 21c1e20d700..aed4bfa13ca 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -459,7 +459,7 @@ msgstr "Date planifiée"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Nomenclature des Matériaux"
+msgstr "Nomenclature"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -480,7 +480,7 @@ msgstr "Variation de la valeur de stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Structure de la nomenclature"
+msgstr "Structure des nomenclatures"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -577,7 +577,7 @@ msgstr "Valeur du stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Structure de la Nomenclature des Produits"
+msgstr "Structure des nomenclatures"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2228,7 +2228,7 @@ msgstr "Sélectionner quantité"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr "Nomenclature"
+msgstr "Nomenclatures"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0

From 7873e79a77cd7b4ef9555ebf9ebee89eab0db306 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 4 Jan 2011 11:08:53 +0100
Subject: [PATCH 39/44] [IMP] type fr.po

bzr revid: fp@tinyerp.com-20110104100853-8jjac639ueau65qv
---
 addons/account/i18n/fr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index e3232286a80..03056b8d204 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -489,7 +489,7 @@ msgstr "Date de création"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Remboursement d'achat"
+msgstr "Avoir fournisseur"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1632,7 +1632,7 @@ msgstr "Compte fournisseurs débiteurs"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Compte de taxe à payer"
+msgstr "Compte de taxe pour avoirs"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -9899,7 +9899,7 @@ msgstr "Rechercher une facture"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Rembourser"
+msgstr "Créer un avoir"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0

From 0de512ebe5d2f25fecef20c41b5642d7e50e020b Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 4 Jan 2011 11:11:55 +0100
Subject: [PATCH 40/44] [FIX] email_template : Cleaning mailbox send_mail

bzr revid: tfr@openerp.com-20110104101155-lru81c424h9x9t4o
---
 .../email_template/email_template_mailbox.py  | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index acde96dafd4..f546e5f1e7b 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -69,28 +69,12 @@ class email_template_mailbox(osv.osv):
             try:
                 account_obj = self.pool.get('email_template.account')
                 values = self.read(cr, uid, id, [], context) 
-                #payload = {}
                 attach_to_send = None
+                
                 if values['attachments_ids']:
-                    #for attid in values['attachments_ids']:
-                        #attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
-                        #payload[attachment.datas_fname] = attachment.datas
                     attach_to_send = self.pool.get('ir.attachment').read(cr, uid, values['attachments_ids'], ['datas_fname','datas', 'name'])
                     attach_to_send = map(lambda x: (x['datas_fname'] or x['name'], base64.decodestring(x['datas'])), attach_to_send)
-                #work around to uniformize send email while waiting for a merge of fetchmail, email_template, mailgate
-                #using tools.send_email instead
-                #No need to use email account
-                #result = account_obj.send_mail(cr, uid,
-                #              [values['account_id'][0]],
-                #              {'To':values.get('email_to') or u'',
-                #               'CC':values.get('email_cc') or u'',
-                #               'BCC':values.get('email_bcc') or u'',
-                #               'Reply-To':values.get('reply_to') or u''},
-                #              values['subject'] or u'',
-                #              {'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
-                #              payload=payload,
-                #              message_id=values['message_id'], 
-                #              context=context)
+                
                 if values.get('body_html'):
                     body = values.get('body_html')
                     subtype = "html"

From a0a18a7edc8a9a6e41d6629e740ed782c816dec5 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 4 Jan 2011 11:13:06 +0100
Subject: [PATCH 41/44] [FIX] email_template : revno of previous method

bzr revid: tfr@openerp.com-20110104101306-1j1wmpjmb6k6e2f0
---
 addons/email_template/email_template_mailbox.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index f546e5f1e7b..7483ade5d83 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -63,6 +63,7 @@ class email_template_mailbox(osv.osv):
         return True
     
     def send_this_mail(self, cr, uid, ids=None, context=None):
+        #previous method to send email (link with email account can be found at the revision 4172 and below
         result = True
         attachment_pool = self.pool.get('ir.attachment')
         for id in (ids or []):

From bf16725dc8837021a5d9910ba57f01d96c680f64 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Jan 2011 11:13:35 +0100
Subject: [PATCH 42/44] [FIX] all: ensure all open files are closed (partial
 patch courtesy of Lampman Trading)

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

bzr revid: odo@openerp.com-20110104101335-964sl0e71zsgzfjw
---
 bin/addons/__init__.py                     | 74 +++++++++++++---------
 bin/addons/base/ir/ir_actions.py           |  4 ++
 bin/addons/base/ir/ir_ui_menu.py           |  8 ++-
 bin/addons/base/ir/ir_ui_view.py           | 15 +++--
 bin/addons/base/ir/wizard/wizard_screen.py |  8 ++-
 bin/addons/base/res/res_company.py         |  6 +-
 bin/report/interface.py                    | 19 ++++--
 bin/report/print_xml.py                    | 10 ++-
 bin/report/render/rml2pdf/trml2pdf.py      | 36 ++++++-----
 bin/report/report_sxw.py                   | 50 +++++++++------
 bin/tools/misc.py                          |  8 ++-
 bin/tools/translate.py                     | 16 +++--
 bin/tools/yaml_import.py                   |  8 ++-
 13 files changed, 164 insertions(+), 98 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index dcb8f3a2eb0..515b5e53db6 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -316,7 +316,11 @@ def load_information_from_description_file(module):
     for filename in ['__openerp__.py', '__terp__.py']:
         description_file = get_module_resource(module, filename)
         if description_file :
-            return eval(tools.file_open(description_file).read())
+            desc_f = tools.file_open(description_file)
+            try:
+                return eval(desc_f.read())
+            finally:
+                desc_f.close()
 
     #TODO: refactor the logger in this file to follow the logging guidelines
     #      for 6.0
@@ -355,11 +359,14 @@ def upgrade_graph(graph, cr, module_list, force=None):
             continue
 
         if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path+'.zip'):
+            terp_f = tools.file_open(terp_file)
             try:
-                info = eval(tools.file_open(terp_file).read())
-            except:
+                info = eval(terp_f.read())
+            except Exception:
                 logger.notifyChannel('init', netsvc.LOG_ERROR, 'module %s: eval file %s' % (module, terp_file))
                 raise
+            finally:
+                terp_f.close()
             if info.get('installable', True):
                 packages.append((module, info.get('depends', []), info))
             else:
@@ -628,29 +635,33 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_cleanup=
             logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, filename))
             _, ext = os.path.splitext(filename)
             fp = tools.file_open(opj(m, filename))
-            if ext == '.csv':
-                noupdate = (kind == 'init')
-                tools.convert_csv_import(cr, m, os.path.basename(filename), fp.read(), idref, mode=mode, noupdate=noupdate)
-            elif ext == '.sql':
-                process_sql_file(cr, fp)
-            elif ext == '.yml':
-                tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
-            else:
-                tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)
-            fp.close()
+            try:
+                if ext == '.csv':
+                    noupdate = (kind == 'init')
+                    tools.convert_csv_import(cr, m, os.path.basename(filename), fp.read(), idref, mode=mode, noupdate=noupdate)
+                elif ext == '.sql':
+                    process_sql_file(cr, fp)
+                elif ext == '.yml':
+                    tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
+                else:
+                    tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)
+            finally:
+                fp.close()
 
     def load_demo_xml(cr, m, idref, mode):
         for xml in package.data.get('demo_xml', []):
             name, ext = os.path.splitext(xml)
             logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, xml))
             fp = tools.file_open(opj(m, xml))
-            if ext == '.csv':
-                tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True)
-            elif ext == '.yml':
-                tools.convert_yaml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
-            else:
-                tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
-            fp.close()
+            try:
+                if ext == '.csv':
+                    tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True)
+                elif ext == '.yml':
+                    tools.convert_yaml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
+                else:
+                    tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
+            finally:
+                fp.close()
 
     def load_data(cr, module_name, id_map, mode):
         _load_data(cr, module_name, id_map, mode, 'data')
@@ -678,17 +689,18 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_cleanup=
             log.info("module %s: loading %s", module_name, filename)
             pathname = os.path.join(module_name, filename)
             file = tools.file_open(pathname)
-            # TODO manage .csv file with noupdate == (kind == 'init')
-            if ext == '.sql':
-                process_sql_file(cr, file)
-            elif ext == '.csv':
-                noupdate = (kind == 'init')
-                tools.convert_csv_import(cr, module_name, pathname, file.read(), id_map, mode, noupdate)
-            elif ext == '.yml':
-                tools.convert_yaml_import(cr, module_name, file, id_map, mode, noupdate)
-            else:
-                tools.convert_xml_import(cr, module_name, file, id_map, mode, noupdate)
-            file.close()
+            try:
+                if ext == '.sql':
+                    process_sql_file(cr, file)
+                elif ext == '.csv':
+                    noupdate = (kind == 'init')
+                    tools.convert_csv_import(cr, module_name, pathname, file.read(), id_map, mode, noupdate)
+                elif ext == '.yml':
+                    tools.convert_yaml_import(cr, module_name, file, id_map, mode, noupdate)
+                else:
+                    tools.convert_xml_import(cr, module_name, file, id_map, mode, noupdate)
+            finally:
+                file.close()
 
     # **kwargs is passed directly to convert_xml_import
     if not status:
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index c8ff67c18d9..7a07ca40ef8 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -55,11 +55,15 @@ class report_xml(osv.osv):
         for report in self.browse(cursor, user, ids, context=context):
             data = report[name + '_data']
             if not data and report[name[:-8]]:
+                fp = None
                 try:
                     fp = tools.file_open(report[name[:-8]], mode='rb')
                     data = fp.read()
                 except:
                     data = False
+                finally:
+                    if fp:
+                        fp.close()
             res[report.id] = data
         return res
 
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 8696df80311..08725fbb9cb 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -257,8 +257,12 @@ class ir_ui_menu(osv.osv):
     def read_image(self, path):
         path_info = path.split(',')
         icon_path = addons.get_module_resource(path_info[0],path_info[1])
-        icon = tools.file_open(icon_path,'rb').read()
-        return base64.encodestring(icon)
+        icon_file = tools.file_open(icon_path,'rb')
+        try:
+            icon = icon_file.read()
+            return base64.encodestring(icon)
+        finally:
+            icon_file.close()
 
     def _get_image_icon(self, cr, uid, ids, name, args, context=None):
         res = {}
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 895f0051719..023c0cc4361 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -33,12 +33,15 @@ def _check_xml(self, cr, uid, ids, context=None):
     for view in self.browse(cr, uid, ids, context):
         eview = etree.fromstring(view.arch.encode('utf8'))
         frng = tools.file_open(os.path.join('base','rng','view.rng'))
-        relaxng_doc = etree.parse(frng)
-        relaxng = etree.RelaxNG(relaxng_doc)
-        if not relaxng.validate(eview):
-            for error in relaxng.error_log:
-                logger.error(tools.ustr(error))
-            return False
+        try:
+            relaxng_doc = etree.parse(frng)
+            relaxng = etree.RelaxNG(relaxng_doc)
+            if not relaxng.validate(eview):
+                for error in relaxng.error_log:
+                    logger.error(tools.ustr(error))
+                return False
+        finally:
+            frng.close()
     return True
 
 class view_custom(osv.osv):
diff --git a/bin/addons/base/ir/wizard/wizard_screen.py b/bin/addons/base/ir/wizard/wizard_screen.py
index 56f104d0b13..5762bdc8752 100644
--- a/bin/addons/base/ir/wizard/wizard_screen.py
+++ b/bin/addons/base/ir/wizard/wizard_screen.py
@@ -31,8 +31,12 @@ class wizard_screen(osv.osv_memory):
 
     def _get_image(self, cr, uid, context=None):
         path = os.path.join('base','res','config_pixmaps','%d.png'%random.randrange(1,4))
-        file_data = tools.file_open(path,'rb').read()
-        return base64.encodestring(file_data)
+        image_file = file_data = tools.file_open(path,'rb')
+        try:
+            file_data = image_file.read()
+            return base64.encodestring(file_data)
+        finally:
+            image_file.close()
 
     def _get_image_fn(self, cr, uid, ids, name, args, context=None):
         image = self._get_image(cr, uid, context)
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 3fc4595c11c..8cafa28ccff 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -220,7 +220,11 @@ class res_company(osv.osv):
 </header>"""
     def _get_header(self,cr,uid,ids):
         try :
-            return tools.file_open(os.path.join('base', 'report', 'corporate_rml_header.rml')).read()
+            header_file = tools.file_open(os.path.join('base', 'report', 'corporate_rml_header.rml'))
+            try:
+                return header_file.read()
+            finally:
+                header_file.close()
         except:
             return """
     <header>
diff --git a/bin/report/interface.py b/bin/report/interface.py
index 16dfafe0a18..ce14883986c 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -149,13 +149,18 @@ class report_rml(report_int):
         if not self.xsl:
             return xml
 
-        stylesheet = etree.parse(tools.file_open(self.xsl))
-        xsl_path, _ = os.path.split(self.xsl)
-        for import_child in stylesheet.findall('./import'):
-            if 'href' in import_child.attrib:
-                imp_file = import_child.get('href')
-                _, imp_file = tools.file_open(imp_file, subdir=xsl_path, pathinfo=True)
-                import_child.set('href', urllib.quote(str(imp_file)))
+        stylesheet_file = tools.file_open(self.xsl)
+        try:
+            stylesheet = etree.parse(stylesheet_file)
+            xsl_path, _ = os.path.split(self.xsl)
+            for import_child in stylesheet.findall('./import'):
+                if 'href' in import_child.attrib:
+                    imp_file = import_child.get('href')
+                    _, imp_file = tools.file_open(imp_file, subdir=xsl_path, pathinfo=True)
+                    import_child.set('href', urllib.quote(str(imp_file)))
+                    imp_file.close()
+        finally:
+            stylesheet_file.close()
 
         #TODO: get all the translation in one query. That means we have to:
         # * build a list of items to translate,
diff --git a/bin/report/print_xml.py b/bin/report/print_xml.py
index 3319ee0b558..d637603d341 100644
--- a/bin/report/print_xml.py
+++ b/bin/report/print_xml.py
@@ -283,9 +283,13 @@ class document(object):
         if not context:
             context={}
         # parses the xml template to memory
-        self.dom = etree.XML(tools.file_open(filename).read())
-        self.doc = etree.Element(self.dom.tag)
-        self.parse_tree(ids, model, context)
+        src_file = tools.file_open(filename)
+        try:
+            self.dom = etree.XML(src_file.read())
+            self.doc = etree.Element(self.dom.tag)
+            self.parse_tree(ids, model, context)
+        finally:
+            src_file.close()
 
     def close(self):
         self.doc = None
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 40b884f5a06..df826d0eace 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -477,24 +477,26 @@ class _rml_canvas(object):
                 else:
                     self._logger.debug("Open image file %s ", nfile)
                     s = _open_image(nfile, path=self.path)
-        img = ImageReader(s)
-        (sx,sy) = img.getSize()
-        self._logger.debug("Image is %dx%d", sx, sy)
-
-        args = { 'x': 0.0, 'y': 0.0 }
-        for tag in ('width','height','x','y'):
-            if node.get(tag):
-                args[tag] = utils.unit_get(node.get(tag))
-        if ('width' in args) and (not 'height' in args):
-            args['height'] = sy * args['width'] / sx
-        elif ('height' in args) and (not 'width' in args):
-            args['width'] = sx * args['height'] / sy
-        elif ('width' in args) and ('height' in args):
-            if (float(args['width'])/args['height'])>(float(sx)>sy):
-                args['width'] = sx * args['height'] / sy
-            else:
+        try:
+            img = ImageReader(s)
+            (sx,sy) = img.getSize()
+            self._logger.debug("Image is %dx%d", sx, sy)
+            args = { 'x': 0.0, 'y': 0.0 }
+            for tag in ('width','height','x','y'):
+                if node.get(tag):
+                    args[tag] = utils.unit_get(node.get(tag))
+            if ('width' in args) and (not 'height' in args):
                 args['height'] = sy * args['width'] / sx
-        self.canvas.drawImage(img, **args)
+            elif ('height' in args) and (not 'width' in args):
+                args['width'] = sx * args['height'] / sy
+            elif ('width' in args) and ('height' in args):
+                if (float(args['width'])/args['height'])>(float(sx)>sy):
+                    args['width'] = sx * args['height'] / sy
+                else:
+                    args['height'] = sy * args['width'] / sx
+            self.canvas.drawImage(img, **args)
+        finally:
+            s.close()
 #        self.canvas._doc.SaveToFile(self.canvas._filename, self.canvas)
 
     def _path(self, node):
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index fe04ca6b680..6a7890be735 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -401,13 +401,17 @@ class report_sxw(report_rml, preprocess.report):
             report_xml = ir_obj.browse(cr, uid, report_xml_ids[0], context=context)
         else:
             title = ''
-            rml = tools.file_open(self.tmpl, subdir=None).read()
-            report_type= data.get('report_type', 'pdf')
-            class a(object):
-                def __init__(self, *args, **argv):
-                    for key,arg in argv.items():
-                        setattr(self, key, arg)
-            report_xml = a(title=title, report_type=report_type, report_rml_content=rml, name=title, attachment=False, header=self.header)
+            report_file = tools.file_open(self.tmpl, subdir=None)
+            try:
+                rml = report_file.read()
+                report_type= data.get('report_type', 'pdf')
+                class a(object):
+                    def __init__(self, *args, **argv):
+                        for key,arg in argv.items():
+                            setattr(self, key, arg)
+                report_xml = a(title=title, report_type=report_type, report_rml_content=rml, name=title, attachment=False, header=self.header)
+            finally:
+                report_file.close()
         report_xml.header = self.header
         report_type = report_xml.report_type
         if report_type in ['sxw','odt']:
@@ -590,20 +594,24 @@ class report_sxw(report_rml, preprocess.report):
 
         if report_xml.header:
             #Add corporate header/footer
-            rml = tools.file_open(os.path.join('base', 'report', 'corporate_%s_header.xml' % report_type)).read()
-            rml_parser = self.parser(cr, uid, self.name2, context=context)
-            rml_parser.parents = sxw_parents
-            rml_parser.tag = sxw_tag
-            objs = self.getObjects(cr, uid, ids, context)
-            rml_parser.set_context(objs, data, ids, report_xml.report_type)
-            rml_dom = self.preprocess_rml(etree.XML(rml),report_type)
-            create_doc = self.generators[report_type]
-            odt = create_doc(rml_dom,rml_parser.localcontext)
-            if report_xml.header:
-                rml_parser._add_header(odt)
-            odt = etree.tostring(odt, encoding='utf-8',
-                                 xml_declaration=True)
-            sxw_z.writestr('styles.xml', odt)
+            rml_file = tools.file_open(os.path.join('base', 'report', 'corporate_%s_header.xml' % report_type))
+            try:
+                rml = rml_file.read()
+                rml_parser = self.parser(cr, uid, self.name2, context=context)
+                rml_parser.parents = sxw_parents
+                rml_parser.tag = sxw_tag
+                objs = self.getObjects(cr, uid, ids, context)
+                rml_parser.set_context(objs, data, ids, report_xml.report_type)
+                rml_dom = self.preprocess_rml(etree.XML(rml),report_type)
+                create_doc = self.generators[report_type]
+                odt = create_doc(rml_dom,rml_parser.localcontext)
+                if report_xml.header:
+                    rml_parser._add_header(odt)
+                odt = etree.tostring(odt, encoding='utf-8',
+                                     xml_declaration=True)
+                sxw_z.writestr('styles.xml', odt)
+            finally:
+                rml_file.close()
         sxw_z.close()
         final_op = sxw_io.getvalue()
         sxw_io.close()
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 390be6b7837..015299bcf05 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -69,8 +69,12 @@ SKIPPED_ELEMENT_TYPES = (etree._Comment, etree._ProcessingInstruction, etree.Com
 def init_db(cr):
     import addons
     f = addons.get_module_resource('base', 'base.sql')
-    cr.execute(file_open(f).read())
-    cr.commit()
+    base_sql_file = file_open(f)
+    try:
+        cr.execute(base_sql_file.read())
+        cr.commit()
+    finally:
+        base_sql_file.close()
 
     for i in addons.get_modules():
         mod_path = addons.get_module_path(i)
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index e22c51af0fd..c1c09140d0a 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -681,9 +681,13 @@ def trans_generate(lang, modules, dbname=None):
                 report_type = "xsl"
             if fname and obj.report_type in ('pdf', 'xsl'):
                 try:
-                    d = etree.parse(tools.file_open(fname))
-                    for t in parse_func(d.iter()):
-                        push_translation(module, report_type, name, 0, t)
+                    report_file = tools.file_open(fname)
+                    try:
+                        d = etree.parse(report_file)
+                        for t in parse_func(d.iter()):
+                            push_translation(module, report_type, name, 0, t)
+                    finally:
+                        report_file.close()
                 except (IOError, etree.XMLSyntaxError):
                     logger.exception("couldn't export translation for report %s %s %s", name, report_type, fname)
 
@@ -772,7 +776,11 @@ def trans_generate(lang, modules, dbname=None):
         is_mod_installed = module in installed_modules
         if (('all' in modules) or (module in modules)) and is_mod_installed:
             logger.debug("Scanning code of %s at module: %s", frelativepath, module)
-            code_string = tools.file_open(fabsolutepath, subdir='').read()
+            src_file = tools.file_open(fabsolutepath, subdir='')
+            try:
+                code_string = src_file.read()
+            finally:
+                src_file.close()
             if module in installed_modules:
                 frelativepath = str("addons" + frelativepath)
             ite = re_dquotes.finditer(code_string)
diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 6e5a581be73..2b5c982ca7b 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -684,8 +684,12 @@ class YamlInterpreter(object):
         if node.auto:
             values['auto'] = eval(node.auto)
         if node.sxw:
-            sxw_content = misc.file_open(node.sxw).read()
-            values['report_sxw_content'] = sxw_content
+            sxw_file = misc.file_open(node.sxw)
+            try:
+                sxw_content = sxw_file.read()
+                values['report_sxw_content'] = sxw_content
+            finally:
+                sxw_file.close()
         if node.header:
             values['header'] = eval(node.header)
         values['multi'] = node.multi and eval(node.multi)

From 4a90463eb65e5f80c9b31bfa7689ad973dfcde9e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 4 Jan 2011 11:18:47 +0100
Subject: [PATCH 43/44] [IMP] better menu tip for modules

bzr revid: fp@tinyerp.com-20110104101847-d1tjsqitciprle1f
---
 bin/addons/base/i18n/fr.po             | 2 +-
 bin/addons/base/module/module_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 72864052558..03a93e16a33 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -7167,7 +7167,7 @@ msgstr "Tunisie"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_mrp_root
 msgid "Manufacturing"
-msgstr "Gestion de Production"
+msgstr "GPAO"
 
 #. module: base
 #: view:base.language.export:0
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index 2d391cdd8e6..16527641656 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -169,7 +169,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain"/>
             <field name="search_view_id" ref="view_module_filter"/>
-            <field name="help">List all certified modules available to configure your OpenERP. Modules that are installed are flagged as such. You can search for a specific module using the name or the description of the module. You do not need to install modules one by one, you can install many at the same time by clicking on the schedule button in this list. Then, apply the schedule upgrade from Action menu once for all the ones you have scheduled for installation.</field>
+            <field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Schedule for Installation" from the form view, then click on "Apply Scheduled Upgrades" to migrate your system.</field>
         </record>
         <menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management"/>
 

From 4ae76de3ded8acdac9a4569397f1fe904bf8d955 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Tue, 4 Jan 2011 12:27:52 +0100
Subject: [PATCH 44/44] [FIX] mrp/report : fix pychart import

bzr revid: tfr@openerp.com-20110104112752-xi0p9xfxbwf6wi7j
---
 addons/mrp/report/workcenter_load.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index befde4d8667..95331d6fdf0 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -30,6 +30,8 @@ from report.misc import choice_colors
 import random
 import StringIO
 
+from pychart import *
+
 
 theme.use_color = 1
 random.seed(0)