From d34186d12f03a2bf0d0f663c6b0f5c9ad16dfbec Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Fri, 10 Dec 2010 18:54:55 +0100
Subject: [PATCH 1/9] [FIX] crm : next/previous_stage behavior

bzr revid: tfr@openerp.com-20101210175455-hvoh7pqjnak6b1wh
---
 addons/crm/crm.py                   | 115 ++++++++++++++--------------
 addons/crm/crm_lead_data.xml        |  14 ++--
 addons/crm_claim/crm_claim_data.xml |   2 +-
 3 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c3a4ef44a9c..a91009583f2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -22,6 +22,7 @@
 import time
 import base64
 import tools
+
 from osv import fields
 from osv import osv
 from tools.translate import _
@@ -135,6 +136,57 @@ class crm_case(object):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.context_section_id.id or False
 
+    def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
+        if index + 1 == len(stage_list):
+            return False
+        print "cul"
+        print index
+        next_stage_id = stage_list[index + 1]
+        next_stage = stage_pool.browse(cr, uid, next_stage_id, context=context)
+        if not next_stage:
+            return False
+            
+        next_seq = next_stage.sequence
+        if (abs(next_seq - current_seq)) >= 1:
+            print next_stage
+            return next_stage
+        else :
+            return _find_next_stage(cr, uid, stage_list, index + 1, current_seq, stage_pool)
+            
+    def stage_change(self, cr, uid, ids, context=None, order='sequence'):
+        if not context:
+            context = {}
+        stage_pool = self.pool.get('crm.case.stage')
+        stage_type = context and context.get('stage_type','')
+        current_seq = False
+        next_stage_id = False
+        for case in self.browse(cr, uid, ids, context):
+            print case
+            next_stage = False
+            data = {}
+            print stage_type
+            domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
+            if case.section_id and case.section_id.stage_ids:
+                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
+            
+            stages = stage_pool.search(cr, uid, domain, order=order)
+            current_seq = case.stage_id.sequence
+            index = -1
+            if case.stage_id and case.stage_id.id in stages:
+                index = stages.index(case.stage_id.id)
+            print stages
+            print "call"
+            next_stage = self._find_next_stage(cr, uid, stages, index, current_seq, stage_pool, context=context)
+            if next_stage:
+                next_stage_id = next_stage.id
+                data = {'stage_id': next_stage.id}
+                if next_stage.on_change:
+                    data.update({'probability': next_stage.probability})
+            self.write(cr, uid, [case.id], data, context=context)
+            
+        return next_stage_id
+        
+        
     def stage_next(self, cr, uid, ids, context=None):
         """This function computes next stage for case from its current stage
              using available stage for that case type
@@ -143,36 +195,10 @@ class crm_case(object):
         @param uid: the current user’s ID for security checks,
         @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-        stage_pool = self.pool.get('crm.case.stage')
-        stage_type = context and context.get('stage_type','')
-        current_seq = False
-        for case in self.browse(cr, uid, ids, context):
-            next_stage = False
-            data = {}
-            domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
-            if case.section_id and case.section_id.stage_ids:
-                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
-            stages = stage_pool.search(cr, uid, domain, order='sequence')
-            index = -1
-            if case.stage_id and case.stage_id.id in stages:
-                index = stages.index(case.stage_id.id)
-            if index + 1 == len(stages):
-                return False
-            else:
-                next_stage = stages[index + 1]
-            current_seq = case.stage_id.sequence
-            if next_stage:
-                stage = stage_pool.browse(cr, uid, next_stage, context=context)
-                next_seq = stage.sequence
-                if current_seq and (next_seq - current_seq) >= 1:
-                    data = {'stage_id': next_stage}
-                if stage.on_change:
-                    data.update({'probability': stage.probability})
-            self.write(cr, uid, [case.id], data, context=context)
-        return next_stage
-
+        
+       
+        return self.stage_change(cr, uid, ids, context=context, order='sequence')
+        
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage
              using available stage for that case type
@@ -181,34 +207,7 @@ class crm_case(object):
         @param uid: the current user’s ID for security checks,
         @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-        stage_pool = self.pool.get('crm.case.stage')
-        stage_type = context and context.get('stage_type','')
-        for case in self.browse(cr, uid, ids, context):
-            prev_stage = False
-            data = {}
-            domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
-            if case.section_id and case.section_id.stage_ids:
-                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
-            stages = stage_pool.search(cr, uid, domain, order='sequence')
-            index = 0
-            if case.stage_id and case.stage_id.id in stages:
-                index = stages.index(case.stage_id.id)
-            if index == 0:
-                return False
-            else:
-                prev_stage = stages[index - 1]
-            current_seq = case.stage_id.sequence
-            if prev_stage:
-                stage = stage_pool.browse(cr, uid, prev_stage, context=context)
-                prev_seq = stage.sequence
-                if current_seq and (prev_seq - current_seq) <= 1:
-                    data = {'stage_id': prev_stage}
-                if stage.on_change:
-                    data.update({'probability': stage.probability})
-            self.write(cr, uid, [case.id], data, context=context)
-        return prev_stage
+        return self.stage_change(cr, uid, ids, context=context, order='sequence desc')
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index f10ba72ef8e..3cb34c49299 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -2,7 +2,12 @@
 <openerp>
     <data noupdate="1">
 
-
+	<record model="crm.case.stage" id="stage_lead6">
+            <field name="name">Lost</field>
+            <field eval="'0'" name="probability"/>
+            <field eval="'0'" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
         <!--        CASE STATUS(stage_id)        -->
         <record model="crm.case.stage" id="stage_lead1">
             <field name="name">New</field>
@@ -40,12 +45,7 @@
             <field name="type">lead</field>
         </record>
 
-        <record model="crm.case.stage" id="stage_lead6">
-            <field name="name">Lost</field>
-            <field eval="'0'" name="probability"/>
-            <field eval="'6'" name="sequence"/>
-            <field name="type">lead</field>
-        </record>
+        
 
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index 4d321a42b6e..e917ba5bea6 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -59,7 +59,7 @@
         </record>
         <record model="crm.case.stage" id="stage_claim3">
             <field name="name">Won't fix</field>
-            <field name="sequence">11</field>
+            <field name="sequence">0</field>
             <field name="type">claim</field> 
         </record>
         

From a01c3728c51caded70cc4980e8d3113ff2de11bb Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Mon, 13 Dec 2010 11:50:58 +0530
Subject: [PATCH 2/9] [IMP] 1) Openlink in Webbrowser with menu 2) Putting
 Config in Toolbar

bzr revid: jam@tinyerp.com-20101213062058-j0cue0r4xtvho8o7
---
 .../plugin/openerp-outlook-plugin/addin.py       |  8 ++++++++
 .../openerp-outlook-plugin/dialogs/dialog_map.py | 16 ++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
index 2cd8bf565b1..39ea41d7f16 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -175,6 +175,12 @@ class OutlookAddin:
             toolbar = bars.Item("Standard")
             openerp_bar = bars.Item('Open ERP')
 
+            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+            item = self.toolbarButtonConfig = DispatchWithEvents(item, Configuration)
+            item.Caption = "Configuration"
+            item.TooltipText = "Click to configure OpenERP."
+            item.Enabled = True
+
             item = openerp_bar.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.toolbarButton = DispatchWithEvents(item, ArchiveEvent)
@@ -198,6 +204,8 @@ class OutlookAddin:
             item.TooltipText = "Click to Open Document that has been pushed to server."
             item.Enabled = True
 
+
+
             # Hook events for the item
 #            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
 #            item = self.toolbarButtonPartner = DispatchWithEvents(item, ViewPartners)
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 747915f7181..140c100f229 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -1406,14 +1406,11 @@ def OpenPartnerForm(txtProcessor,*args):
     	txtProcessor.init_done=True
     	return
     try:
-        linktopartner = "http://"+web_server+":"+str(web_server_port)+"/openerp/form/view?model=res.partner&id="+str(vals)
-
+        import urllib
+        next =  urllib.urlencode({'next' : '/openerp/form/view?model=res.partner&id=' +str(vals) })
+        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        linktopartner = weburl + '?' + next
         win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, str(linktopartner))
-#        import urllib
-#        encode = urllib.urlencode('/openerp/form/view?model=res.partner&id='+str(vals))
-#        weburl = 'http://'+web_server+':'+str(web_server_port)
-#        linktopartner = weburl + "?next=" + encode
-#    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, linktopartner)
     except Exception,e:
     	win32ui.MessageBox("Error While Opening Partner.\n"+str(e),"Open Partner", flag_error)
     webbrowser.open_new(linktopartner)
@@ -1469,7 +1466,10 @@ def SerachOpenDocuemnt(txtProcessor,*args):
         txtProcessor.init_done=True
         return
     try:
-        linktodoc = "http:\\\\" +web_server+ ":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
+        import urllib
+        next =  urllib.urlencode({'next' : '/openerp/form/view?model='+vals[0][1]+'&id='+str(vals[1][1])})
+        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        linktodoc = weburl + '?' + next
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
     except Exception,e:
         win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)

From 4939946b9f8933f805d6e0dc47196760562ee703 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Dec 2010 10:01:08 +0100
Subject: [PATCH 3/9] [IMP] Improved email and username handling when sending
 an publisher warranty issue report.

bzr revid: nicolas.vanhoren@openerp.com-20101213090108-sy7xuwpptskhha3j
---
 .../base/publisher_warranty/publisher_warranty.py      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/publisher_warranty/publisher_warranty.py b/bin/addons/base/publisher_warranty/publisher_warranty.py
index fb57ed0503c..dad1b2f674d 100644
--- a/bin/addons/base/publisher_warranty/publisher_warranty.py
+++ b/bin/addons/base/publisher_warranty/publisher_warranty.py
@@ -71,7 +71,7 @@ class publisher_warranty_contract(osv.osv):
             'uncovered_modules': list(),
         }
     
-    def send(self, cr, uid, tb, explanations, remarks=None, issue_name=None, email=None):
+    def send(self, cr, uid, tb, explanations, remarks=None, issue_name=None):
         """ Method called by the client to send a problem to the publisher warranty server. """
         
         if not remarks:
@@ -84,6 +84,9 @@ class publisher_warranty_contract(osv.osv):
             origin = 'client'
             dbuuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
             db_create_date = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.create_date')
+            user = self.pool.get("res.users").browse(cr, uid, uid)
+            user_name = user.name
+            email = user.email
             
             msg = {'contract_name': valid_contract.name,
                 'tb': tb,
@@ -95,6 +98,7 @@ class publisher_warranty_contract(osv.osv):
                 'db_create_date': db_create_date,
                 'issue_name': issue_name,
                 'email': email,
+                'user_name': user_name,
             }
             
             
@@ -242,9 +246,9 @@ class maintenance_contract(osv.osv_memory):
     def status(self, cr, uid):
         return self.pool.get("publisher_warranty.contract").status(cr, uid)
         
-    def send(self, cr, uid, tb, explanations, remarks=None, issue_name=None, email=None):
+    def send(self, cr, uid, tb, explanations, remarks=None, issue_name=None):
         return self.pool.get("publisher_warranty.contract").send(cr, uid, tb,
-                        explanations, remarks, issue_name, email)
+                        explanations, remarks, issue_name)
     
 maintenance_contract()
 

From f856489f5b2105f3d50e1c7d93d2711b5b6f1669 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 13 Dec 2010 10:39:59 +0100
Subject: [PATCH 4/9] [FIX] crm_view.xml : section_ids in view

bzr revid: tfr@openerp.com-20101213093959-z97zekyeg75q0svw
---
 addons/crm/crm.py            | 12 ++++--------
 addons/crm/crm_lead_view.xml |  6 +++---
 addons/crm/crm_view.xml      |  1 +
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a91009583f2..5336bdd23fb 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -139,8 +139,6 @@ class crm_case(object):
     def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
         if index + 1 == len(stage_list):
             return False
-        print "cul"
-        print index
         next_stage_id = stage_list[index + 1]
         next_stage = stage_pool.browse(cr, uid, next_stage_id, context=context)
         if not next_stage:
@@ -148,10 +146,9 @@ class crm_case(object):
             
         next_seq = next_stage.sequence
         if (abs(next_seq - current_seq)) >= 1:
-            print next_stage
             return next_stage
         else :
-            return _find_next_stage(cr, uid, stage_list, index + 1, current_seq, stage_pool)
+            return self._find_next_stage(cr, uid, stage_list, index + 1, current_seq, stage_pool)
             
     def stage_change(self, cr, uid, ids, context=None, order='sequence'):
         if not context:
@@ -161,10 +158,9 @@ class crm_case(object):
         current_seq = False
         next_stage_id = False
         for case in self.browse(cr, uid, ids, context):
-            print case
             next_stage = False
             data = {}
-            print stage_type
+
             domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
             if case.section_id and case.section_id.stage_ids:
                 domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
@@ -174,8 +170,7 @@ class crm_case(object):
             index = -1
             if case.stage_id and case.stage_id.id in stages:
                 index = stages.index(case.stage_id.id)
-            print stages
-            print "call"
+
             next_stage = self._find_next_stage(cr, uid, stages, index, current_seq, stage_pool, context=context)
             if next_stage:
                 next_stage_id = next_stage.id
@@ -635,6 +630,7 @@ class crm_case_stage(osv.osv):
     _columns = {
         'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
     }
+        
 crm_case_stage()
 
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 87eb7ff3bd1..979ab26cfd1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -57,14 +57,14 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]"/>
+                    <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string=""
                             states="open,pending,draft" type="object"
-                            icon="gtk-go-back" context="{'stage_type': 'lead'}"/>
+                            icon="gtk-go-back" context="{'stage_type': 'lead'}" />
                         <button name="stage_next" string=""
                             states="open,pending,draft" type="object"
-                            icon="gtk-go-forward" />
+                            icon="gtk-go-forward" context="{'stage_type': 'lead'}" />
                     </group>
                     <field name="type" invisible="1"/>
                 </group>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 8de6b3ab3a6..f0c2d55a642 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -123,6 +123,7 @@
                     <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
                     <field name="type" invisible="1" />
+                     <field name="section_ids" invisible="1" />
                     <field name="sequence"/>
                     <field name="probability"/>
                     <field name="on_change"/>

From 9275079098624099fcc912c9154d9f0540947186 Mon Sep 17 00:00:00 2001
From: jam-openerp <jam@tinyerp.com>
Date: Mon, 13 Dec 2010 15:37:18 +0530
Subject: [PATCH 5/9] [BUG-FIX] lp:689284

bzr revid: jam@tinyerp.com-20101213100718-0xk0526aet0ppi42
---
 addons/crm/crm_opportunity_view.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index c928b120579..4dff3dd6337 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -39,14 +39,15 @@
                             </group>
                             <field name="user_id"/>
 
-                            <button name="action_makeMeeting" type="object"
-                            string="Schedule Meeting" icon="gtk-redo" />
+                            <button string="Schedule/Log Call"
+                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
 
                             <field name="planned_revenue"/>
                             <field name="probability"/>
                             <field name="date_deadline"/>
-                            <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
+
+                            <button name="action_makeMeeting" type="object"
+                            string="Schedule Meeting" icon="gtk-redo" />
                             <newline/>
                             <field name="date_action"/>
                             <field name="title_action"/>

From 5bb14725d4534fe0e4f66ab4d9fdca0afd73b74e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 13 Dec 2010 11:51:04 +0100
Subject: [PATCH 6/9] [IMP] osv: the object pool is not a service anymore

bzr revid: chs@openerp.com-20101213105104-jpctooc6j7yc8i8i
---
 bin/osv/osv.py | 73 +++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/bin/osv/osv.py b/bin/osv/osv.py
index e7b84351a23..c66ee896425 100644
--- a/bin/osv/osv.py
+++ b/bin/osv/osv.py
@@ -27,8 +27,6 @@ import orm
 import netsvc
 import pooler
 import copy
-import sys
-import traceback
 import logging
 from psycopg2 import IntegrityError, errorcodes
 from tools.func import wraps
@@ -46,7 +44,12 @@ class except_osv(Exception):
         self.args = (exc_type, name)
 
 
-class osv_pool(netsvc.Service):
+class object_proxy(netsvc.Service):
+    def __init__(self):
+        self.logger = logging.getLogger('web-services')
+        netsvc.Service.__init__(self, 'object_proxy', audience='')
+        self.exportMethod(self.exec_workflow)
+        self.exportMethod(self.execute)
 
     def check(f):
         @wraps(f)
@@ -151,41 +154,12 @@ class osv_pool(netsvc.Service):
                     self.abortResponse(1, _('Integrity Error'), 'warning', msg)
                 else:
                     self.abortResponse(1, _('Integrity Error'), 'warning', inst[0])
-            except Exception, e:
+            except Exception:
                 self.logger.exception("Uncaught exception")
                 raise
 
         return wrapper
 
-
-    def __init__(self):
-        self._ready = False
-        self.obj_pool = {}
-        self.module_object_list = {}
-        self.created = []
-        self._sql_error = {}
-        self._store_function = {}
-        self._init = True
-        self._init_parent = {}
-        self.logger = logging.getLogger("web-services")
-        netsvc.Service.__init__(self, 'object_proxy', audience='')
-        self.exportMethod(self.obj_list)
-        self.exportMethod(self.exec_workflow)
-        self.exportMethod(self.execute)
-
-    def init_set(self, cr, mode):
-        different = mode != self._init
-        if different:
-            if mode:
-                self._init_parent = {}
-            if not mode:
-                for o in self._init_parent:
-                    self.get(o)._parent_store_compute(cr)
-            self._init = mode
-
-        self._ready = True
-        return different
-
     def execute_cr(self, cr, uid, obj, method, *args, **kw):
         object = pooler.get_pool(cr.dbname).get(obj)
         if not object:
@@ -194,13 +168,12 @@ class osv_pool(netsvc.Service):
 
     @check
     def execute(self, db, uid, obj, method, *args, **kw):
-        db, pool = pooler.get_db_and_pool(db)
-        cr = db.cursor()
+        cr = pooler.get_db(db).cursor()
         try:
             try:
                 if method.startswith('_'):
                     raise except_osv('Access Denied', 'Private methods (such as %s) cannot be called remotely.' % (method,))
-                res = pool.execute_cr(cr, uid, obj, method, *args, **kw)
+                res = self.execute_cr(cr, uid, obj, method, *args, **kw)
                 if res is None:
                     self.logger.warning('The method %s of the object %s can not return `None` !', method, obj)
                 cr.commit()
@@ -229,6 +202,34 @@ class osv_pool(netsvc.Service):
             cr.close()
         return res
 
+object_proxy()
+
+class osv_pool(object):
+    def __init__(self):
+        self._ready = False
+        self.obj_pool = {}
+        self.module_object_list = {}
+        self.created = []
+        self._sql_error = {}
+        self._store_function = {}
+        self._init = True
+        self._init_parent = {}
+        self.logger = logging.getLogger("pool")
+
+    def init_set(self, cr, mode):
+        different = mode != self._init
+        if different:
+            if mode:
+                self._init_parent = {}
+            if not mode:
+                for o in self._init_parent:
+                    self.get(o)._parent_store_compute(cr)
+            self._init = mode
+
+        self._ready = True
+        return different
+
+
     def obj_list(self):
         return self.obj_pool.keys()
 

From e55bd7051cdfcc53b81f73e0797722510c9ccc01 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 13 Dec 2010 19:07:54 +0530
Subject: [PATCH 7/9] [FIX] openerp-buildfail-1-3691: remove tab char in
 line#72 and local variable count is assigned to but never used into
 fetchmail/fetchmail.py

bzr revid: hmo@tinyerp.com-20101213133754-8ucpt5in5qod8gjd
---
 addons/fetchmail/fetchmail.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 8bebe514402..7592061ec36 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -72,7 +72,7 @@ class email_server(osv.osv):
     }
 
     def check_duplicate(self, cr, uid, ids):
-	# RFC *-* Why this limitation? why not in SQL constraint?
+        # RFC *-* Why this limitation? why not in SQL constraint?
         vals = self.read(cr, uid, ids, ['user', 'password'])[0]
         cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password']))
         res = cr.fetchone()
@@ -113,7 +113,6 @@ class email_server(osv.osv):
         for server in self.browse(cr, uid, ids, context):
             logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             context.update({'server_id': server.id, 'server_type': server.type})
-            count = 0
             try:
                 if server.type == 'imap':
                     imap_server = None

From 7bcccbafe585701724e4bc118ab9b9495145d08c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 13 Dec 2010 17:18:02 +0100
Subject: [PATCH 8/9] [FIX] addons: avoid deleting resources after stand-alone
 base module update When updating a database, base module is first loaded on
 its own, and this may cause useless deletion of resource, because the
 aut-cleanup process. This process looks for records that are in the base
 namespace and have not been processed, and deletes them because they are
 presumed removed from the newer version. This does not properly work now that
 several modules install records (menus, groups) in the base namespace. This
 is fixed by skipping the auto-cleanup process during the stand-alone loading
 of base, which is fine because it will be processed properly after the rest
 of the modules are loaded/updated. (No specific LP bug reference, but many
 translation bugs stem partially from this)

bzr revid: odo@openerp.com-20101213161802-ulsece9bb3q1y1fx
---
 bin/addons/__init__.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 2413b21ce4e..feb635055f5 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -599,8 +599,19 @@ class MigrationManager(object):
 
 log = logging.getLogger('init')
 
-def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
-
+def load_module_graph(cr, graph, status=None, perform_checks=True, skip_cleanup=False, **kwargs):
+    """Migrates+Updates or Installs all module nodes from ``graph``
+       :param graph: graph of module nodes to load
+       :param status: status dictionary for keeping track of progress
+       :param perform_checks: whether module descriptors should be checked for validity (prints warnings
+                              for same cases, and even raise osv_except if certificate is invalid)
+       :param skip_cleanup: whether the auto-cleanup of records should be executed (unlinks any object that
+                            appears to be from one of the updated modules, but have not been loaded during
+                            last loading (i.e. records that seem to have been removed from the module).
+                            This is best left disabled when loading stand-alone modules that could contain
+                            records from dependent modules (i.e. other modules have put records in their
+                            namespace)
+    """
     def process_sql_file(cr, fp):
         queries = fp.read().split(';')
         for query in queries:
@@ -762,7 +773,9 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
     for model in cr.dictfetchall():
         pool.get('ir.model').instanciate(cr, 1, model['model'], {})
 
-    pool.get('ir.model.data')._process_end(cr, 1, package_todo)
+    if not skip_cleanup:
+        # Cleanup orphan records
+        pool.get('ir.model.data')._process_end(cr, 1, package_todo)
     cr.commit()
 
     return has_updates
@@ -806,7 +819,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         if not graph:
             logger.notifyChannel('init', netsvc.LOG_CRITICAL, 'module base cannot be loaded! (hint: verify addons-path)')
             raise osv.osv.except_osv(_('Could not load base module'), _('module base cannot be loaded! (hint: verify addons-path)'))
-        has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
+        has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report, skip_cleanup=True)
 
         if update_module:
             modobj = pool.get('ir.module.module')

From 94cfc0e203401fe48c4f6f83d1d82c076ea02089 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 13 Dec 2010 17:43:29 +0100
Subject: [PATCH 9/9] [ADD] web_uservoice module

bzr revid: chs@openerp.com-20101213164329-7nzi2hoc4n7c0m9p
---
 addons/web_uservoice/LICENSE                  | 15 ++++
 addons/web_uservoice/__init__.py              | 19 +++++
 addons/web_uservoice/__openerp__.py           | 34 +++++++++
 addons/web_uservoice/web/__init__.py          | 22 ++++++
 addons/web_uservoice/web/controllers.py       | 68 +++++++++++++++++
 addons/web_uservoice/web/editors.py           | 75 +++++++++++++++++++
 .../web/static/css/uservoice.css              |  7 ++
 7 files changed, 240 insertions(+)
 create mode 100644 addons/web_uservoice/LICENSE
 create mode 100644 addons/web_uservoice/__init__.py
 create mode 100644 addons/web_uservoice/__openerp__.py
 create mode 100644 addons/web_uservoice/web/__init__.py
 create mode 100644 addons/web_uservoice/web/controllers.py
 create mode 100644 addons/web_uservoice/web/editors.py
 create mode 100644 addons/web_uservoice/web/static/css/uservoice.css

diff --git a/addons/web_uservoice/LICENSE b/addons/web_uservoice/LICENSE
new file mode 100644
index 00000000000..27a1a4cf453
--- /dev/null
+++ b/addons/web_uservoice/LICENSE
@@ -0,0 +1,15 @@
+OpenERP, Open Source Management Solution
+Copyright © 2010 OpenERP SA (<http://openerp.com>).
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public Lice
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/web_uservoice/__init__.py b/addons/web_uservoice/__init__.py
new file mode 100644
index 00000000000..723a87ab410
--- /dev/null
+++ b/addons/web_uservoice/__init__.py
@@ -0,0 +1,19 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py
new file mode 100644
index 00000000000..974da96ef0d
--- /dev/null
+++ b/addons/web_uservoice/__openerp__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+{
+    'name': 'Add uservoice button in header',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': "",
+    'author': 'OpenERP s.a.',
+    'website': 'http://openerp.com',
+    'depends': ['base'],
+    'data': [],
+    'installable': True,
+    'active': False,
+    'web': True,
+    'certificate': '0040452504963885',
+}
diff --git a/addons/web_uservoice/web/__init__.py b/addons/web_uservoice/web/__init__.py
new file mode 100644
index 00000000000..c651b91f353
--- /dev/null
+++ b/addons/web_uservoice/web/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import editors
+import controllers
+
diff --git a/addons/web_uservoice/web/controllers.py b/addons/web_uservoice/web/controllers.py
new file mode 100644
index 00000000000..af3730b07b0
--- /dev/null
+++ b/addons/web_uservoice/web/controllers.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from openerp.controllers import SecuredController
+from openerp.utils import rpc
+from openobject.tools import expose
+import cherrypy
+
+class Root(SecuredController):
+
+    _cp_path = "/openerp"
+
+    @expose(mark_only=True)
+    def menu(self, active=None, next=None):
+        try:
+            menu_id = int(active)
+        except (TypeError, ValueError):
+            menu_id = False
+
+        menus = rpc.RPCProxy("ir.ui.menu")
+        ids = menus.search([('parent_id', '=', False)])
+        if next or active:
+            if not menu_id and ids:
+                menu_id = ids[0]
+
+        menu = ''
+        if menu_id:
+            ctx = dict(lang='NO_LANG')  # force loading original string even if the english have been translated...
+            menu = menus.read([menu_id], ['name'], ctx)[0]['name'] or ''
+
+        general_forum = 77459
+        forum = {
+            'accounting': 87921,
+            'administration': 87935,
+            'human resources': 87923,
+            'knowledge': 87927,
+            'manufacturing': 87915,
+            'marketing': 87925,
+            'point of sale': 87929,
+            'project': 87919,
+            'purchases': 87911,
+            'sales': 87907,
+            'tools': 87933,
+            'warehouse': 87913,
+        }.get(menu.lower().strip(), general_forum)
+
+        cherrypy.request.uservoice_forum = forum
+        return super(Root, self).menu(active, next)
+
+
diff --git a/addons/web_uservoice/web/editors.py b/addons/web_uservoice/web/editors.py
new file mode 100644
index 00000000000..36086d5d8b6
--- /dev/null
+++ b/addons/web_uservoice/web/editors.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import openobject.templating
+
+class BaseTemplateEditor(openobject.templating.TemplateEditor):
+    templates = ['/openobject/controllers/templates/base.mako']
+
+    def edit(self, template, template_text):
+        output = super(BaseTemplateEditor, self).edit(template, template_text)
+
+        end_head = output.index('</head>')
+
+        output = output[:end_head] + """
+<link rel="stylesheet" type="text/css" href="/web_uservoice/static/css/uservoice.css"/>
+        """ + output[end_head:]
+
+
+        end_body = output.index('</body>')
+
+        # testing forum: 84397
+        output = output[:end_body] + """
+<script type="text/javascript">
+  var uservoiceOptions = {
+    key: 'openerpsa',
+    host: 'feedback.openerp.com',
+    forum: '${getattr(cp.request, 'uservoice_forum', 77459)}',
+    lang: 'en',
+    showTab: false
+  };
+  function _loadUserVoice() {
+    var s = document.createElement('script');
+    s.src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js";
+    document.getElementsByTagName('head')[0].appendChild(s);
+  }
+  _loadSuper = window.onload;
+  window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
+</script>
+        """ + output[end_body:]
+
+        return output
+
+
+class HeaderTemplateEditor(openobject.templating.TemplateEditor):
+    templates = ['/openerp/controllers/templates/header.mako']
+
+    def edit(self, template, template_text):
+        output = super(HeaderTemplateEditor, self).edit(template, template_text)
+
+        PAT = '<ul class="tools">'
+
+        ul = output.index(PAT)
+        output = output[:ul] + """
+            <p class="logout feedback"><a href="#" onclick="UserVoice.Popin.show(uservoiceOptions); return false;"><img src="/web_uservoice/static/images/uv_favicon.png" />feedback</a></p>
+        """ + output[ul:]
+
+        return output
+
diff --git a/addons/web_uservoice/web/static/css/uservoice.css b/addons/web_uservoice/web/static/css/uservoice.css
new file mode 100644
index 00000000000..9ca2af55678
--- /dev/null
+++ b/addons/web_uservoice/web/static/css/uservoice.css
@@ -0,0 +1,7 @@
+#corner p.feedback a {
+    /*color: #9a0404;*/
+}
+#corner p.feedback img {
+    vertical-align: middle;
+    margin-right: 0.5em;
+}