From 367706427455a68b17dff1980aefc7666db38127 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Oct 2011 17:35:39 +0200
Subject: [PATCH 01/37] [IMP] notification: warnings does not expire

bzr revid: chs@openerp.com-20111005153539-xxds5bog4p08m2yl
---
 addons/web/static/src/js/chrome.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index dae7ba62ceb..579a95b1bad 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -28,7 +28,9 @@ openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Not
     warn: function(title, text) {
         this.$element.notify('create', 'oe_notification_alert', {
             title: title,
-            text: text
+            text: text,
+        }, {
+            expires: false,
         });
     }
 });

From f995b029adb9e7a37e793caaadad9008aaaf40bb Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Tue, 11 Oct 2011 16:16:10 +0530
Subject: [PATCH 02/37] [Fix] Stock:In menu Warehouse/Reporting/Last Product
 Inventories user can filter list of record by  Consumable button

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

bzr revid: aag@tinyerp.com-20111011104610-me91ssg9nnom2dgu
---
 addons/stock/report/report_stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 829fae14b6b..fe49e8eae9f 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -38,7 +38,7 @@
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
-                        domain="[('product_id.type','=', 'consumable')]"/>
+                        domain="[('product_id.type','=', 'consu')]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>

From 31c8d4240fc023500127ea61361a0fed98333abb Mon Sep 17 00:00:00 2001
From: Amit Parik <>
Date: Tue, 11 Oct 2011 16:35:22 +0530
Subject: [PATCH 03/37] [FIX] point_of_sale : wrong domain in POS for 'Products
 'Take Money Out' and Products 'Put Money In'

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

bzr revid: bde@tinyerp.com-20111011110522-tdslg58i2q7wd15c
---
 addons/point_of_sale/point_of_sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 4f1019e602e..65b356b3845 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -670,7 +670,7 @@
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('income_pdt','=',True)]</field>
+            <field name="domain">[('expense_pdt','=',True)]</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_product_input_tree_tag">
             <field name="sequence" eval="1"/>
@@ -696,7 +696,7 @@
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('expense_pdt','=',True)]</field>
+            <field name="domain">[('income_pdt','=',True)]</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_product_output_tree_tag">
             <field name="sequence" eval="1"/>

From f5290738fa20c06cba644b7a8a00397fc9acf826 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Tue, 11 Oct 2011 18:17:59 +0530
Subject: [PATCH 04/37] [Fix] mrp_repair:when Repair Orders confirmed state is
 Confirmed to Repair

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

bzr revid: aag@tinyerp.com-20111011124759-3981imbw2kjklk5f
---
 addons/mrp_repair/mrp_repair.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 6e5543dbadd..ce5c21b5f53 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -122,7 +122,7 @@ class mrp_repair(osv.osv):
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
-            ('confirmed','Confirmed, to repair'),
+            ('confirmed','Confirmed to Repair'),
             ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
             ('2binvoiced','To be Invoiced'),

From b720f12d55724d6a91a4847b9b1cf516b265f1cb Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 12 Oct 2011 11:34:26 +0530
Subject: [PATCH 05/37] [Fix] Purchase:In Purchases/Reporting/Purchase Analysis
 search view Category,Reference UOM Buttons Icons are changed

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

bzr revid: aag@tinyerp.com-20111012060426-czoq7wdwbsppjkzh
---
 addons/purchase/report/purchase_report_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index d0b0c13c211..f947857a016 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -99,8 +99,8 @@
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
  					<separator orientation="vertical"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <filter string="Category" name="group_category_id" icon="terp-accessories-archiver" context="{'group_by':'category_id'}"/>
-                    <filter string="Reference UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
+                    <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
+                    <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>

From da939a215aca097e534bb76d3a3e5b7e0aa4c6ef Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <>
Date: Wed, 12 Oct 2011 12:08:00 +0530
Subject: [PATCH 06/37] [FIX] account : in bank statement form when i tried to
 import invoice from button import invoices

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

bzr revid: bde@tinyerp.com-20111012063800-p72utna4b9olsbeu
---
 addons/account_voucher/account_voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 005e5d9ab46..f609192ade8 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1056,7 +1056,7 @@ class account_bank_statement_line(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.voucher_id:
                 diff = abs(obj.amount) - obj.voucher_id.amount
-                if not self.pool.get('res.currency').is_zero(cr, uid, obj.voucher_id.currency_id, diff):
+                if not self.pool.get('res.currency').is_zero(cr, uid, obj.statement_id.currency, diff):
                     return False
         return True
 

From ecab5ad2862d771948cd59b80536e5e67b4bdbf0 Mon Sep 17 00:00:00 2001
From: "Kirti Savalia (OpenERP)" <ksa@tinyerp.com>
Date: Wed, 12 Oct 2011 13:04:12 +0530
Subject: [PATCH 07/37] [FIX]:pass the missing context in product_id_change
 method

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

bzr revid: ksa@tinyerp.com-20111012073412-h7k3tr07bcy2vpup
---
 addons/warning/warning.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index ab7a5926653..9f699ab9911 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -197,7 +197,7 @@ class sale_order_line(osv.osv):
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False, packaging=False,
-            fiscal_position=False, flag=False):
+            fiscal_position=False, flag=False, context=None):
         warning = {}
         if not product:
             return {'value': {'th_weight' : 0, 'product_packaging': False,
@@ -232,7 +232,7 @@ class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
     def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
-            name=False, price_unit=False, notes=False):
+            name=False, price_unit=False, notes=False, context=None):
         warning = {}
         if not product:
             return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}

From 948b05507e5d501cd55f2d4fb55db7fb42095b63 Mon Sep 17 00:00:00 2001
From: "Kirti Savalia (OpenERP)" <ksa@tinyerp.com>
Date: Wed, 12 Oct 2011 14:19:01 +0530
Subject: [PATCH 08/37] [FIX]:Group By state in analytic accounts

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

bzr revid: ksa@tinyerp.com-20111012084901-9ym5207s34wogit7
---
 addons/account/project/project_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 54abae1d992..5e0c4acbcbe 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -65,6 +65,7 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
+                    <field name="state" invisible="1"/>
                     <field name="currency_id" groups="base.group_extended"/>
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>

From 486068af6bd8879c8d986dc64fbdd6149584995d Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 12 Oct 2011 15:02:38 +0530
Subject: [PATCH 09/37] [IMP] mrp_repair:change state name Confirmed to Repair
 ==> To Repair

bzr revid: aag@tinyerp.com-20111012093238-2u82cugba2fd3336
---
 addons/mrp_repair/mrp_repair.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index ce5c21b5f53..77164049390 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -122,7 +122,7 @@ class mrp_repair(osv.osv):
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
-            ('confirmed','Confirmed to Repair'),
+            ('confirmed','To Repair'),
             ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
             ('2binvoiced','To be Invoiced'),

From ddd6c53d256aaf17a6800ed9a3a0b95fa880a06a Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 12 Oct 2011 15:12:40 +0530
Subject: [PATCH 10/37] [IMP] mrp_repair:change state name  To Repair to
 confirmed

bzr revid: aag@tinyerp.com-20111012094240-pr4yenhrkqm5o738
---
 addons/mrp_repair/mrp_repair.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 77164049390..18979e998bd 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -122,7 +122,7 @@ class mrp_repair(osv.osv):
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
-            ('confirmed','To Repair'),
+            ('confirmed','Confirmed'),
             ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
             ('2binvoiced','To be Invoiced'),

From 8cf348cc570433934348c9c50852b1e3a415b613 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 13 Oct 2011 08:56:11 +0200
Subject: [PATCH 11/37] [IMP] account, financial.report object: added
 translate=True on 'name' field

bzr revid: qdp-launchpad@openerp.com-20111013065611-ibvbezd2hthzr3v9
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index a9111e12bb1..ebc1f23a44d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2719,7 +2719,7 @@ class account_financial_report(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Report Name', size=128, required=True),
+        'name': fields.char('Report Name', size=128, required=True, translate=True),
         'parent_id': fields.many2one('account.financial.report', 'Parent'),
         'children_ids':  fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
         'sequence': fields.integer('Sequence'),

From e7075a939d87f65925809f6624d8a330bc19bfff Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 13 Oct 2011 09:10:04 +0200
Subject: [PATCH 12/37] [FIX] product: usability fix

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

bzr revid: qdp-launchpad@openerp.com-20111013071004-9pm5ci3pac0kylna
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 35798ce939d..254a75fdcdc 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
-                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />

From d29aa739714271757986160358e6856438a7b691 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 10:13:51 +0200
Subject: [PATCH 13/37] [IMP] allow controller functions to return
 werkzeug.exceptions.HTTPException (i.e. 404 errors)

bzr revid: chs@openerp.com-20111013081351-layprblm1dt140py
---
 addons/web/common/http.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 453484acee7..314ac8ce717 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -227,7 +227,7 @@ class HttpRequest(WebRequest):
         _logger.debug("%s --> %s.%s %r", self.httprequest.method, controller.__class__.__name__, method.__name__, akw)
         r = method(controller, self, **self.params)
         if self.debug or 1:
-            if isinstance(r, werkzeug.wrappers.BaseResponse):
+            if isinstance(r, (werkzeug.wrappers.BaseResponse, werkzeug.exceptions.HTTPException)):
                 _logger.debug('<-- %s', r)
             else:
                 _logger.debug("<-- size: %s", len(r))
@@ -395,7 +395,8 @@ class Root(object):
                 else:
                     response = result
 
-                response.set_cookie(self.session_cookie, session.sid)
+                if hasattr(response, 'set_cookie'):
+                    response.set_cookie(self.session_cookie, session.sid)
 
         return response(environ, start_response)
 

From a58395f2af3181bf94738a6cfcfa7c691172437a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 10:14:45 +0200
Subject: [PATCH 14/37] [FIX] do no load the menu until a session is active
 [IMP] make menu loading hookable

bzr revid: chs@openerp.com-20111013081445-1xzvodzrtxvacbzz
---
 addons/web/static/src/js/chrome.js | 4 ++--
 addons/web/static/src/js/views.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1742bd91c95..dae7ba62ceb 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -788,9 +788,8 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     },
     start: function() {
         this.$secondary_menu.addClass(this.folded ? 'oe_folded' : 'oe_unfolded');
-        this.reload();
     },
-    reload: function() {
+    do_reload: function() {
         this.rpc("/web/menu/load", {}, this.on_loaded);
     },
     on_loaded: function(data) {
@@ -972,6 +971,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.menu.start();
     },
     on_logged: function() {
+        this.menu.do_reload();
         if(this.action_manager)
             this.action_manager.stop();
         this.action_manager = new openerp.web.ActionManager(this);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 593e5cab116..006213086be 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -124,7 +124,7 @@ db.web.ActionManager = db.web.Widget.extend({
         if (this.dialog && action.context) {
             var model = action.context.active_model;
             if (model === 'base.module.upgrade' || model === 'base.setup.installer') {
-                db.webclient.menu.reload();
+                db.webclient.menu.do_reload();
             }
         }
         this.dialog_stop();

From 2be7586c542d4ebd6cddebb1105ab65ec899c785 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 13 Oct 2011 11:34:23 +0200
Subject: [PATCH 15/37] [FIX] fields.related: fix example in docstring

bzr revid: qdp-launchpad@openerp.com-20111013093423-lynuxoan01327jv9
---
 openerp/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 11f24f14505..d0be75a012f 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1037,7 +1037,7 @@ class related(function):
 
        _columns = {
            'foo_id': fields.many2one('my.foo', 'Foo'),
-           'bar': fields.related('frol', 'foo_id', type='char', string='Frol of Foo'),
+           'bar': fields.related('foo_id', 'frol', type='char', string='Frol of Foo'),
         }
     """
 

From 60c780120020403ede5cb1997f5508983c642109 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Oct 2011 11:36:56 +0200
Subject: [PATCH 16/37] [fix] some inconsistencies in context in a view in
 hr_recruitment

bzr revid: nicolas.vanhoren@openerp.com-20111013093656-f04vuvyl0wxihh86
---
 addons/hr_recruitment/hr_recruitment_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index e5905b16a77..3310dbcf4ef 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -89,7 +89,8 @@
                     <field name="user_id"/>
                     <field name="survey" invisible="1"/>
                     <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <field name="response" invisible="1"/>
                     <newline/>
                     <field name="date_action"/>
                     <field name="title_action"/>

From c7a888f343c7fa11e266d3f2e75a6bcd092d5910 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Oct 2011 11:38:14 +0200
Subject: [PATCH 17/37] [fix] buttons do not use an evalutation context despite
 the fact the context on buttons can depend on it

bzr revid: nicolas.vanhoren@openerp.com-20111013093814-xalvnvp6vajslruo
---
 addons/web/static/src/js/view_form.js | 99 ++++++++++++++-------------
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b0dce062519..7e5871166dc 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -735,6 +735,51 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form.
     render: function() {
         var template = this.template;
         return QWeb.render(template, { "widget": this });
+    },
+    _build_view_fields_values: function() {
+        var a_dataset = this.view.dataset;
+        var fields_values = this.view.get_fields_values();
+        var parent_values = a_dataset.parent_view ? a_dataset.parent_view.get_fields_values() : {};
+        fields_values.parent = parent_values;
+        return fields_values;
+    },
+    _build_eval_context: function() {
+        var a_dataset = this.view.dataset;
+        return new openerp.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values());
+    },
+    /**
+     * Builds a new context usable for operations related to fields by merging
+     * the fields'context with the action's context.
+     */
+    build_context: function() {
+        var f_context = (this.field || {}).context || {};
+        if (!!f_context.__ref) {
+            var fields_values = this._build_eval_context();
+            f_context = new openerp.web.CompoundDomain(f_context).set_eval_context(fields_values);
+        }
+        // maybe the default_get should only be used when we do a default_get?
+        var v_contexts = _.compact([this.node.attrs.default_get || null,
+            this.node.attrs.context || null]);
+        var v_context = new openerp.web.CompoundContext();
+        _.each(v_contexts, function(x) {v_context.add(x);});
+        if (_.detect(v_contexts, function(x) {return !!x.__ref;})) {
+            var fields_values = this._build_eval_context();
+            v_context.set_eval_context(fields_values);
+        }
+        // if there is a context on the node, overrides the model's context
+        var ctx = v_contexts.length > 0 ? v_context : f_context;
+        return ctx;
+    },
+    build_domain: function() {
+        var f_domain = this.field.domain || [];
+        var n_domain = this.node.attrs.domain || null;
+        // if there is a domain on the node, overrides the model's domain
+        var final_domain = n_domain !== null ? n_domain : f_domain;
+        if (!(final_domain instanceof Array)) {
+            var fields_values = this._build_eval_context();
+            final_domain = new openerp.web.CompoundDomain(final_domain).set_eval_context(fields_values);
+        }
+        return final_domain;
     }
 });
 
@@ -956,9 +1001,16 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
     },
     on_confirmed: function() {
         var self = this;
+        
+        var context = this.node.attrs.context;
+        if (context && context.__ref) {
+            context = new openerp.web.CompoundContext(context);
+            context.set_eval_context(this._build_eval_context());
+        }
 
         return this.view.do_execute_action(
-            this.node.attrs, this.view.dataset, this.view.datarecord.id, function () {
+            _.extend({}, this.node.attrs, {context: context}),
+            this.view.dataset, this.view.datarecord.id, function () {
                 self.view.reload();
             });
     },
@@ -1105,51 +1157,6 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
         this.invalid = false;
     },
     focus: function() {
-    },
-    _build_view_fields_values: function() {
-        var a_dataset = this.view.dataset;
-        var fields_values = this.view.get_fields_values();
-        var parent_values = a_dataset.parent_view ? a_dataset.parent_view.get_fields_values() : {};
-        fields_values.parent = parent_values;
-        return fields_values;
-    },
-    _build_eval_context: function() {
-        var a_dataset = this.view.dataset;
-        return new openerp.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values());
-    },
-    /**
-     * Builds a new context usable for operations related to fields by merging
-     * the fields'context with the action's context.
-     */
-    build_context: function() {
-        var f_context = this.field.context || {};
-        if (!!f_context.__ref) {
-            var fields_values = this._build_eval_context();
-            f_context = new openerp.web.CompoundDomain(f_context).set_eval_context(fields_values);
-        }
-        // maybe the default_get should only be used when we do a default_get?
-        var v_contexts = _.compact([this.node.attrs.default_get || null,
-            this.node.attrs.context || null]);
-        var v_context = new openerp.web.CompoundContext();
-        _.each(v_contexts, function(x) {v_context.add(x);});
-        if (_.detect(v_contexts, function(x) {return !!x.__ref;})) {
-            var fields_values = this._build_eval_context();
-            v_context.set_eval_context(fields_values);
-        }
-        // if there is a context on the node, overrides the model's context
-        var ctx = v_contexts.length > 0 ? v_context : f_context;
-        return ctx;
-    },
-    build_domain: function() {
-        var f_domain = this.field.domain || [];
-        var n_domain = this.node.attrs.domain || null;
-        // if there is a domain on the node, overrides the model's domain
-        var final_domain = n_domain !== null ? n_domain : f_domain;
-        if (!(final_domain instanceof Array)) {
-            var fields_values = this._build_eval_context();
-            final_domain = new openerp.web.CompoundDomain(final_domain).set_eval_context(fields_values);
-        }
-        return final_domain;
     }
 });
 

From 15e73da3304b9771baa33d22699d0d821be90b12 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Oct 2011 10:51:00 +0200
Subject: [PATCH 18/37] [FIX] FormView.on_saved should resolve on a result,
 ideally the same as FormView.on_created minus the 'created' key

bzr revid: xmo@openerp.com-20111013085100-xpl29e2f2jnqmt1v
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7e5871166dc..8bc31d4e015 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -451,7 +451,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             return $.Deferred().reject();
         } else {
             this.reload();
-            return $.when().then(success);
+            return $.when(r).then(success);
         }
     },
     /**
@@ -485,7 +485,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                 this.sidebar.attachments.do_update();
             }
             console.debug("The record has been created with id #" + this.datarecord.id);
-            this.reload()
+            this.reload();
             return $.when(_.extend(r, {created: true})).then(success);
         }
     },

From b08b10d16f4ee875cfa23666419b0a55a8658ee7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 13 Oct 2011 11:43:47 +0200
Subject: [PATCH 19/37] [REF/FIX] account: replaced 'journal_id' and
 'period_id' fields on account.move.line object with fields.related

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

bzr revid: qdp-launchpad@openerp.com-20111013094347-ax0v8s5xbw5l0ye3
---
 addons/account/account.py           | 16 ----------------
 addons/account/account_move_line.py | 10 ++++++++--
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ebc1f23a44d..46e7b3457ec 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1213,22 +1213,10 @@ class account_move(osv.osv):
                     return False
         return True
 
-    def _check_period_journal(self, cursor, user, ids, context=None):
-        for move in self.browse(cursor, user, ids, context=context):
-            for line in move.line_id:
-                if line.period_id.id != move.period_id.id:
-                    return False
-                if line.journal_id.id != move.journal_id.id:
-                    return False
-        return True
-
     _constraints = [
         (_check_centralisation,
             'You can not create more than one move per period on centralized journal',
             ['journal_id']),
-        (_check_period_journal,
-            'You can not create journal items on different periods/journals in the same journal entry',
-            ['line_id']),
     ]
 
     def post(self, cr, uid, ids, context=None):
@@ -1511,8 +1499,6 @@ class account_move(osv.osv):
                 # Update the move lines (set them as valid)
 
                 obj_move_line.write(cr, uid, line_draft_ids, {
-                    'journal_id': move.journal_id.id,
-                    'period_id': move.period_id.id,
                     'state': 'valid'
                 }, context, check=False)
 
@@ -1553,8 +1539,6 @@ class account_move(osv.osv):
                 # We can't validate it (it's unbalanced)
                 # Setting the lines as draft
                 obj_move_line.write(cr, uid, line_ids, {
-                    'journal_id': move.journal_id.id,
-                    'period_id': move.period_id.id,
                     'state': 'draft'
                 }, context, check=False)
         # Create analytic lines for the valid moves
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e105765a31c..5de7fed2428 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -494,8 +494,14 @@ class account_move_line(osv.osv):
         'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
         'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
-        'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
+        'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, readonly=True,
+                                store = {
+                                    'account.move': (_get_move_lines, ['journal_id'], 20)
+                                }),
+        'period_id': fields.related('move_id', 'period_id', string='Period', type='many2one', relation='account.period', required=True, select=True, readonly=True,
+                                store = {
+                                    'account.move': (_get_move_lines, ['period_id'], 20)
+                                }),
         'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
         'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),

From 00b269d1c0a3507a01a296587e96bcb9e8e6da86 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 12:26:53 +0200
Subject: [PATCH 20/37] [IMP] nivification of Notification Widget

bzr revid: chs@openerp.com-20111013102653-wox1v4o9mfplzt2b
---
 addons/web/static/src/js/chrome.js    | 56 +++++++++++++++++++--------
 addons/web/static/src/js/search.js    |  2 +-
 addons/web/static/src/js/view_form.js | 12 +++---
 addons/web/static/src/js/views.js     |  2 +-
 addons/web/static/src/xml/base.xml    | 12 ++++--
 5 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 579a95b1bad..2b35fae540f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -5,15 +5,11 @@ openerp.web.chrome = function(openerp) {
 var QWeb = openerp.web.qweb;
 
 openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Notification# */{
-    /**
-     * @constructs openerp.web.Notification
-     * @extends openerp.web.Widget
-     *
-     * @param parent
-     * @param element_id
-     */
-    init: function(parent, element_id) {
-        this._super(parent, element_id);
+    template: 'Notification',
+    identifier_prefix: 'notification-',
+
+    start: function() {
+        this._super.apply(this, arguments);
         this.$element.notify({
             speed: 500,
             expires: 1500
@@ -32,9 +28,36 @@ openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Not
         }, {
             expires: false,
         });
-    }
+    },
+    
+    do_notify: function() { this.notify.apply(this, arguments); },
+    do_warn: function() {this.warn.apply(this, arguments); },
+
 });
 
+openerp.web.NotifiableWidget = openerp.web.Widget.extend({
+
+    init: function(/*arguments*/) {
+        this._super.apply(this, arguments);
+        this.notification = new openerp.web.Notification(this);
+    },
+
+    start: function() {
+        this._super.apply(this, arguments);
+        this.notification.prependTo(this.$element);
+    },
+
+    stop: function() {
+        this.notification.stop();
+        return this._super.apply(this, arguments);
+    },
+
+    do_notify: function() { this.notification.notify.apply(this.notification, arguments); },
+    do_warn: function() { this.notification.warn.apply(this.notification, arguments); },
+});
+
+
+
 openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{
     dialog_title: "",
     identifier_prefix: 'dialog',
@@ -371,7 +394,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
                     }
                     $db_list.find(':selected').remove();
                     self.db_list.splice(_.indexOf(self.db_list, db, true), 1);
-                    self.notification.notify("Dropping database", "The database '" + db + "' has been dropped");
+                    self.do_notify("Dropping database", "The database '" + db + "' has been dropped");
                 });
             }
         });
@@ -456,7 +479,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
                         self.display_error(result);
                         return;
                     }
-                    self.notification.notify("Changed Password", "Password has been changed successfully");
+                    self.do_notify("Changed Password", "Password has been changed successfully");
                 });
             }
         });
@@ -922,7 +945,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     }
 });
 
-openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{
+openerp.web.WebClient = openerp.web.NotifiableWidget.extend(/** @lends openerp.web.WebClient */{
     /**
      * @constructs openerp.web.WebClient
      * @extends openerp.web.Widget
@@ -945,9 +968,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.crashmanager =  new openerp.web.CrashManager(this);
         this.crashmanager.start();
 
-        // Do you autorize this ? will be replaced by notify() in controller
-        openerp.web.Widget.prototype.notification = new openerp.web.Notification(this, "oe_notification");
-
         this.header = new openerp.web.Header(this);
         this.login = new openerp.web.Login(this);
         this.header.on_logout.add(this.login.on_logout);
@@ -967,6 +987,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
 
     },
     start: function() {
+        this._super.apply(this, arguments);
         this.header.appendTo($("#oe_header"));
         this.session.start();
         this.login.appendTo($('#oe_login'));
@@ -1060,7 +1081,8 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.action_manager.do_action(action);
     },
     do_about: function() {
-    }
+    },
+
 });
 
 };
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 9cab0ade9d0..2769a860d2a 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -336,7 +336,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      * @param {Array} errors a never-empty array of error objects
      */
     on_invalid: function (errors) {
-        this.notification.notify("Invalid Search", "triggered from search view");
+        this.do_notify("Invalid Search", "triggered from search view");
     },
     do_clear: function () {
         this.$element.find('.filter_label, .filter_icon').removeClass('enabled');
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b0dce062519..e3f147d1e4d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -443,7 +443,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             }
         });
         msg += "</ul>";
-        this.notification.warn("The following fields are invalid :", msg);
+        this.do_warn("The following fields are invalid :", msg);
     },
     on_saved: function(r, success) {
         if (!r.result) {
@@ -616,7 +616,7 @@ openerp.web.form.SidebarAttachments = openerp.web.Widget.extend({
                 ids: [parseInt($e.attr('data-id'))]
             }, function(r) {
                 $e.parent().remove();
-                self.notification.notify("Delete an attachment", "The attachment '" + name + "' has been deleted");
+                self.do_notify("Delete an attachment", "The attachment '" + name + "' has been deleted");
             });
         }
     }
@@ -1195,7 +1195,7 @@ openerp.web.form.FieldEmail = openerp.web.form.FieldChar.extend({
     },
     on_button_clicked: function() {
         if (!this.value || !this.is_valid()) {
-            this.notification.warn("E-mail error", "Can't send email to invalid e-mail address");
+            this.do_warn("E-mail error", "Can't send email to invalid e-mail address");
         } else {
             location.href = 'mailto:' + this.value;
         }
@@ -1210,7 +1210,7 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
     },
     on_button_clicked: function() {
         if (!this.value) {
-            this.notification.warn("Resource error", "This resource is empty");
+            this.do_warn("Resource error", "This resource is empty");
         } else {
             window.open(this.value);
         }
@@ -2626,7 +2626,7 @@ openerp.web.form.FieldBinary = openerp.web.form.Field.extend({
     on_file_uploaded: function(size, name, content_type, file_base64) {
         delete(window[this.iframe]);
         if (size === false) {
-            this.notification.warn("File Upload", "There was a problem while uploading your file");
+            this.do_warn("File Upload", "There was a problem while uploading your file");
             // TODO: use openerp web crashmanager
             console.warn("Error while uploading file : ", name);
         } else {
@@ -2640,7 +2640,7 @@ openerp.web.form.FieldBinary = openerp.web.form.Field.extend({
     },
     on_save_as: function() {
         if (!this.view.datarecord.id) {
-            this.notification.warn("Can't save file", "The record has not yet been saved");
+            this.do_warn("Can't save file", "The record has not yet been saved");
         } else {
             var url = '/web/binary/saveas?session_id=' + this.session.session_id + '&model=' +
                 this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name +
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 006213086be..a26063c1fc7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -902,7 +902,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
         if (this.fields_view && this.fields_view.arch) {
             $('<xmp>' + db.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
         } else {
-            this.notification.warn("Manage Views", "Could not find current view declaration");
+            this.do_warn("Manage Views", "Could not find current view declaration");
         }
     },
     on_sidebar_edit_workflow: function() {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 9dc2bb7152a..b676caa6df7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -2,9 +2,10 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-<t t-name="Interface">
-    <div id="oe_loading" class="loading"></div>
-    <div id="oe_notification" class="oe_notification">
+
+
+    <t t-name="Notification">
+        <div class="oe_notification">
         <div id="oe_notification_default">
             <a class="ui-notify-cross ui-notify-close" href="#">x</a>
             <h1>#{title}</h1>
@@ -16,7 +17,10 @@
             <h1>#{title}</h1>
             <p>#{text}</p>
         </div>
-    </div>
+        </div>
+    </t>
+<t t-name="Interface">
+    <div id="oe_loading" class="loading"></div>
     <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
     <tr>
         <td colspan="2" valign="top">

From 97ba7be42de4c60e53de883609621732f4369297 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 13 Oct 2011 12:47:50 +0200
Subject: [PATCH 21/37] [IMP] res.users,web_services: new authenticate() API
 method for testing credentials

      Provides a way to login for a given environment, passing
      user agent environment parameters.
      Currently used to initialize the web.base.url config
      parameter based on the web host whenever the admin user
      logs in.

bzr revid: odo@openerp.com-20111013104750-y0natm9v3wapn10l
---
 openerp/addons/base/res/res_users.py | 27 +++++++++++++++++++++++++++
 openerp/service/web_services.py      | 27 +++++++++++++++++----------
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 2275ba76014..0eb70945b6d 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -35,6 +35,7 @@ from osv import fields,osv
 from osv.orm import browse_record
 from service import security
 from tools.translate import _
+import openerp
 import openerp.exceptions
 
 class groups(osv.osv):
@@ -417,6 +418,32 @@ class users(osv.osv):
         data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
         return dataobj.browse(cr, uid, data_id, context=context).res_id
 
+    def authenticate(self, db, login, password, user_agent_env):
+        """Verifies and returns the user ID corresponding to the given
+          ``login`` and ``password`` combination, or False if there was
+          no matching user.
+
+           :param str db: the database on which user is trying to authenticate
+           :param str login: username
+           :param str password: user password
+           :param dict user_agent_env: environment dictionary describing any
+               relevant environment attributes
+        """
+        uid = self.login(db, login, password)
+        if uid == openerp.SUPERUSER_ID:
+            # Successfully logged in as admin!
+            # Attempt to guess the web base url...
+            if user_agent_env and 'host' in user_agent_env:
+                cr = pooler.get_db(db).cursor()
+                try:
+                    self.pool.get('ir.config_parameter').set_param(cr, uid, 'web.base.url',
+                                                                   user_agent_env['host'])
+                    cr.commit()
+                except Exception:
+                    logging.getLogger('res.users').exception("Failed to update web.base.url configuration parameter")
+                finally:
+                    cr.close()
+        return uid
 
     def login(self, db, login, password):
         if not password:
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 5f0a1dccff9..2cf8a848378 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -366,20 +366,15 @@ class db(netsvc.ExportService):
         return True
 
 class common(netsvc.ExportService):
+    _logger = logging.getLogger('web-services')
+
     def __init__(self,name="common"):
         netsvc.ExportService.__init__(self,name)
 
     def dispatch(self, method, params):
-        logger = netsvc.Logger()
-        if method == 'login':
-            res = security.login(params[0], params[1], params[2])
-            msg = res and 'successful login' or 'bad login or password'
-            # TODO log the client ip address..
-            logger.notifyChannel("web-service", netsvc.LOG_INFO, "%s from '%s' using database '%s'" % (msg, params[1], params[0].lower()))
-            return res or False
-        elif method in ['about', 'timezone_get', 'get_server_environment',
-                        'login_message','get_stats', 'check_connectivity',
-                        'list_http_services', 'version']:
+        if method in ['login', 'about', 'timezone_get', 'get_server_environment',
+                      'login_message','get_stats', 'check_connectivity',
+                      'list_http_services', 'version', 'authenticate']:
             pass
         elif method in ['get_available_updates', 'get_migration_scripts', 'set_loglevel', 'get_os_time', 'get_sqlcount']:
             passwd = params[0]
@@ -391,6 +386,18 @@ class common(netsvc.ExportService):
         fn = getattr(self, 'exp_'+method)
         return fn(*params)
 
+    def exp_login(self, db, login, password):
+        # TODO: legacy indirection through 'security', should use directly
+        # the res.users model
+        res = security.login(db, login, password)
+        msg = res and 'successful login' or 'bad login or password'
+        self._logger.info("%s from '%s' using database '%s'", msg, login, db.lower())
+        return res or False
+
+    def exp_authenticate(self, db, login, password, user_agent_env):
+        res_users = pooler.get_pool(db).get('res.users')
+        return res_users.authenticate(db, login, password, user_agent_env)
+
     def exp_version(self):
         return RPC_VERSION_1
 

From 4dc731f99c4ee5ad90635f09b0eb70c2025e151d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Oct 2011 13:27:55 +0200
Subject: [PATCH 22/37] [FIX] BufferedDataSet to not break the m2o read
 contract of returning a name_get format

BufferedDataSet simply shoves stuff read() or create()d in its cache,
but m2o is asymmetric: client writes a single id, but reads a pair of
[id, name].

Since create() and write() are async (by definition) it's the best
place to check if the data being written contains any m2o field, and
to fix those m2o values.

bzr revid: xmo@openerp.com-20111013112755-krf9y5w232ol6r1e
---
 addons/web/static/src/js/data.js | 132 +++++++++++++++++++++++--------
 1 file changed, 101 insertions(+), 31 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index ea0824fb1df..0906a26050e 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -610,44 +610,114 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
     on_default_get: function(res) {
         this.last_default_get = res;
     },
+    /**
+     * Makes sure this dataset has the fields_get for its model stored locally,
+     * so create/write methods are able to determine if written fields are m2os
+     * and can name_get those fields if that's the case (in order to cache a
+     * correct m2o value for them)
+     *
+     * @returns {$.Deferred} whether the fields_get is done executing, provides the fields_get value to its callbacks
+     */
+    ensure_has_fields: function () {
+        var self = this;
+
+        if (this.fields_get) {
+            var d = $.Deferred();
+            setTimeout(function () { d.resolve(self.fields_get, true); }, 0);
+            return d.promise();
+        } else {
+            return self.call('fields_get', [], function (fields_get) {
+                self.fields_get = fields_get;
+            });
+        }
+    },
+    /**
+     * Relational fields may not be written in the same format they are read.
+     *
+     * Since the BufferedDataSet is a bit dumb, it returns what it's got stored
+     * in its cache, which for modified value is what it was given. This breaks
+     * some basic contracts of openerp such as m2o read being in the
+     * ``name_get`` format.
+     *
+     * Because create & write are supposed to be asynchronous, though, it
+     * should be easy to just name_get all incorrect values.
+     *
+     * @param {Object} data form-data to write to the cache
+     * @returns {$.Deferred} resolved with a fixed data dictionary
+     */
+    fix_relational: function (data) {
+        var self = this;
+        var results = $.Deferred();
+        this.ensure_has_fields().then(function (fields) {
+            var fields_to_fix = _(fields).chain()
+                .map(function (d, k) { return {key: k, descriptor: d}; })
+                .filter(function (field) {
+                    // keep m2o fields which are in the data dict
+                    return field.descriptor.type === 'many2one' &&
+                           field.key in data;
+                }).pluck('key')
+                .value();
+            var name_gets = _(fields_to_fix).map(function (field) {
+                return new openerp.web.DataSet(self, self.fields_get[field].relation)
+                    .name_get([data[field]], null);
+            });
+            $.when.apply(null, name_gets).then(function () {
+                var record = _.extend({}, data);
+                for(var i=0; i<fields_to_fix.length; ++i) {
+                    record[fields_to_fix[i]] = arguments[i][0];
+                }
+                results.resolve(record);
+            });
+        });
+        return results;
+    },
     create: function(data, callback, error_callback) {
-        var cached = {id:_.uniqueId(this.virtual_id_prefix), values: data,
-            defaults: this.last_default_get};
-        this.to_create.push(_.extend(_.clone(cached), {values: _.clone(cached.values)}));
-        this.cache.push(cached);
-        this.on_change();
+        var self = this;
         var prom = $.Deferred().then(callback);
-        prom.resolve({result: cached.id});
+        this.fix_relational(data).then(function (fixed_data) {
+            var cached = {
+                id:_.uniqueId(self.virtual_id_prefix),
+                values: fixed_data,
+                defaults: self.last_default_get
+            };
+            this.to_create.push(_.extend(_.clone(cached), {
+                values: _.clone(cached.values)}));
+            self.cache.push(cached);
+            self.on_change();
+            prom.resolve({result: cached.id});
+        });
         return prom.promise();
     },
     write: function (id, data, options, callback) {
         var self = this;
-        var record = _.detect(this.to_create, function(x) {return x.id === id;});
-        record = record || _.detect(this.to_write, function(x) {return x.id === id;});
-        var dirty = false;
-        if (record) {
-            for (var k in data) {
-                if (record.values[k] === undefined || record.values[k] !== data[k]) {
-                    dirty = true;
-                    break;
-                }
-            }
-            $.extend(record.values, data);
-        } else {
-            dirty = true;
-            record = {id: id, values: data};
-            self.to_write.push(record);
-        }
-        var cached = _.detect(this.cache, function(x) {return x.id === id;});
-        if (!cached) {
-            cached = {id: id, values: {}};
-            this.cache.push(cached);
-        }
-        $.extend(cached.values, record.values);
-        if (dirty)
-            this.on_change();
         var to_return = $.Deferred().then(callback);
-        to_return.resolve({result: true});
+        this.fix_relational(data).then(function (fixed_data) {
+            var record = _.detect(self.to_create, function(x) {return x.id === id;});
+            record = record || _.detect(self.to_write, function(x) {return x.id === id;});
+            var dirty = false;
+            if (record) {
+                for (var k in fixed_data) {
+                    if (record.values[k] === undefined || record.values[k] !== fixed_data[k]) {
+                        dirty = true;
+                        break;
+                    }
+                }
+                $.extend(record.values, fixed_data);
+            } else {
+                dirty = true;
+                record = {id: id, values: fixed_data};
+                self.to_write.push(record);
+            }
+            var cached = _.detect(self.cache, function(x) {return x.id === id;});
+            if (!cached) {
+                cached = {id: id, values: {}};
+                this.cache.push(cached);
+            }
+            $.extend(cached.values, record.values);
+            if (dirty)
+                self.on_change();
+            to_return.resolve({result: true});
+        });
         return to_return.promise();
     },
     unlink: function(ids, callback, error_callback) {

From 7da8126ad934e2b4b44a7c0c01b4a49634e0190f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Oct 2011 13:44:49 +0200
Subject: [PATCH 23/37] [FIX] BufferedDataSet to not break the m2o read
 contract of returning a name_get format

 BufferedDataSet simply shoves stuff read() or create()d in its cache,
 but m2o is asymmetric: client writes a single id, but reads a pair of
 [id, name].

 Since create() and write() are async (by definition) it's the best
 place to check if the data being written contains any m2o field, and
 to fix those m2o values.

This, however, completely breaks o2m fields get_value(), and doesn't
even work correctly for create() calls.

Should probably not cache the same thing we put for creation or update
eh

bzr revid: xmo@openerp.com-20111013114449-rkhe95g1oi3gudab
---
 addons/web/static/src/js/data.js | 132 +++++++++++++++++++++++--------
 1 file changed, 101 insertions(+), 31 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index ea0824fb1df..79485497fdd 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -610,44 +610,114 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
     on_default_get: function(res) {
         this.last_default_get = res;
     },
+    /**
+     * Makes sure this dataset has the fields_get for its model stored locally,
+     * so create/write methods are able to determine if written fields are m2os
+     * and can name_get those fields if that's the case (in order to cache a
+     * correct m2o value for them)
+     *
+     * @returns {$.Deferred} whether the fields_get is done executing, provides the fields_get value to its callbacks
+     */
+    ensure_has_fields: function () {
+        var self = this;
+
+        if (this.fields_get) {
+            var d = $.Deferred();
+            setTimeout(function () { d.resolve(self.fields_get, true); }, 0);
+            return d.promise();
+        } else {
+            return self.call('fields_get', [], function (fields_get) {
+                self.fields_get = fields_get;
+            });
+        }
+    },
+    /**
+     * Relational fields may not be written in the same format they are read.
+     *
+     * Since the BufferedDataSet is a bit dumb, it returns what it's got stored
+     * in its cache, which for modified value is what it was given. This breaks
+     * some basic contracts of openerp such as m2o read being in the
+     * ``name_get`` format.
+     *
+     * Because create & write are supposed to be asynchronous, though, it
+     * should be easy to just name_get all incorrect values.
+     *
+     * @param {Object} data form-data to write to the cache
+     * @returns {$.Deferred} resolved with a fixed data dictionary
+     */
+    fix_relational: function (data) {
+        var self = this;
+        var results = $.Deferred();
+        this.ensure_has_fields().then(function (fields) {
+            var fields_to_fix = _(fields).chain()
+                .map(function (d, k) { return {key: k, descriptor: d}; })
+                .filter(function (field) {
+                    // keep m2o fields which are in the data dict
+                    return field.descriptor.type === 'many2one' &&
+                           field.key in data;
+                }).pluck('key')
+                .value();
+            var name_gets = _(fields_to_fix).map(function (field) {
+                return new openerp.web.DataSet(self, self.fields_get[field].relation)
+                    .name_get([data[field]], null);
+            });
+            $.when.apply(null, name_gets).then(function () {
+                var record = _.extend({}, data);
+                for(var i=0; i<fields_to_fix.length; ++i) {
+                    record[fields_to_fix[i]] = arguments[i][0];
+                }
+                results.resolve(record);
+            });
+        });
+        return results;
+    },
     create: function(data, callback, error_callback) {
-        var cached = {id:_.uniqueId(this.virtual_id_prefix), values: data,
-            defaults: this.last_default_get};
-        this.to_create.push(_.extend(_.clone(cached), {values: _.clone(cached.values)}));
-        this.cache.push(cached);
-        this.on_change();
+        var self = this;
         var prom = $.Deferred().then(callback);
-        prom.resolve({result: cached.id});
+        this.fix_relational(data).then(function (fixed_data) {
+            var cached = {
+                id:_.uniqueId(self.virtual_id_prefix),
+                values: fixed_data,
+                defaults: self.last_default_get
+            };
+            self.to_create.push(_.extend(_.clone(cached), {
+                values: _.clone(cached.values)}));
+            self.cache.push(cached);
+            self.on_change();
+            prom.resolve({result: cached.id});
+        });
         return prom.promise();
     },
     write: function (id, data, options, callback) {
         var self = this;
-        var record = _.detect(this.to_create, function(x) {return x.id === id;});
-        record = record || _.detect(this.to_write, function(x) {return x.id === id;});
-        var dirty = false;
-        if (record) {
-            for (var k in data) {
-                if (record.values[k] === undefined || record.values[k] !== data[k]) {
-                    dirty = true;
-                    break;
-                }
-            }
-            $.extend(record.values, data);
-        } else {
-            dirty = true;
-            record = {id: id, values: data};
-            self.to_write.push(record);
-        }
-        var cached = _.detect(this.cache, function(x) {return x.id === id;});
-        if (!cached) {
-            cached = {id: id, values: {}};
-            this.cache.push(cached);
-        }
-        $.extend(cached.values, record.values);
-        if (dirty)
-            this.on_change();
         var to_return = $.Deferred().then(callback);
-        to_return.resolve({result: true});
+        this.fix_relational(data).then(function (fixed_data) {
+            var record = _.detect(self.to_create, function(x) {return x.id === id;});
+            record = record || _.detect(self.to_write, function(x) {return x.id === id;});
+            var dirty = false;
+            if (record) {
+                for (var k in fixed_data) {
+                    if (record.values[k] === undefined || record.values[k] !== fixed_data[k]) {
+                        dirty = true;
+                        break;
+                    }
+                }
+                $.extend(record.values, fixed_data);
+            } else {
+                dirty = true;
+                record = {id: id, values: fixed_data};
+                self.to_write.push(record);
+            }
+            var cached = _.detect(self.cache, function(x) {return x.id === id;});
+            if (!cached) {
+                cached = {id: id, values: {}};
+                this.cache.push(cached);
+            }
+            $.extend(cached.values, record.values);
+            if (dirty)
+                self.on_change();
+            to_return.resolve({result: true});
+        });
         return to_return.promise();
     },
     unlink: function(ids, callback, error_callback) {

From 1e507afcc9b29638718cd798826497ef0512e11e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Oct 2011 13:58:28 +0200
Subject: [PATCH 24/37] [fix] When we click a button in a m2o popup it closes
 the popup

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

bzr revid: nicolas.vanhoren@openerp.com-20111013115828-ctbslk34qif4cfwt
---
 addons/web/static/src/js/view_form.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8bc31d4e015..fce00e797c0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2483,7 +2483,6 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
         this.setup_form_view();
     },
     on_write: function(id, data) {
-        this.stop();
         if (!this.options.auto_write)
             return;
         var self = this;
@@ -2506,7 +2505,9 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
             $buttons.html(QWeb.render("FormOpenPopup.form.buttons"));
             var $nbutton = $buttons.find(".oe_formopenpopup-form-save");
             $nbutton.click(function() {
-                self.view_form.do_save();
+                self.view_form.do_save().then(function() {
+                    self.stop();
+                });
             });
             var $cbutton = $buttons.find(".oe_formopenpopup-form-close");
             $cbutton.click(function() {

From 3580fb918da451a379c28d31839036c7735f53d8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Oct 2011 14:42:27 +0200
Subject: [PATCH 25/37] [FIX] inconsistency between multiple m2o fields to
 name_get and single when sent to $.when

bzr revid: xmo@openerp.com-20111013124227-at1nvix8yqtae8a9
---
 addons/web/static/src/js/data.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 79485497fdd..a9c4319baa8 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -661,10 +661,16 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
                 return new openerp.web.DataSet(self, self.fields_get[field].relation)
                     .name_get([data[field]], null);
             });
-            $.when.apply(null, name_gets).then(function () {
+            // null-concat forces stupid bastard `when` to always return an
+            // array containing the Array-ified results of all the name_gets.
+            // otherwise, if there's a single field to fix it returns the
+            // results of the unique name_get directly.
+            $.when.apply(null, name_gets.concat([null])).then(function () {
                 var record = _.extend({}, data);
                 for(var i=0; i<fields_to_fix.length; ++i) {
-                    record[fields_to_fix[i]] = arguments[i][0];
+                    // Each argument is [[name_get], success, jqXhr] and we
+                    // want just the name_get pair
+                    record[fields_to_fix[i]] = arguments[i][0][0];
                 }
                 results.resolve(record);
             });

From 88314e523a85ee2fcbfeedf84e8d4b3f9dedb51b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Oct 2011 14:44:35 +0200
Subject: [PATCH 26/37] [FIX] excessive coherence between BufferedDataSet cache
 and to_write and to_create queues                                            
                                           ~/projects/tiny/web/current

cache should hold readable values (so pairs for m2o fields), whereas
to_create and to_write hold the data which will be processed into o2m
commands and sent over the wire to create, write and context-value
calls. As a result, to_create and to_write should only have atomic ids
for m2o fields.

Therefore, only use fixed m2o values to store in read cache.

bzr revid: xmo@openerp.com-20111013124435-vbjolacjnc9f6qz4
---
 addons/web/static/src/js/data.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index a9c4319baa8..dd121ed9db7 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -680,14 +680,14 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
     create: function(data, callback, error_callback) {
         var self = this;
         var prom = $.Deferred().then(callback);
-        this.fix_relational(data).then(function (fixed_data) {
+        this.fix_relational(data).then(function (fixed_m2o_data) {
             var cached = {
                 id:_.uniqueId(self.virtual_id_prefix),
-                values: fixed_data,
+                values: fixed_m2o_data,
                 defaults: self.last_default_get
             };
             self.to_create.push(_.extend(_.clone(cached), {
-                values: _.clone(cached.values)}));
+                values: _.clone(data)}));
             self.cache.push(cached);
             self.on_change();
             prom.resolve({result: cached.id});
@@ -697,21 +697,21 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
     write: function (id, data, options, callback) {
         var self = this;
         var to_return = $.Deferred().then(callback);
-        this.fix_relational(data).then(function (fixed_data) {
+        this.fix_relational(data).then(function (fixed_m2o_data) {
             var record = _.detect(self.to_create, function(x) {return x.id === id;});
             record = record || _.detect(self.to_write, function(x) {return x.id === id;});
             var dirty = false;
             if (record) {
-                for (var k in fixed_data) {
-                    if (record.values[k] === undefined || record.values[k] !== fixed_data[k]) {
+                for (var k in data) {
+                    if (record.values[k] === undefined || record.values[k] !== data[k]) {
                         dirty = true;
                         break;
                     }
                 }
-                $.extend(record.values, fixed_data);
+                _.extend(record.values, data);
             } else {
                 dirty = true;
-                record = {id: id, values: fixed_data};
+                record = {id: id, values: data};
                 self.to_write.push(record);
             }
             var cached = _.detect(self.cache, function(x) {return x.id === id;});
@@ -719,7 +719,7 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
                 cached = {id: id, values: {}};
                 this.cache.push(cached);
             }
-            $.extend(cached.values, record.values);
+            _.extend(cached.values, fixed_m2o_data);
             if (dirty)
                 self.on_change();
             to_return.resolve({result: true});

From ce6c86ccc8134c56861b43b9c8b68be5ec13b1be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Oct 2011 14:47:19 +0200
Subject: [PATCH 27/37] [REV] xmo@openerp.com-20111013112755-krf9y5w232ol6r1e,
 it's broken, going to merge improved/fixed version

bzr revid: xmo@openerp.com-20111013124719-ekwfczj45bgkoeiy
---
 addons/web/static/src/js/data.js | 130 +++++++------------------------
 1 file changed, 30 insertions(+), 100 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 0906a26050e..ea0824fb1df 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -610,114 +610,44 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
     on_default_get: function(res) {
         this.last_default_get = res;
     },
-    /**
-     * Makes sure this dataset has the fields_get for its model stored locally,
-     * so create/write methods are able to determine if written fields are m2os
-     * and can name_get those fields if that's the case (in order to cache a
-     * correct m2o value for them)
-     *
-     * @returns {$.Deferred} whether the fields_get is done executing, provides the fields_get value to its callbacks
-     */
-    ensure_has_fields: function () {
-        var self = this;
-
-        if (this.fields_get) {
-            var d = $.Deferred();
-            setTimeout(function () { d.resolve(self.fields_get, true); }, 0);
-            return d.promise();
-        } else {
-            return self.call('fields_get', [], function (fields_get) {
-                self.fields_get = fields_get;
-            });
-        }
-    },
-    /**
-     * Relational fields may not be written in the same format they are read.
-     *
-     * Since the BufferedDataSet is a bit dumb, it returns what it's got stored
-     * in its cache, which for modified value is what it was given. This breaks
-     * some basic contracts of openerp such as m2o read being in the
-     * ``name_get`` format.
-     *
-     * Because create & write are supposed to be asynchronous, though, it
-     * should be easy to just name_get all incorrect values.
-     *
-     * @param {Object} data form-data to write to the cache
-     * @returns {$.Deferred} resolved with a fixed data dictionary
-     */
-    fix_relational: function (data) {
-        var self = this;
-        var results = $.Deferred();
-        this.ensure_has_fields().then(function (fields) {
-            var fields_to_fix = _(fields).chain()
-                .map(function (d, k) { return {key: k, descriptor: d}; })
-                .filter(function (field) {
-                    // keep m2o fields which are in the data dict
-                    return field.descriptor.type === 'many2one' &&
-                           field.key in data;
-                }).pluck('key')
-                .value();
-            var name_gets = _(fields_to_fix).map(function (field) {
-                return new openerp.web.DataSet(self, self.fields_get[field].relation)
-                    .name_get([data[field]], null);
-            });
-            $.when.apply(null, name_gets).then(function () {
-                var record = _.extend({}, data);
-                for(var i=0; i<fields_to_fix.length; ++i) {
-                    record[fields_to_fix[i]] = arguments[i][0];
-                }
-                results.resolve(record);
-            });
-        });
-        return results;
-    },
     create: function(data, callback, error_callback) {
-        var self = this;
+        var cached = {id:_.uniqueId(this.virtual_id_prefix), values: data,
+            defaults: this.last_default_get};
+        this.to_create.push(_.extend(_.clone(cached), {values: _.clone(cached.values)}));
+        this.cache.push(cached);
+        this.on_change();
         var prom = $.Deferred().then(callback);
-        this.fix_relational(data).then(function (fixed_data) {
-            var cached = {
-                id:_.uniqueId(self.virtual_id_prefix),
-                values: fixed_data,
-                defaults: self.last_default_get
-            };
-            this.to_create.push(_.extend(_.clone(cached), {
-                values: _.clone(cached.values)}));
-            self.cache.push(cached);
-            self.on_change();
-            prom.resolve({result: cached.id});
-        });
+        prom.resolve({result: cached.id});
         return prom.promise();
     },
     write: function (id, data, options, callback) {
         var self = this;
-        var to_return = $.Deferred().then(callback);
-        this.fix_relational(data).then(function (fixed_data) {
-            var record = _.detect(self.to_create, function(x) {return x.id === id;});
-            record = record || _.detect(self.to_write, function(x) {return x.id === id;});
-            var dirty = false;
-            if (record) {
-                for (var k in fixed_data) {
-                    if (record.values[k] === undefined || record.values[k] !== fixed_data[k]) {
-                        dirty = true;
-                        break;
-                    }
+        var record = _.detect(this.to_create, function(x) {return x.id === id;});
+        record = record || _.detect(this.to_write, function(x) {return x.id === id;});
+        var dirty = false;
+        if (record) {
+            for (var k in data) {
+                if (record.values[k] === undefined || record.values[k] !== data[k]) {
+                    dirty = true;
+                    break;
                 }
-                $.extend(record.values, fixed_data);
-            } else {
-                dirty = true;
-                record = {id: id, values: fixed_data};
-                self.to_write.push(record);
             }
-            var cached = _.detect(self.cache, function(x) {return x.id === id;});
-            if (!cached) {
-                cached = {id: id, values: {}};
-                this.cache.push(cached);
-            }
-            $.extend(cached.values, record.values);
-            if (dirty)
-                self.on_change();
-            to_return.resolve({result: true});
-        });
+            $.extend(record.values, data);
+        } else {
+            dirty = true;
+            record = {id: id, values: data};
+            self.to_write.push(record);
+        }
+        var cached = _.detect(this.cache, function(x) {return x.id === id;});
+        if (!cached) {
+            cached = {id: id, values: {}};
+            this.cache.push(cached);
+        }
+        $.extend(cached.values, record.values);
+        if (dirty)
+            this.on_change();
+        var to_return = $.Deferred().then(callback);
+        to_return.resolve({result: true});
         return to_return.promise();
     },
     unlink: function(ids, callback, error_callback) {

From 322d20d53c651ee86bf20f6ca936b13a2b817705 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Oct 2011 14:58:58 +0200
Subject: [PATCH 28/37] [FIX] when performing name_get on m2o fields being
 written to BufferedDataSet, ignore m2o fields with 'false' value as well as
 those not being written at all

bzr revid: xmo@openerp.com-20111013125858-pboz81w3s58lk2rl
---
 addons/web/static/src/js/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index dd121ed9db7..1eaffcd0e30 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -654,7 +654,7 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
                 .filter(function (field) {
                     // keep m2o fields which are in the data dict
                     return field.descriptor.type === 'many2one' &&
-                           field.key in data;
+                           data[field.key];
                 }).pluck('key')
                 .value();
             var name_gets = _(fields_to_fix).map(function (field) {

From 4065bc83b309a8bec16fb5f316b6feab8de0a981 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Oct 2011 15:46:06 +0200
Subject: [PATCH 29/37] [FIX] Problem with action buttons in form views opened
 from a m2o in an editable list

bzr revid: fme@openerp.com-20111013134606-8n8i1djtg0dvcar6
---
 addons/web/static/src/js/view_list_editable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 826508eaa27..4cc081a6266 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -194,7 +194,7 @@ openerp.web.list_editable = function (openerp) {
                 }
                 self.edition = true;
                 self.edition_id = record_id;
-                self.edition_form = _.extend(new openerp.web.ListEditableFormView(self, self.dataset, false), {
+                self.edition_form = _.extend(new openerp.web.ListEditableFormView(self.view, self.dataset, false), {
                     form_template: 'ListView.row.form',
                     registry: openerp.web.list.form.widgets,
                     $element: $new_row

From f6a1313ec26e1cad31b1cbcabaf6554fc9280192 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Oct 2011 16:16:01 +0200
Subject: [PATCH 30/37] [FIX] Sidebar merge left-over

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

bzr revid: fme@openerp.com-20111013141601-pircozngzr55tx2k
---
 addons/web_calendar/static/src/js/calendar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index de2ae89b91e..459c44d699a 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -3,6 +3,7 @@
  *---------------------------------------------------------*/
 
 openerp.web_calendar = function(openerp) {
+var _t = openerp.web._t;
 var QWeb = openerp.web.qweb;
 QWeb.add_template('/web_calendar/static/src/xml/web_calendar.xml');
 openerp.web.views.add('calendar', 'openerp.web_calendar.CalendarView');

From bd7c5ee6f86e53e5ece986cd703b2c123f2e971f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 16:32:45 +0200
Subject: [PATCH 31/37] [IMP] base: authenticate: use "base_location" key
 instead on "host"

bzr revid: chs@openerp.com-20111013143245-vrcs89hennc2beu4
---
 openerp/addons/base/res/res_users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 0eb70945b6d..740876eea83 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -433,11 +433,11 @@ class users(osv.osv):
         if uid == openerp.SUPERUSER_ID:
             # Successfully logged in as admin!
             # Attempt to guess the web base url...
-            if user_agent_env and 'host' in user_agent_env:
+            if user_agent_env and user_agent_env.get('base_location'):
                 cr = pooler.get_db(db).cursor()
                 try:
                     self.pool.get('ir.config_parameter').set_param(cr, uid, 'web.base.url',
-                                                                   user_agent_env['host'])
+                                                                   user_agent_env['base_location'])
                     cr.commit()
                 except Exception:
                     logging.getLogger('res.users').exception("Failed to update web.base.url configuration parameter")

From de5c2f58e81fefb2f5d23124f5b44ee00ec16da1 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 17:03:17 +0200
Subject: [PATCH 32/37] [IMP] Notification Widget is now a singleton

bzr revid: chs@openerp.com-20111013150317-kzy2h7bz407kiugz
---
 addons/web/static/src/js/chrome.js | 37 ++++++++++++------------------
 addons/web/static/src/js/core.js   | 12 ----------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2b35fae540f..1629dc1de55 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -8,6 +8,11 @@ openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Not
     template: 'Notification',
     identifier_prefix: 'notification-',
 
+    init: function() {
+        this._super.apply(this, arguments);
+        openerp.notification = this;
+    },
+
     start: function() {
         this._super.apply(this, arguments);
         this.$element.notify({
@@ -29,35 +34,21 @@ openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Not
             expires: false,
         });
     },
-    
-    do_notify: function() { this.notify.apply(this, arguments); },
-    do_warn: function() {this.warn.apply(this, arguments); },
 
 });
 
-openerp.web.NotifiableWidget = openerp.web.Widget.extend({
-
-    init: function(/*arguments*/) {
-        this._super.apply(this, arguments);
-        this.notification = new openerp.web.Notification(this);
+openerp.web.Widget.include({
+    do_notify: function() {
+        var n = openerp.notification;
+        n.notify.apply(n, arguments);
     },
-
-    start: function() {
-        this._super.apply(this, arguments);
-        this.notification.prependTo(this.$element);
+    do_warn: function() {
+        var n = openerp.notification;
+        n.warn.apply(n, arguments);
     },
-
-    stop: function() {
-        this.notification.stop();
-        return this._super.apply(this, arguments);
-    },
-
-    do_notify: function() { this.notification.notify.apply(this.notification, arguments); },
-    do_warn: function() { this.notification.warn.apply(this.notification, arguments); },
 });
 
 
-
 openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{
     dialog_title: "",
     identifier_prefix: 'dialog',
@@ -945,7 +936,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     }
 });
 
-openerp.web.WebClient = openerp.web.NotifiableWidget.extend(/** @lends openerp.web.WebClient */{
+openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{
     /**
      * @constructs openerp.web.WebClient
      * @extends openerp.web.Widget
@@ -963,6 +954,7 @@ openerp.web.WebClient = openerp.web.NotifiableWidget.extend(/** @lends openerp.w
         }
         this.$element.html(QWeb.render("Interface", params));
 
+        this.notification = new openerp.web.Notification();
         this.session = new openerp.web.Session();
         this.loading = new openerp.web.Loading(this,"oe_loading");
         this.crashmanager =  new openerp.web.CrashManager(this);
@@ -988,6 +980,7 @@ openerp.web.WebClient = openerp.web.NotifiableWidget.extend(/** @lends openerp.w
     },
     start: function() {
         this._super.apply(this, arguments);
+        this.notification.prependTo(this.$element);
         this.header.appendTo($("#oe_header"));
         this.session.start();
         this.login.appendTo($('#oe_login'));
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index bed5f199157..755413c1aea 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -949,18 +949,6 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
         }
         return false;
     },
-    do_notify: function() {
-        if (this.widget_parent) {
-            return this.widget_parent.do_notify.apply(this,arguments);
-        }
-        return false;
-    },
-    do_warn: function() {
-        if (this.widget_parent) {
-            return this.widget_parent.do_warn.apply(this,arguments);
-        }
-        return false;
-    },
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;

From e67d4a7911d76c3074e469368250205579d6a026 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Oct 2011 17:18:22 +0200
Subject: [PATCH 33/37] [fix] problem in projects, the dashboard crashes

bzr revid: nicolas.vanhoren@openerp.com-20111013151822-neo7d726yx6uno40
---
 addons/project/report/project_report.py       | 5 +++--
 addons/project/report/project_report_view.xml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 989f646724e..fb1b0b030d6 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -128,6 +128,7 @@ class project_vs_hours(osv.osv):
     _columns = {
         'project': fields.char('Project', size=128, required=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
+        'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
         'planned_hours': fields.float('Planned Hours', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
         'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True, readonly=True)
@@ -140,7 +141,7 @@ class project_vs_hours(osv.osv):
             CREATE or REPLACE view project_vs_hours as (
                 select
                       min(pt.id) as id,
-                      aaa.user_id as uid,
+                      aaa.user_id as user_id,
                       aaa.name as project,
                       aaa.state,
                       sum(pt.remaining_hours) as remaining_hours,
@@ -154,7 +155,7 @@ class project_vs_hours(osv.osv):
                  UNION All
                  SELECT
                       min(pt.id) as id,
-                      pur.uid as uid,
+                      pur.uid as user_id,
                       aaa.name as project,
                       aaa.state,
                       sum(pt.remaining_hours) as remaining_hours,
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 601f6e2004f..2e084261afa 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -184,7 +184,7 @@
         <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
-        <field name="domain">[('uid','=',uid),('state','=','open')]</field>
+        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
         <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
     </record>
 
@@ -272,7 +272,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="context">{}</field>
-        <field name="domain">[('uid','=',uid),('state','=','open')]</field>
+        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
         <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
     </record>
 

From 7dd8fcfad4acc09fa4c7ba92824d0a0e3229c11f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 17:30:23 +0200
Subject: [PATCH 34/37] [IMP] do_notify and do_warn bubble the messages to the
 parent widget

bzr revid: chs@openerp.com-20111013153023-xzu2y4j5qzuqem1e
---
 addons/web/static/src/js/chrome.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1629dc1de55..234d99fdb34 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -39,12 +39,14 @@ openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Not
 
 openerp.web.Widget.include({
     do_notify: function() {
-        var n = openerp.notification;
-        n.notify.apply(n, arguments);
+        if(this.widget_parent) {
+            this.widget_parent.do_notify.apply(this.widget_parent, arguments);
+        }
     },
     do_warn: function() {
-        var n = openerp.notification;
-        n.warn.apply(n, arguments);
+        if(this.widget_parent) {
+            this.widget_parent.do_warn.apply(this.widget_parent, arguments);
+        }
     },
 });
 
@@ -986,6 +988,16 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.login.appendTo($('#oe_login'));
         this.menu.start();
     },
+
+    do_notify: function() {
+        var n = this.notification;
+        n.notify.apply(n, arguments);
+    },
+    do_warn: function() {
+        var n = this.notification;
+        n.warn.apply(n, arguments);
+    },
+
     on_logged: function() {
         this.menu.do_reload();
         if(this.action_manager)

From 8a7c61cb96a541a9aaca51ffe3ee903407b26360 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 13 Oct 2011 18:12:13 +0200
Subject: [PATCH 35/37] [FIX] project duplicate xmlid, useless act_window view
 definition

bzr revid: al@openerp.com-20111013161213-x29pjxbuaxhjqexx
---
 addons/project/board_project_view.xml |  4 ++--
 addons/project/project_view.xml       | 14 --------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 6470dd3e49d..f2c44fab574 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -48,7 +48,7 @@
         </record>
 
 
-        <record id="action_view_task_tree" model="ir.actions.act_window">
+        <record id="my_open_tasks_action" model="ir.actions.act_window">
             <field name="name">My Open Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
@@ -83,7 +83,7 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4"  height="100" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
+                            <action colspan="4"  height="100" name="%(my_open_tasks_action)d" string="My Open Tasks" width="510"/>
                             <action colspan="4"  height="100" name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
                         </child1>
                         <child2>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b518cb31de2..f8eec371d48 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -511,20 +511,6 @@
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
-        
-        <record id="action_view_task_tree" model="ir.actions.act_window.view">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_task_tree2"/>
-            <field name="act_window_id" ref="action_view_task"/>
-        </record>
-        
-        <record id="action_view_task_form" model="ir.actions.act_window.view">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_task_form2"/>
-            <field name="act_window_id" ref="action_view_task"/>
-        </record>        
  
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
 

From 462f8085006ee36edbdc78755306154e7e557fa2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 13 Oct 2011 18:33:16 +0200
Subject: [PATCH 36/37] [IMP] ir.model.data: sanity check to help prevent
 external IDs conflict between models

bzr revid: odo@openerp.com-20111013163316-gjct0pyrxfz9bm45
---
 openerp/addons/base/ir/ir_model.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 395bf3e8d60..37d6e7a58cc 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -671,18 +671,20 @@ class ir_model_data(osv.osv):
         action_id = False
 
         if xml_id:
-            cr.execute('''SELECT imd.id, imd.res_id, md.id
+            cr.execute('''SELECT imd.id, imd.res_id, md.id, imd.model
                           FROM ir_model_data imd LEFT JOIN %s md ON (imd.res_id = md.id)
                           WHERE imd.module=%%s AND imd.name=%%s''' % model_obj._table,
                           (module, xml_id))
             results = cr.fetchall()
-            for imd_id2,res_id2,real_id2 in results:
+            for imd_id2,res_id2,real_id2,real_model in results:
                 if not real_id2:
                     self._get_id.clear_cache(self, uid, module, xml_id)
                     self.get_object_reference.clear_cache(self, uid, module, xml_id)
                     cr.execute('delete from ir_model_data where id=%s', (imd_id2,))
                     res_id = False
                 else:
+                    assert model == real_model, "External ID conflict, %s already refers to a `%s` record,"\
+                        " you can't define a `%s` record with this ID." % (xml_id, real_model, model)
                     res_id,action_id = res_id2,imd_id2
 
         if action_id and res_id:

From 57d635f44df6767c849bfaf6e8e9c27a31e9cfa3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 14 Oct 2011 01:20:54 +0200
Subject: [PATCH 37/37] [FIX] soft reload after module installation

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

bzr revid: al@openerp.com-20111013232054-2i5ptzfurjc429zw
---
 addons/web/static/src/js/chrome.js              | 4 ++++
 addons/web/static/src/js/views.js               | 4 ++--
 addons/web_dashboard/static/src/js/dashboard.js | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index dae7ba62ceb..521dc6edc2b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -970,6 +970,10 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.login.appendTo($('#oe_login'));
         this.menu.start();
     },
+    do_reload: function() {
+        this.session.session_restore();
+        this.menu.do_reload();
+    },
     on_logged: function() {
         this.menu.do_reload();
         if(this.action_manager)
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 006213086be..cfeb1aa730b 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -123,8 +123,8 @@ db.web.ActionManager = db.web.Widget.extend({
         }
         if (this.dialog && action.context) {
             var model = action.context.active_model;
-            if (model === 'base.module.upgrade' || model === 'base.setup.installer') {
-                db.webclient.menu.do_reload();
+            if (model === 'base.module.upgrade' || model === 'base.setup.installer' || model === 'base.module.upgrade') {
+                db.webclient.do_reload();
             }
         }
         this.dialog_stop();
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 0eac5623b45..74393684ad2 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -485,9 +485,8 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({
         var self = this;
         new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) {
             $.unblockUI();
-            self.do_action(action, function () {
-                // TODO: less brutal reloading
-                window.location.reload(true);
+            self.widget_parent.widget_parent.do_action(action, function () {
+                openerp.webclient.do_reload();
             });
         });
     }