From 3eb5cfb61b6bbb84043f4fa6b3fdefb0fbb320c7 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 3 Oct 2012 16:52:27 +0530
Subject: [PATCH 01/23] [IMP]remove call_backs from call method.

bzr revid: vme@tinyerp.com-20121003112227-vu2crilmvnk2me8j
---
 addons/google_docs/static/src/js/gdocs.js | 8 ++++----
 addons/process/static/src/js/process.js   | 3 +--
 addons/share/static/src/js/share.js       | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index bcfd24f8c0d..2aafdd3de4b 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -22,7 +22,7 @@ var _t = instance.web._t;
             var form = self.getParent();
             form.sidebar_context().then(function (context) {
                 var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-                ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
+                ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context]).then(function(r) {
                     if (r == 'False') {
                         var params = {
                             error: response,
@@ -35,7 +35,7 @@ var _t = instance.web._t;
                     }
                     form.reload();
                 });
-            })
+            });
         }
-    })
-}
+    });
+};
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index 57c6f196012..2b543484f2e 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -217,8 +217,7 @@ instance.web.ViewManager.include({
         var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
         var action_manager = new instance.web.ActionManager(self);
         dataset.call('get',
-            ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
-            function(res) {
+            ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) {
                 var action = res[0][res[0].length - 1];
                 self.rpc("/web/action/load", {
                     action_id: action.id,
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index bab3cac243f..01c1ef0a41e 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -24,9 +24,8 @@ openerp.share = function(session) {
                 user_type: user_type || 'embedded',
                 view_type: view.fields_view.type,
                 invite: invite || false,
-            }, function(result) {
-                var share_id = result.result;
-                var step1 = Share.call('go_step_1', [[share_id],], function(result) {
+            }).then(function(share_id) {
+                var step1 = Share.call('go_step_1', [[share_id]]).then(function(result) {
                     var action = result;
                     self.do_action(action);
                 });

From 1fe81f3a962cf1600a9aecbb22d7be9162c3a311 Mon Sep 17 00:00:00 2001
From: ggh-openerp <ggh@tinyerp.com>
Date: Wed, 3 Oct 2012 18:04:12 +0530
Subject: [PATCH 02/23] [IMP] In rpc method remove callback and modify related
 code

bzr revid: ggh@tinyerp.com-20121003123412-22o4t380ipsmns2e
---
 .../account/static/src/js/account_move_reconciliation.js   | 2 +-
 addons/auth_openid/static/src/js/auth_openid.js            | 4 ++--
 addons/board/static/src/js/dashboard.js                    | 6 +++---
 addons/edi/static/src/js/edi.js                            | 6 +++---
 addons/mail/static/src/js/mail.js                          | 2 +-
 addons/point_of_sale/static/src/js/devices.js              | 7 +++----
 addons/process/static/src/js/process.js                    | 2 +-
 addons/share/static/src/js/share.js                        | 2 +-
 addons/web_shortcuts/static/src/js/web_shortcuts.js        | 4 ++--
 9 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 6b007e2f097..18e415a5f0a 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -101,7 +101,7 @@ openerp.account = function (instance) {
                 return self.rpc("/web/action/load", {
                     action_id: result[1],
                     context: additional_context
-                }, function (result) {
+                }).then(function (result) {
                     result = result.result;
                     result.context = _.extend(result.context || {}, additional_context);
                     result.flags = result.flags || {};
diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js
index 70739e056ed..56ec5b57d3f 100644
--- a/addons/auth_openid/static/src/js/auth_openid.js
+++ b/addons/auth_openid/static/src/js/auth_openid.js
@@ -69,7 +69,7 @@ instance.web.Login = instance.web.Login.extend({
     _check_error: function() {
         var self = this;
         if (this.params.loginerror !== undefined) {
-            this.rpc('/auth_openid/login/status', {}, function(result) {
+            this.rpc('/auth_openid/login/status', {}).then(function(result) {
                 if (_.contains(['success', 'failure'], result.status) && result.message) {
                     self.do_warn('Invalid OpenID Login', result.message);
                 }
@@ -106,7 +106,7 @@ instance.web.Login = instance.web.Login.extend({
 
     do_openid_login: function(db, openid_url) {
         var self = this;
-        this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}, function(result) {
+        this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}).then(function(result) {
             if (result.error) {
                 self.do_warn(result.title, result.error);
                 return;
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 43d7ca76d39..e2d4d6246ab 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -46,7 +46,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
                 delete(action.attrs.colspan);
                 var action_id = _.str.toNumber(action.attrs.name);
                 if (!_.isNaN(action_id)) {
-                    self.rpc('/web/action/load', {action_id: action_id}, function(result) {
+                    self.rpc('/web/action/load', {action_id: action_id}).then(function(result) {
                         self.on_load_action(result, column_index + '_' + action_index, action.attrs);
                     });
                 }
@@ -81,7 +81,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         this.rpc('/web/view/undo_custom', {
             view_id: this.view.fields_view.view_id,
             reset: true
-        }, this.do_reload);
+        }).then(this.do_reload);
     },
     on_change_layout: function() {
         var self = this;
@@ -382,7 +382,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
             domain: domain,
             view_mode: view_parent.active_view,
             name: this.$el.find("input").val()
-        }, function(r) {
+        }).then(function(r) {
             if (r === false) {
                 self.do_warn("Could not add filter to dashboard");
             } else {
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index abb6d9a6232..4089318f3ce 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -15,7 +15,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
         this._super();
         var self = this;
         var param = {"db": self.db, "token": self.token};
-        return self.rpc('/edi/get_edi_document', param, this.on_document_loaded, this.on_document_failed);
+        return self.rpc('/edi/get_edi_document', param).done(this.on_document_loaded), fail(this.on_document_failed);
     },
     on_document_loaded: function(docs){
         this.doc = docs[0];
@@ -149,11 +149,11 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
     },
 
     do_import: function() {
-        this.rpc('/edi/import_edi_url', {url: this.url}, this.on_imported, this.on_imported_error);
+        this.rpc('/edi/import_edi_url', {url: this.url}),done(this.on_imported), fail(this.on_imported_error);
     },
     on_imported: function(response) {
         if ('action' in response) {
-            this.rpc("/web/session/save_session_action", {the_action: response.action}, function(key) {
+            this.rpc("/web/session/save_session_action", {the_action: response.action}).then(function(key) {
                 window.location = "/#sa="+encodeURIComponent(key);
             });
         }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e0c9ac9b7fc..0ee3e6b1144 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1127,7 +1127,7 @@ openerp.mail = function(session) {
                 domains: domains || [],
                 contexts: contexts || [],
                 group_by_seq: groupbys || []
-            }, function (results) {
+            }).then(function (results) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
                 self.thread.destroy();
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 142d35bd340..9b38c7f72f0 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -37,11 +37,10 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 callbacks[i](params);
             }
 
-            this.connection.rpc('/pos/'+name, params || {}, 
-                    function(result){
+            this.connection.rpc('/pos/'+name, params || {}).done(function(result){
                         ret.resolve(result);
-                    },
-                    function(error){
+                    }),
+                    fail(function(error){
                         ret.reject(error);
                     });
             return ret;
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index 57c6f196012..b13e92df33c 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -223,7 +223,7 @@ instance.web.ViewManager.include({
                 self.rpc("/web/action/load", {
                     action_id: action.id,
                     context: dataset.context
-                    }, function(result) {
+                    }).then(function(result) {
                         action_manager.replace(self.$el);
                         action_manager.do_action(result.result);
                     })
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index bab3cac243f..83eab6afaf2 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -15,7 +15,7 @@ openerp.share = function(session) {
         self.rpc('/web/session/eval_domain_and_context', {
             domains: [domain],
             contexts: [view.dataset.context]
-        }, function (result) {
+        }).then(function (result) {
             Share.create({
                 name: action.name,
                 record_name: rec_name,
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index 743f3fc73aa..06b8fe35f73 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -46,7 +46,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     load: function() {
         var self = this;
         this.$el.find('.oe_systray_shortcuts_items').empty();
-        return this.rpc('/web/shortcuts/list', {}, function(shortcuts) {
+        return this.rpc('/web/shortcuts/list', {}).then(function(shortcuts) {
             _.each(shortcuts, function(sc) {
                 self.trigger('display', sc);
             });
@@ -80,7 +80,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
             id = $link.data('id');
         self.session.active_id = id;
         // TODO: Use do_action({menu_id: id, type: 'ir.actions.menu'})
-        self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
+        self.rpc('/web/menu/action', {'menu_id': id}).then(function(ir_menu_data) {
             if (ir_menu_data.action.length){
                 instance.webclient.user_menu.on_action({action_id: ir_menu_data.action[0][2].id});
             }

From 56477a10635b2eb2b4e5b854401f49360d45197c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 12 Oct 2012 09:51:37 +0200
Subject: [PATCH 03/23] [IMP] hr: usability in hr.employee form view

bzr revid: qdp-launchpad@openerp.com-20121012075137-fmfeehwehsbvh8ez
---
 addons/hr/hr_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 361bb581b14..cab93c6c14a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -36,9 +36,11 @@
                             <page string="Public Information">
                                 <group>
                                     <group string="Contact Information">
+                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
                                         <field name="work_email" widget="email"/>
                                         <field name="work_phone"/>
                                         <field name="mobile_phone"/>
+                                        <field name="work_location"/>
                                     </group>
                                     <group string="Position">
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
@@ -49,7 +51,6 @@
                                     <group>
                                         <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                                         <field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
-                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
                                     </group>
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>

From de1bd7a2cb67de5df42c802bcec24d8aacf889b1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 12 Oct 2012 12:11:26 +0200
Subject: [PATCH 04/23] [FIX] sale_stock: usability fix: onchange the product,
 the description field must be updated

bzr revid: qdp-launchpad@openerp.com-20121012101126-tdrhbp7r7eaivoz9
---
 addons/sale_stock/sale_stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 8962c21dc6e..73b9d33ba90 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -56,7 +56,7 @@
                        <field name="product_id"
                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                        groups="base.group_user" 
-                       on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                       on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
                    </field>
                    <field name="product_uom_qty" position="replace">
                        <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"

From 6aae5d22adfd5ee925196eb0a134476fce271242 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 12 Oct 2012 15:06:39 +0200
Subject: [PATCH 05/23] [IMP] account_bank_statement: hide some menu for
 non-techy guys

bzr revid: qdp-launchpad@openerp.com-20121012130639-q9v8ym1ucmfbn8r7
---
 .../account_bank_statement_view.xml                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index 1c076426752..9164c00373f 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -154,7 +154,7 @@
       <field name="view_id" ref="view_bank_statement_line_list"/>
     </record>
 
-    <menuitem action="action_bank_statement_line" id="bank_statement_line" parent="account.menu_finance_bank_and_cash" sequence="20"/>
+    <menuitem action="action_bank_statement_line" id="bank_statement_line" parent="account.menu_finance_bank_and_cash" sequence="20" groups="base.group_no_one"/>
 
   </data>
 </openerp>

From 90066e17f4eee7747ac29ed88f7aa7ec5ac38db9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 12 Oct 2012 17:20:01 +0200
Subject: [PATCH 06/23] [IMP] hr_timesheet_sheet: usabiltiy imp

bzr revid: qdp-launchpad@openerp.com-20121012152001-s008jau72n8r6ypy
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 7dd2b9a1b88..b247805d50d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -55,11 +55,11 @@
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
-                    <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
-                    <h2>From <field name="date_from"/> to <field name="date_to"/></h2>
                     <group>
                         <group>
-                            <field name="name"/>
+                            <label for="date_from" string="Timesheet Period"/>
+                            <div><field name="date_from"/> to <field name="date_to"/></div>
+                            <field name="name" invisible="1"/>
                             <field name="department_id"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>

From b5b9bc9872fd4dfbbcf4e352a27c195242619389 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 15 Oct 2012 13:25:30 +0200
Subject: [PATCH 07/23] [FIX] account, invoice analysis report: fixed 2 bugs in
 multi-currency environments (1) wrong currency rate chosen for transformation
 into base currency because of missing 'order by' statement; (2)
 re-transformation of amounts into user's currency instead of leaving them in
 base currency (rate=1)

bzr revid: qdp-launchpad@openerp.com-20121015112530-6bbo1xia2f3i5fzf
---
 .../account/report/account_invoice_report.py  | 31 ++++++++++++++++++-
 .../report/account_invoice_report_view.xml    |  6 ++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index d4362484588..00d5e520c42 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import tools
+import decimal_precision as dp
 from osv import fields,osv
 
 class account_invoice_report(osv.osv):
@@ -27,6 +28,31 @@ class account_invoice_report(osv.osv):
     _description = "Invoices Statistics"
     _auto = False
     _rec_name = 'date'
+
+    def _compute_amounts_in_user_currency(self, cr, uid, ids, field_names, args, context=None):
+        """Compute the amounts in the currency of the user
+        """
+        if context is None:
+            context={}
+        currency_obj = self.pool.get('res.currency')
+        currency_rate_obj = self.pool.get('res.currency.rate')
+        user_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+        currency_rate_id = currency_rate_obj.search(cr, uid, [('rate', '=', 1)], limit=1, context=context)[0]
+        base_currency_id = currency_rate_obj.browse(cr, uid, currency_rate_id, context=context).currency_id.id
+        res = {}
+        ctx = context.copy()
+        for item in self.browse(cr, uid, ids, context=context):
+            ctx['date'] = item.date
+            price_total = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_total, context=ctx)
+            price_average = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_average, context=ctx)
+            residual = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.residual, context=ctx)
+            res[item.id] = {
+                'user_currency_price_total': price_total,
+                'user_currency_price_average': price_average,
+                'user_currency_residual': residual,
+            }
+        return res
+
     _columns = {
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
@@ -47,7 +73,9 @@ class account_invoice_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
+        'user_currency_price_total': fields.function(_compute_amounts_in_user_currency, string="Total Without Tax", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
+        'user_currency_price_average': fields.function(_compute_amounts_in_user_currency, string="Average Price", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'currency_rate': fields.float('Currency Rate', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
         'type': fields.selection([
@@ -69,6 +97,7 @@ class account_invoice_report(osv.osv):
         'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
+        'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
         'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
     }
@@ -161,7 +190,7 @@ class account_invoice_report(osv.osv):
                 left join product_uom u on (u.id=ail.uos_id),
                 res_currency_rate cr
                 where cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
-                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) limit 1)
+                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
                 group by ail.product_id,
                     ai.date_invoice,
                     ai.id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 13a137e53df..e352a33d850 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -28,8 +28,8 @@
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
                 <!-- <field name="reconciled"  sum="# Reconciled"/> -->
-                <field name="price_total" sum="Total Without Tax"/>
-                <field name="residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
+                <field name="user_currency_price_total" sum="Total Without Tax"/>
+                <field name="user_currency_residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
                 <field name="due_delay"  sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
                 <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
             </tree>
@@ -42,7 +42,7 @@
          <field name="arch" type="xml">
              <graph string="Invoices Analysis" type="bar">
                  <field name="product_id"/>
-                 <field name="price_total"/>
+                 <field name="user_currency_price_total"/>
              </graph>
          </field>
     </record>

From d56be2c6225ea568b18d755fd97d7a266e6ad30b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 15 Oct 2012 13:48:47 +0200
Subject: [PATCH 08/23] [REF] account: removed dead field
 'property_reserve_and_surplus_account' that was not used anymore

bzr revid: qdp-launchpad@openerp.com-20121015114847-j2po052ckxtgegqc
---
 addons/account/account.py                          | 2 --
 addons/account/account_view.xml                    | 1 -
 addons/account/company.py                          | 8 --------
 addons/account/company_view.xml                    | 1 -
 addons/account/data/configurable_account_chart.xml | 1 -
 addons/account/demo/account_minimal.xml            | 8 --------
 addons/l10n_ch/sterchi_chart/account.xml           | 1 -
 addons/l10n_cn/account_chart.xml                   | 1 -
 addons/l10n_fr/fr_pcg_taxes.xml                    | 1 -
 addons/l10n_gt/l10n_gt_base.xml                    | 1 -
 addons/l10n_hn/l10n_hn_base.xml                    | 1 -
 addons/l10n_in/l10n_in_private_chart.xml           | 1 -
 addons/l10n_in/l10n_in_public_chart.xml            | 1 -
 addons/l10n_nl/account_chart_netherlands.xml       | 1 -
 addons/l10n_uk/data/account.chart.template.csv     | 4 ++--
 addons/l10n_uy/account_chart_template.xml          | 1 -
 16 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 46cfaf645a8..fa2b10a7478 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2768,7 +2768,6 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template', 'Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template', 'Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template', 'Income Account on Product Template'),
-        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
         'property_account_income_opening': fields.many2one('account.account.template', 'Opening Entries Income Account'),
         'property_account_expense_opening': fields.many2one('account.account.template', 'Opening Entries Expense Account'),
     }
@@ -3216,7 +3215,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             ('property_account_income_categ','product.category','account.account'),
             ('property_account_expense','product.template','account.account'),
             ('property_account_income','product.template','account.account'),
-            ('property_reserve_and_surplus_account','res.company','account.account')
         ]
         template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
         for record in todo_list:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d98b53ebbbd..b0c73c132d5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2171,7 +2171,6 @@
                         <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
                         <field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
                         <field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
-                        <field name="property_reserve_and_surplus_account" />
                     </group>
                 </form>
             </field>
diff --git a/addons/account/company.py b/addons/account/company.py
index 1ec9b8c55da..409216f29f0 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -32,14 +32,6 @@ class res_company(osv.osv):
             help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
         'overdue_msg': fields.text('Overdue Payments Message', translate=True),
-        'property_reserve_and_surplus_account': fields.property(
-            'account.account',
-            type='many2one',
-            relation='account.account',
-            string="Reserve and Profit/Loss Account",
-            view_load=True,
-            domain="[('type', '=', 'other')]",
-            help="This account is used for transferring Profit/Loss (If It is Profit: Amount will be added, Loss : Amount will be deducted.), as calculated in Profit & Loss Report"),
     }
 
     _defaults = {
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 447622b57c5..73eb450ac2f 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -21,7 +21,6 @@
             <field name="model">res.company</field>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='account_grp']" position="inside">
-                    <field name="property_reserve_and_surplus_account"/>
                     <field name="tax_calculation_rounding_method"/>
                     <field name="paypal_account"  placeholder="e.g. sales@openerp.com"/>
                 </xpath>
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index b8b23344ff3..eca52109597 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -381,7 +381,6 @@
             <field name="property_account_income_categ" ref="conf_a_sale"/>
             <field name="property_account_income_opening" ref="conf_o_income"/>
             <field name="property_account_expense_opening" ref="conf_o_expense"/>
-            <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
             <field name="complete_tax_set" eval="False"/>
         </record>
 
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 8f858491edc..984711eceef 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -304,14 +304,6 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <record forcecreate="True" id="property_reserve_and_surplus_account" model="ir.property">
-            <field name="name">property_account_receivable</field>
-            <field name="fields_id" search="[('model','=','res.company'),('name','=','property_reserve_and_surplus_account')]"/>
-            <field eval="'account.account,'+str(rsa)" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-
-
         <!--
         Account Journal
         -->
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index b04031d42ce..bd848642a97 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -11807,7 +11807,6 @@
             <field name="property_account_income" ref="ch_3200"/>
             <field name="property_account_income_opening" ref="ch_2990"/>
             <field name="property_account_expense_opening" ref="ch_2990"/>
-            <field name="property_reserve_and_surplus_account" ref="ch_2991"/>
         </record>
         
         <!-- journal configuration of account -->
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index e51a9d70654..afcb3e04b0c 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -957,7 +957,6 @@
             <field name="property_account_payable" ref="chart2202"/>
             <field name="property_account_expense_categ" ref="chart1401"/>
             <field name="property_account_income_categ" ref="chart6001"/>
-            <field name="property_reserve_and_surplus_account" ref="chart4103"/>            
         </record>
         <!-- 增值税 -->
         <record id="vats" model="account.tax.template">
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index b44d04439f0..78b34f2d696 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -441,7 +441,6 @@
             <field name="property_account_payable" ref="fr_pcg_pay"/>
             <field name="property_account_expense_categ" ref="pcg_6071"/>
             <field name="property_account_income_categ" ref="pcg_7071"/>
-            <field name="property_reserve_and_surplus_account" ref="pcg_120"/>
         </record>
 
   </data>
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 91561dca41b..4ba27d6a5c4 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -35,7 +35,6 @@
             <field name="bank_account_view_id" ref="cta1101"/>
             <field name="property_account_receivable" ref="cta110201"/>
             <field name="property_account_payable" ref="cta210101"/>
-            <field name="property_reserve_and_surplus_account" ref="cta310103"/>
             <field name="property_account_income_categ" ref="cta410101"/>
             <field name="property_account_expense_categ" ref="cta510101"/>
         </record>
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index 1a080e3c2dd..a12d93db034 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -21,7 +21,6 @@
             <field name="bank_account_view_id" ref="cta1101"/>
             <field name="property_account_receivable" ref="cta110201"/>
             <field name="property_account_payable" ref="cta210101"/>
-            <field name="property_reserve_and_surplus_account" ref="cta310103"/>
             <field name="property_account_income_categ" ref="cta410101"/>
             <field name="property_account_expense_categ" ref="cta510101"/>
         </record>
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index 45f5edb33d9..671fdc334d9 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -514,7 +514,6 @@
             <field name="property_account_payable" ref="a215"/>
             <field name="property_account_expense_categ" ref="a540"/>
             <field name="property_account_income_categ" ref="a311"/>
-            <field name="property_reserve_and_surplus_account" ref="a260"/>
         </record>
         
         
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 4a4098d56c9..9612afddc39 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -668,7 +668,6 @@
             <field name="property_account_payable" ref="p21000"/>
             <field name="property_account_expense_categ" ref="p41010"/>
             <field name="property_account_income_categ" ref="p31010"/>
-            <field name="property_reserve_and_surplus_account" ref="p24600"/> 
         </record>
         
     </data>
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index 48cf78f382b..96100d9a442 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -4102,7 +4102,6 @@
             <field name="property_account_payable" ref="a_pay"/>          <!-- crediteuren -->
             <field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen -->
             <field name="property_account_income_categ" ref="a_sale"/>    <!-- verkoop rekening -->
-            <field name="property_reserve_and_surplus_account" ref="a_9999"/>
         </record>
 
 <!-- BTW  Template
diff --git a/addons/l10n_uk/data/account.chart.template.csv b/addons/l10n_uk/data/account.chart.template.csv
index 9d1812a8df4..5a8c863e3ac 100644
--- a/addons/l10n_uk/data/account.chart.template.csv
+++ b/addons/l10n_uk/data/account.chart.template.csv
@@ -1,2 +1,2 @@
-"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id","property_reserve_and_surplus_account:id"
-"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000","3200"
+"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id"
+"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000"
diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/account_chart_template.xml
index 8308263d8b0..4ce35184967 100644
--- a/addons/l10n_uy/account_chart_template.xml
+++ b/addons/l10n_uy/account_chart_template.xml
@@ -1895,7 +1895,6 @@
             <field name="property_account_payable"       ref="uy_code_21100"/>
             <field name="property_account_income_categ"  ref="uy_code_4100"/>
             <field name="property_account_expense_categ" ref="uy_code_5100"/>
-            <field name="property_reserve_and_surplus_account" ref="uy_code_3313"/>
         </record>
 
 

From e06e3aad4a98450300018ceecf502b789224301a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 15 Oct 2012 14:09:34 +0200
Subject: [PATCH 09/23] [IMP] tools.html2plaintext: consistent use of
 lxml.etree.HTMLParser to convert HTML to plaintext

We used to switch to using BeautifulSoup when available, but that
lead to inconsistent behavior depending on the installed Python
packages, and sometimes lead to bad surprises. There is no advantage
in using BeautifulSoup rather than HTMLParser, and the latter is
always available.

bzr revid: odo@openerp.com-20121015120934-njaylf99dc5zekfw
---
 openerp/tools/misc.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 130db6f0d4e..c9283a839d4 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -312,16 +312,8 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
     html = ustr(html)
 
-    from lxml.etree import tostring
-    try:
-        from lxml.html.soupparser import fromstring
-        kwargs = {}
-    except ImportError:
-        _logger.debug('tools.misc.html2plaintext: cannot use BeautifulSoup, fallback to lxml.etree.HTMLParser')
-        from lxml.etree import fromstring, HTMLParser
-        kwargs = dict(parser=HTMLParser())
-
-    tree = fromstring(html, **kwargs)
+    from lxml.etree import tostring, fromstring, HTMLParser
+    tree = fromstring(html, parser=HTMLParser())
 
     if body_id is not None:
         source = tree.xpath('//*[@id=%s]'%(body_id,))

From 38582c8410f77ef4b105f634fd543f630dd43613 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 14:38:56 +0200
Subject: [PATCH 10/23] [FIX] Problem in editable list view: in sale orders,
 when we add a line in the order lines o2m then select a product, some strange
 numbers appear on the top left of the list view.

bzr revid: nicolas.vanhoren@openerp.com-20121015123856-j4sgaqtf3oexg6of
---
 .../web/static/src/js/view_list_editable.js   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 4bf61895a09..cd6b018ea0d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -201,10 +201,7 @@ openerp.web.list_editable = function (instance) {
                 }, function () {
                     return self.editor.edit(item, function (field_name, field) {
                         var cell = cells[field_name];
-                        if (!cell || field.get('effective_readonly')) {
-                            // Readonly fields can just remain the list's,
-                            // form's usually don't have backgrounds &al
-                            field.set({invisible: true});
+                        if (!cell) {
                             return;
                         }
 
@@ -400,6 +397,21 @@ openerp.web.list_editable = function (instance) {
         },
         setup_events: function () {
             var self = this;
+            _.each(this.editor.form.fields, function(field, field_name) {
+                var field;
+                var setting = false;
+                var set_invisible = function() {
+                    if (!setting && field.get("effective_readonly")) {
+                        setting = true;
+                        field.set({invisible: true});
+                        setting = false;
+                    }
+                };
+                field.on("change:effective_readonly", self, set_invisible);
+                field.on("change:invisible", self, set_invisible);
+                set_invisible();
+            });
+
             this.editor.$el.on('keyup keydown', function (e) {
                 if (!self.editor.is_editing()) { return; }
                 var key = _($.ui.keyCode).chain()

From 87ea306997c8b23b59cc5e35f71ec8e8d78e57a2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 14:51:23 +0200
Subject: [PATCH 11/23] [IMP] Modified formatting of m2o to be consistent with
 the m2o in form view

bzr revid: nicolas.vanhoren@openerp.com-20121015125123-cyosgswtdxgtcom7
---
 addons/web/static/src/js/formats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 3e5e6fecd5e..dd1fd95c97e 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -135,7 +135,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
                     Math.round((value % 1) * 60));
         case 'many2one':
             // name_get value format
-            return value[1];
+            return value[1].split("\n")[0];
         case 'one2many':
         case 'many2many':
             if (typeof value === 'string') {

From 3db503e42373e734e63f021d574c9e2ce4e30375 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 15:24:44 +0200
Subject: [PATCH 12/23] [IMP] Now form view relation popups use $buttons.

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 60c33090c56..a3c6a4d7722 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4404,9 +4404,8 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
                 self.check_exit(true);
             },
             title: this.options.title || "",
-            buttons: [{text:"tmp"}],
         }, this.$el).open();
-        this.$buttonpane = dialog.$el.dialog("widget").find(".ui-dialog-buttonpane").html("");
+        this.$buttonpane = dialog.$buttons;
         this.start();
     },
     setup_form_view: function() {

From 0227125c44a119fbeca19b8e5b0b194fd9f0ed6d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 15:28:36 +0200
Subject: [PATCH 13/23] [IMP] Changed calendar to open popups with the buttons
 on the bottom left.

bzr revid: nicolas.vanhoren@openerp.com-20121015132836-rg0y8kjdj7f3vh5h
---
 addons/web_calendar/static/src/js/calendar.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index d08912bbaab..e4ecfdab53f 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -455,7 +455,8 @@ instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
         var self = this;
         this._super();
         this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
-            pager: false
+            pager: false,
+            $buttons: this.$buttons,
         });
         var def = this.form.appendTo(this.$el);
         this.form.on('record_created', self, this.on_form_dialog_saved);

From a99934dc7833e1297ab2c0abd1ee5facefcae89a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 15 Oct 2012 15:36:44 +0200
Subject: [PATCH 14/23] [FIX] account: typo in print overdue report introduced
 in revision 7762. Thanks to Olivier, 'the lynx-eyes'

bzr revid: qdp-launchpad@openerp.com-20121015133644-edsismxhj32fhdhw
---
 addons/account/report/account_print_overdue.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 577cb9142a2..8b8238030fe 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -129,7 +129,7 @@
         </td>
         <td>
           <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
-          <para style="terp_default_9">[[ display_address(o.partner_id)] ]]</para>
+          <para style="terp_default_9">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>

From ed445ff91a15f18ee98cd8af202e7799d8480f6b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 15:38:15 +0200
Subject: [PATCH 15/23] [REVERT] revert commit 3224 because it didn't
 reproduced the original behavior and some on_close were forgotten

bzr revid: nicolas.vanhoren@openerp.com-20121015133815-hmkz6h1bkhnbq7up
---
 addons/web/static/src/js/chrome.js                  | 8 +++++---
 addons/web/static/src/js/views.js                   | 5 ++---
 addons/web_view_editor/static/src/js/view_editor.js | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index c993f3e3ad1..078082d07fd 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -70,7 +70,7 @@ instance.web.Dialog = instance.web.Widget.extend({
             autoOpen: false,
             position: [false, 40],
             buttons: {},
-            beforeClose: function () { self.close(); },
+            beforeClose: function () { self.on_close(); },
             resizeStop: this.on_resized
         };
         for (var f in this) {
@@ -150,14 +150,16 @@ instance.web.Dialog = instance.web.Widget.extend({
         var res = this.start();
         return res;
     },
-    close: function() {        
+    close: function() {
+        this.$el.dialog('close');
+    },
+    on_close: function() {
         if (this.__tmp_dialog_destroying)
             return;
         if (this.dialog_options.destroy_on_close) {
             this.__tmp_dialog_closing = true;
             this.destroy();
             this.__tmp_dialog_closing = undefined;
-            this.trigger("dialog_close");
         }
     },
     on_resized: function() {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b5bb3a7259d..78cab1c3e33 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -296,9 +296,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
                     buttons: { "Close": function() { $(this).dialog("close"); }},
                     dialogClass: executor.klass
                 });
-                if (on_close) {
-                    this.dialog.on("dialog_close", this, on_close);
-                }
+                if(on_close)
+                    this.dialog.on_close.add(on_close);
             } else {
                 this.dialog_widget.destroy();
             }
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 5e7c61ab17c..63dc864c916 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -67,6 +67,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
                 {text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }}
             ]
         }).open();
+        this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog.$el);

From ede4edc156131f1eeed39caaeb4bc7244ba8c294 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 15 Oct 2012 15:49:18 +0200
Subject: [PATCH 16/23] [FIX] web/tests: `import openerp.addons.web` instead of
 `import web`.

bzr revid: vmt@openerp.com-20121015134918-9ccl265d49qkms4t
---
 addons/web/tests/test_dataset.py | 4 ++--
 addons/web/tests/test_view.py    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/tests/test_dataset.py b/addons/web/tests/test_dataset.py
index 8cd9634d5bf..1169ff5f0b9 100644
--- a/addons/web/tests/test_dataset.py
+++ b/addons/web/tests/test_dataset.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 import mock
 import unittest2
-import web.controllers.main
+import openerp.addons.web.controllers.main
 
 class TestDataSetController(unittest2.TestCase):
     def setUp(self):
-        self.dataset = web.controllers.main.DataSet()
+        self.dataset = openerp.addons.web.controllers.main.DataSet()
         self.request = mock.Mock()
         self.read = self.request.session.model().read
         self.search = self.request.session.model().search
diff --git a/addons/web/tests/test_view.py b/addons/web/tests/test_view.py
index a9354d0a6c7..51377099558 100644
--- a/addons/web/tests/test_view.py
+++ b/addons/web/tests/test_view.py
@@ -5,7 +5,7 @@ import mock
 import unittest2
 import simplejson
 
-import web.controllers.main
+import openerp.addons.web.controllers.main
 from .. import nonliterals, session as s
 
 def field_attrs(fields_view_get, fieldname):
@@ -16,7 +16,7 @@ def field_attrs(fields_view_get, fieldname):
 #noinspection PyCompatibility
 class DomainsAndContextsTest(unittest2.TestCase):
     def setUp(self):
-        self.view = web.controllers.main.View()
+        self.view = openerp.addons.web.controllers.main.View()
 
     def test_convert_literal_domain(self):
         e = xml.etree.ElementTree.Element(
@@ -106,7 +106,7 @@ class DomainsAndContextsTest(unittest2.TestCase):
 
 class AttrsNormalizationTest(unittest2.TestCase):
     def setUp(self):
-        self.view = web.controllers.main.View()
+        self.view = openerp.addons.web.controllers.main.View()
 
     def test_identity(self):
         web_view = """

From eea4d6ee73f953dd6ccd93f5bfe7e12b0856fada Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 15 Oct 2012 15:50:27 +0200
Subject: [PATCH 17/23] [IMP] account, account_voucher: moved some fields from
 res.company to accounting settings + removed duplicated fields (in company
 form view AND accounting settings)

bzr revid: qdp-launchpad@openerp.com-20121015135027-fbapd9h06gtixpep
---
 addons/account/company_view.xml               | 12 ---------
 addons/account/res_config_view.xml            |  2 +-
 addons/account_voucher/account_voucher.py     | 15 +++++++++++
 .../account_voucher/account_voucher_view.xml  | 25 ++++++++++++-------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 73eb450ac2f..d5ab6d7753a 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -15,17 +15,5 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_company_inherit_1_form">
-            <field name="name">res.company.form.inherit</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='account_grp']" position="inside">
-                    <field name="tax_calculation_rounding_method"/>
-                    <field name="paypal_account"  placeholder="e.g. sales@openerp.com"/>
-                </xpath>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 0e4b1fa64c4..728eefe8078 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -121,7 +121,7 @@
                         </div>
                         <label for="id" string="Features"/>
                         <div>
-                            <div>
+                            <div name="group_multi_currency">
                                 <field name="group_multi_currency" class="oe_inline"/>
                                 <label for="group_multi_currency"/>
                             </div>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f97f3f6af3c..648576443a0 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -42,6 +42,21 @@ class res_company(osv.osv):
 
 res_company()
 
+class account_config_settings(osv.osv_memory):
+    _inherit = 'account.config.settings'
+    _columns = {
+        'income_currency_exchange_account_id': fields.related(
+            'company_id', 'income_currency_exchange_account_id',
+            type='many2one',
+            relation='account.account',
+            string="Gain Exchange Rate Account"),
+        'expense_currency_exchange_account_id': fields.related(
+            'company_id', 'expense_currency_exchange_account_id',
+            type="many2one",
+            relation='account.account',
+            string="Loss Exchange Rate Account"),
+    }
+
 class account_voucher(osv.osv):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index f8bab444453..4b02d697982 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -249,16 +249,23 @@
             </field>
         </record>
 
-        <!-- res.company form view -->
-        <record model="ir.ui.view" id="view_company_inherit_currency_xchange_form">
-            <field name="name">res.company.form.inherit</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>
+        <!-- res.config form view -->
+        <record model="ir.ui.view" id="view_account_settings_currency_xchange_form">
+            <field name="name">account.config.settings.inherit</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="model">account.config.settings</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                      <field name="income_currency_exchange_account_id"/>
-                      <field name="expense_currency_exchange_account_id"/>
-                </field>
+                <xpath expr="//div[@name='group_multi_currency']" position="after">
+                    <group attrs="{'invisible': [('group_multi_currency', '&lt;&gt;', True)]}" col="2">
+                        <group>
+                            <field name="income_currency_exchange_account_id"/>
+                            <field name="expense_currency_exchange_account_id"/>
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                </xpath>
             </field>
         </record>
 

From 04353719e97715a64c105a45aed36480dc6d02f0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 15:52:36 +0200
Subject: [PATCH 18/23] [IMP] removed on_close in Dialog

bzr revid: nicolas.vanhoren@openerp.com-20121015135236-r5809kwwbcqo67tj
---
 addons/web/static/src/js/chrome.js                  |  5 +++--
 addons/web/static/src/js/views.js                   |  2 +-
 addons/web_calendar/static/src/js/calendar.js       | 12 ++++++------
 addons/web_kanban/static/src/js/kanban.js           |  8 ++++----
 addons/web_view_editor/static/src/js/view_editor.js |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 078082d07fd..5f05095d880 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -70,7 +70,7 @@ instance.web.Dialog = instance.web.Widget.extend({
             autoOpen: false,
             position: [false, 40],
             buttons: {},
-            beforeClose: function () { self.on_close(); },
+            beforeClose: function () { self.trigger("closing") },
             resizeStop: this.on_resized
         };
         for (var f in this) {
@@ -84,6 +84,7 @@ instance.web.Dialog = instance.web.Widget.extend({
             }
             _.extend(this.dialog_options, options);
         }
+        this.on("closing", this, this._closing);
     },
     get_options: function(options) {
         var self = this,
@@ -153,7 +154,7 @@ instance.web.Dialog = instance.web.Widget.extend({
     close: function() {
         this.$el.dialog('close');
     },
-    on_close: function() {
+    _closing: function() {
         if (this.__tmp_dialog_destroying)
             return;
         if (this.dialog_options.destroy_on_close) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 78cab1c3e33..1554d347552 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -297,7 +297,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                     dialogClass: executor.klass
                 });
                 if(on_close)
-                    this.dialog.on_close.add(on_close);
+                    this.dialog.on("closing", null, on_close);
             } else {
                 this.dialog_widget.destroy();
             }
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index e4ecfdab53f..03d22e0dcbd 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -450,6 +450,12 @@ instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
         this.dataset = dataset;
         this.view_id = view_id;
         this.view = view;
+        this.on("closing", this, function() {
+            if (this.view.creating_event_id) {
+                scheduler.deleteEvent(this.view.creating_event_id);
+                this.view.creating_event_id = null;
+            }
+        });
     },
     start: function() {
         var self = this;
@@ -475,12 +481,6 @@ instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
         this.view.reload_event(id);
         this.close();
     },
-    on_close: function() {
-        if (this.view.creating_event_id) {
-            scheduler.deleteEvent(this.view.creating_event_id);
-            this.view.creating_event_id = null;
-        }
-    }
 });
 
 instance.web_calendar.Sidebar = instance.web.Widget.extend({
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index d884fa6e6a2..decc20b1a03 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -194,10 +194,10 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel", self, am.dialog.on_close);
+        form.on("on_button_cancel", am.dialog, am.dialog.close);
         form.on('record_created', self, function(r) {
             (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r]).then(function(new_record) {
-                am.dialog.on_close();
+                am.dialog.close();
                 var domain = self.dataset.domain.slice(0);
                 domain.push([self.group_by, '=', new_record[0][0]]);
                 var dataset = new instance.web.DataSetSearch(self, self.dataset.model, self.dataset.get_context(), domain);
@@ -672,9 +672,9 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel", self, am.dialog.on_close);
+        form.on("on_button_cancel", am.dialog, am.dialog.close);
         form.on('record_saved', self, function() {
-            am.dialog.on_close();
+            am.dialog.close();
             self.view.do_reload();
         });
     },
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 63dc864c916..2732954097d 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -67,7 +67,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
                 {text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }}
             ]
         }).open();
-        this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
+        this.view_edit_dialog.on("closing", this, function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog.$el);

From a2399bc651137e27409b4c6d533b912ec8f47627 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 15:56:07 +0200
Subject: [PATCH 19/23] [FIX] Small problem with formatting

bzr revid: nicolas.vanhoren@openerp.com-20121015135607-j2c3dedpxaiuivd3
---
 addons/web/static/src/js/formats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index dd1fd95c97e..03b2c5b775d 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -135,7 +135,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
                     Math.round((value % 1) * 60));
         case 'many2one':
             // name_get value format
-            return value[1].split("\n")[0];
+            return value[1] ? value[1].split("\n")[0] : value[1];
         case 'one2many':
         case 'many2many':
             if (typeof value === 'string') {

From bd8a4a8e5e0cf13461bc0e70a5794d18f02c045e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 17:15:54 +0200
Subject: [PATCH 20/23] [FIX] account: reconciliation now displays a custom
 view

bzr revid: nicolas.vanhoren@openerp.com-20121015151554-5nrchkji3dyer7u6
---
 addons/account/account_view.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b0c73c132d5..cc5a075a814 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1037,11 +1037,10 @@
     -->
 
         <record id="view_move_line_tree_reconcile" model="ir.ui.view">
-            <field name="name">account.move.line.reconcile.tree</field>
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false">
+                <account_reconciliation_list colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="ref"/>
@@ -1049,9 +1048,10 @@
                     <field name="partner_id"/>
                     <field name="account_id"/>
                     <field name="reconcile_partial_id"/>
+                    <field name="state"/>
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
-                </tree>
+                </account_reconciliation_list>
             </field>
         </record>
 
@@ -1542,7 +1542,6 @@
             <field name="name">Journal Items to Reconcile</field>
             <field name="res_model">account.move.line</field>
             <field name="view_id" ref="view_move_line_tree_reconcile"/>
-            <field name="view_type">form</field>
             <field name="view_mode">account_reconciliation_list</field>
             <field name="help" type="html">
                 <p>

From d20e95dce3551c7f61ae3f9595190466351e462b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 17:33:39 +0200
Subject: [PATCH 21/23] [IMP] account: some more improvement to reconciliation

bzr revid: nicolas.vanhoren@openerp.com-20121015153339-mxp25btufvkj68zh
---
 addons/account/account_view.xml                           | 8 ++++----
 .../account/static/src/js/account_move_reconciliation.js  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index cc5a075a814..c12bd98ae81 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1040,7 +1040,7 @@
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
             <field name="arch" type="xml">
-                <account_reconciliation_list colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
+                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="ref"/>
@@ -1048,10 +1048,10 @@
                     <field name="partner_id"/>
                     <field name="account_id"/>
                     <field name="reconcile_partial_id"/>
-                    <field name="state"/>
+                    <field name="state" invisible="1"/>
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
-                </account_reconciliation_list>
+                </tree_account_reconciliation>
             </field>
         </record>
 
@@ -1542,7 +1542,7 @@
             <field name="name">Journal Items to Reconcile</field>
             <field name="res_model">account.move.line</field>
             <field name="view_id" ref="view_move_line_tree_reconcile"/>
-            <field name="view_mode">account_reconciliation_list</field>
+            <field name="view_mode">tree_account_reconciliation</field>
             <field name="help" type="html">
                 <p>
                     No journal items found.
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 18e415a5f0a..89ceb5be6fa 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -5,7 +5,7 @@ openerp.account = function (instance) {
     
     instance.web.account = {};
     
-    instance.web.views.add('account_reconciliation_list', 'instance.web.account.ReconciliationListView');
+    instance.web.views.add('tree_account_reconciliation', 'instance.web.account.ReconciliationListView');
     instance.web.account.ReconciliationListView = instance.web.ListView.extend({
         init: function() {
             this._super.apply(this, arguments);

From 6034e14280cbe6a3f1d62c3cc981bb341db6a735 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 18:29:04 +0200
Subject: [PATCH 22/23] [IMP] Added localization file for sr@latin

bzr revid: nicolas.vanhoren@openerp.com-20121015162904-hhig0alct0dld5r3
---
 addons/web/static/lib/datejs/globalization/sr@latin.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 addons/web/static/lib/datejs/globalization/sr@latin.js

diff --git a/addons/web/static/lib/datejs/globalization/sr@latin.js b/addons/web/static/lib/datejs/globalization/sr@latin.js
new file mode 100644
index 00000000000..e69de29bb2d

From b97cb148c87a63488b2f3c9c13bf2ac219388aa0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 18:35:27 +0200
Subject: [PATCH 23/23] [IMP] added missing localization files

bzr revid: nicolas.vanhoren@openerp.com-20121015163527-i8upwcnr29yq5o7a
---
 addons/web/static/lib/datejs/globalization/ab-RU.js   | 0
 addons/web/static/lib/datejs/globalization/ar-AR.js   | 0
 addons/web/static/lib/datejs/globalization/bs-BS.js   | 0
 addons/web/static/lib/datejs/globalization/iu-CA.js   | 0
 addons/web/static/lib/datejs/globalization/ko-KP.js   | 0
 addons/web/static/lib/datejs/globalization/ml-IN.js   | 0
 addons/web/static/lib/datejs/globalization/oc-FR.js   | 0
 addons/web/static/lib/datejs/globalization/si-LK.js   | 0
 addons/web/static/lib/datejs/globalization/sr-RS.js   | 0
 addons/web/static/lib/datejs/globalization/tlh-TLH.js | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 addons/web/static/lib/datejs/globalization/ab-RU.js
 create mode 100644 addons/web/static/lib/datejs/globalization/ar-AR.js
 create mode 100644 addons/web/static/lib/datejs/globalization/bs-BS.js
 create mode 100644 addons/web/static/lib/datejs/globalization/iu-CA.js
 create mode 100644 addons/web/static/lib/datejs/globalization/ko-KP.js
 create mode 100644 addons/web/static/lib/datejs/globalization/ml-IN.js
 create mode 100644 addons/web/static/lib/datejs/globalization/oc-FR.js
 create mode 100644 addons/web/static/lib/datejs/globalization/si-LK.js
 create mode 100644 addons/web/static/lib/datejs/globalization/sr-RS.js
 create mode 100644 addons/web/static/lib/datejs/globalization/tlh-TLH.js

diff --git a/addons/web/static/lib/datejs/globalization/ab-RU.js b/addons/web/static/lib/datejs/globalization/ab-RU.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/ar-AR.js b/addons/web/static/lib/datejs/globalization/ar-AR.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/bs-BS.js b/addons/web/static/lib/datejs/globalization/bs-BS.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/iu-CA.js b/addons/web/static/lib/datejs/globalization/iu-CA.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/ko-KP.js b/addons/web/static/lib/datejs/globalization/ko-KP.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/ml-IN.js b/addons/web/static/lib/datejs/globalization/ml-IN.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/oc-FR.js b/addons/web/static/lib/datejs/globalization/oc-FR.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/si-LK.js b/addons/web/static/lib/datejs/globalization/si-LK.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/sr-RS.js b/addons/web/static/lib/datejs/globalization/sr-RS.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/static/lib/datejs/globalization/tlh-TLH.js b/addons/web/static/lib/datejs/globalization/tlh-TLH.js
new file mode 100644
index 00000000000..e69de29bb2d