From cf3f05d58b13cd6e32ba2ebcb1c710de078e70af Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 19 Oct 2012 11:10:52 +0530
Subject: [PATCH 01/29] [IMP]percentage in title.

bzr revid: vme@tinyerp.com-20121019054052-valignwzrc4jao4v
---
 addons/web/static/src/js/chrome.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3cb4437d1c3..62f55c439cf 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -236,6 +236,9 @@ instance.web.Loading = instance.web.Widget.extend({
         this._super(parent);
         this.count = 0;
         this.blocked_ui = false;
+        this.old_title = document.title;
+        this.request_count = 0;
+        this.response_count = 0;
         this.session.on("request", this, this.request_call);
         this.session.on("response", this, this.response_call);
         this.session.on("response_failed", this, this.response_call);
@@ -245,13 +248,19 @@ instance.web.Loading = instance.web.Widget.extend({
         this._super();
     },
     request_call: function() {
+        this.request_count += 1;
         this.on_rpc_event(1);
     },
     response_call: function() {
+        this.response_count += 1;
         this.on_rpc_event(-1);
     },
+    loading_title:function(percentage){
+        document.title = percentage + "% processed |" + this.old_title;
+    },
     on_rpc_event : function(increment) {
         var self = this;
+        this.loading_title(parseInt(this.response_count * 100 / this.request_count))
         if (!this.count && increment === 1) {
             // Block UI after 3s
             this.long_running_timer = setTimeout(function () {
@@ -271,6 +280,7 @@ instance.web.Loading = instance.web.Widget.extend({
             this.getParent().$el.addClass('oe_wait');
         } else {
             this.count = 0;
+            document.title = this.old_title;
             clearTimeout(this.long_running_timer);
             // Don't unblock if blocked by somebody else
             if (self.blocked_ui) {

From 731ca3aaa3738c75f8ba724d816d7840f0f381ea Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 23 Oct 2012 14:08:56 +0530
Subject: [PATCH 02/29] [IMP]testing for chrome this code from runbot.

bzr revid: vme@tinyerp.com-20121023083856-5jgq3dtdmp3e1m40
---
 addons/web/static/src/js/chrome.js | 52 ++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 62f55c439cf..fd3434e2105 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -242,6 +242,58 @@ instance.web.Loading = instance.web.Widget.extend({
         this.session.on("request", this, this.request_call);
         this.session.on("response", this, this.response_call);
         this.session.on("response_failed", this, this.response_call);
+        this.draw_favicon(50);
+    },
+    draw_favicon: function(percentage){
+        var self = this;
+        var canvas = this.get_canvas();
+        var faviconImage = new Image();
+        var context = canvas.getContext("2d");
+        faviconImage.onload = function() {
+            console.log("Image Loaded");
+            if (context) {
+                context.clearRect(0, 0, 16, 16);
+                // Draw shadow
+                context.beginPath();
+                context.moveTo(canvas.width / 2, canvas.height / 2);
+                context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2), 0, Math.PI * 2, false);
+                context.fillStyle = "red";
+                context.fill();
+                // Draw background
+                context.beginPath();
+                context.moveTo(canvas.width / 2, canvas.height / 2);
+                context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, 0, Math.PI * 2, false);
+                context.fillStyle = "yellow";
+                context.fill();
+                // Draw pie
+                if (percentage > 0) {
+                    context.beginPath();
+                    context.moveTo(canvas.width / 2, canvas.height / 2);
+                    context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false);
+                    context.lineTo(canvas.width / 2, canvas.height / 2);
+                    context.fillStyle = "white";
+                    context.fill();
+                }
+                var link = document.createElement('link');
+                link.type = 'image/x-icon';
+                link.rel = 'icon';
+                link.href = canvas.toDataURL();
+                var src = $('link[type="image/x-icon"]').attr("href");
+                if (!src.match(/^data/)) {
+                    faviconImage.crossOrigin = 'anonymous';
+                }
+                document.getElementsByTagName('head')[0].appendChild(link);
+                console.log("canvas to url",canvas.toDataURL());
+            }
+        }
+        faviconImage.src = $('link[type="image/x-icon"]').attr("href");
+        console.log("favicon",faviconImage);
+    },
+    get_canvas: function(){
+        canvas = document.createElement("canvas");
+        canvas.width = 16;
+        canvas.height = 16;
+        return canvas;
     },
     destroy: function() {
         this.on_rpc_event(-this.count);

From 28706d4967c5ea15032383b5bd5afa8130a25a62 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Oct 2012 10:33:24 +0200
Subject: [PATCH 03/29] [FIX] stock, picking.in: fixed crash at the record
 creation

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

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 765599aa842..3b40dfb1dfc 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -618,7 +618,7 @@ class stock_picking(osv.osv):
 
     def create(self, cr, user, vals, context=None):
         if ('name' not in vals) or (vals.get('name')=='/'):
-            seq_obj_name =  'stock.picking.' + vals['type']
+            seq_obj_name =  self._name
             vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name)
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         if new_id:

From b526278aa1182f2f6d191a1a94a0102be9a3e7ff Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Oct 2012 10:58:42 +0200
Subject: [PATCH 04/29] [IMP] sale_crm depends on sale, not sale_stock

bzr revid: qdp-launchpad@openerp.com-20121024085842-98edk5c5twqi1rqw
---
 addons/sale_crm/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 88608af8922..82e267337f9 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -37,7 +37,7 @@ modules.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/crm_statistics_dashboard.jpeg', 'images/opportunity_to_quote.jpeg'],
-    'depends': ['sale_stock', 'crm'],
+    'depends': ['sale', 'crm'],
     'data': [
         'wizard/crm_make_sale_view.xml',
         'sale_crm_view.xml',

From e21795c3a10b4dcabb5155e7e02682a344b8f601 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Oct 2012 11:06:25 +0200
Subject: [PATCH 05/29] [FIX] sale_margin depends on sale, not sale_stock

bzr revid: qdp-launchpad@openerp.com-20121024090625-opgy3jr0ejlwtnq5
---
 addons/sale_margin/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index bb2f78f409c..badb87d3628 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -31,7 +31,7 @@ Price and Cost Price.
     """,
     'author':'OpenERP SA',
     'images':['images/sale_margin.jpeg'],
-    'depends':['sale_stock'],
+    'depends':['sale'],
     'demo':['sale_margin_demo.xml'],
     'test': ['test/sale_margin.yml'],
     'data':['security/ir.model.access.csv','sale_margin_view.xml'],

From 4cf738290511f54238240b928b63e67def16a312 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Oct 2012 11:12:49 +0200
Subject: [PATCH 06/29] [IMP] account_voucher: improved error messages

bzr revid: qdp-launchpad@openerp.com-20121024091249-b12vibq7h0fi41cj
---
 addons/account_voucher/account_voucher.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 3ae421308b5..37a2343b72a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -988,11 +988,11 @@ class account_voucher(osv.osv):
         if amount_residual > 0:
             account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
             if not account_id:
-                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Expense Currency Rate' on the company, then create accounting entry for currency rate difference."))
+                raise osv.except_osv(_('Insufficient Configuration!'),_("You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
         else:
             account_id = line.voucher_id.company_id.income_currency_exchange_account_id
             if not account_id:
-                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Income Currency Rate' on the company, then create accounting entry for currency rate difference."))
+                raise osv.except_osv(_('Insufficient Configuration!'),_("You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
         # Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
         # the receivable/payable account may have a secondary currency, which render this field mandatory
         account_currency_id = company_currency <> current_currency and current_currency or False

From ff6966da8b3efab5a7da14a089f5b6f510e14a90 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Oct 2012 11:13:13 +0200
Subject: [PATCH 07/29] [IMP] account: added an option to enable/disable the
 check_total feature on supplier invoices

bzr revid: qdp-launchpad@openerp.com-20121024091313-s6k3ekmsen5ntez4
---
 addons/account/account_invoice.py            | 7 +++++--
 addons/account/account_invoice_view.xml      | 1 +
 addons/account/res_config.py                 | 2 ++
 addons/account/res_config_view.xml           | 4 ++++
 addons/account/security/account_security.xml | 5 +++++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 0508a7cadfe..d3d37907538 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -865,8 +865,11 @@ class account_invoice(osv.osv):
             self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj)
 
             # I disabled the check_total feature
-            #if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
-            #    raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
+            group_check_total_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'group_supplier_inv_check_total')[1]
+            group_check_total = self.pool.get('res.groups').browse(cr, uid, group_check_total_id, context=context)
+            if group_check_total and uid in [x.id for x in group_check_total.users]:
+                if (inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0)):
+                    raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe encoded total does not match the computed total.'))
 
             if inv.payment_term:
                 total_fixed = total_percent = 0
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5ed373456f3..2699fffaacc 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -186,6 +186,7 @@
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                             <field name="currency_id" groups="base.group_multi_currency"/>
+                            <field name="check_total" groups="account.group_supplier_inv_check_total"/>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 17df4377548..ab271eabc34 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -120,6 +120,8 @@ class account_config_settings(osv.osv_memory):
         'group_analytic_accounting': fields.boolean('Analytic accounting',
             implied_group='analytic.group_analytic_accounting',
             help="Allows you to use the analytic accounting."),
+        'group_check_supplier_invoice_total': fields.boolean('Check the Total of Supplier Invoices', 
+            implied_group="account.group_supplier_inv_check_total"),
     }
 
     def _default_company(self, cr, uid, context=None):
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 728eefe8078..d4bafca41be 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -220,6 +220,10 @@
                                 <field name="module_account_check_writing" class="oe_inline"/>
                                 <label for="module_account_check_writing"/>
                             </div>
+                            <div>
+                                <field name="group_check_supplier_invoice_total" class="oe_inline"/>
+                                <label for="group_check_supplier_invoice_total"/>
+                            </div>
                         </div>
                     </group>
                     <separator string="Bank &amp; Cash"/>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 4b90e0c8ad5..cc44f866169 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -26,6 +26,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_supplier_inv_check_total" model="res.groups">
+        <field name="name">Check Total on supplier invoices</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
         <field name="model_id" ref="model_account_move"/>

From 920d85d80c6038348f90fb0271b32249686f88b0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Oct 2012 14:23:57 +0200
Subject: [PATCH 08/29] [FIX] sale_margin: fixing yaml test

bzr revid: qdp-launchpad@openerp.com-20121024122357-6watcqo0as1xhn1g
---
 addons/sale_margin/test/sale_margin.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 8038ea1aa5f..2d19704508d 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -14,7 +14,6 @@
         product_uom: product.product_uom_unit
         product_uom_qty: 100.0
         state: draft
-        delay: 7.0
         product_id: product.product_product_24
         product_uos_qty: 100.0
         th_weight: 0.0

From fb9af9f8bb641ec7643a031f85ff3ce8c36a62ba Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Oct 2012 15:09:25 +0200
Subject: [PATCH 09/29] [FIX] sale_margin: error in yaml test

bzr revid: qdp-launchpad@openerp.com-20121024130925-k431qqhmpx5aok20
---
 addons/analytic/analytic.py             |  9 ++++++++-
 addons/hr_timesheet/hr_timesheet.py     | 11 +++++++++++
 addons/sale_margin/test/sale_margin.yml |  1 -
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5ea8c59b848..65505a2884e 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -305,8 +305,15 @@ class account_analytic_line(osv.osv):
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 
     }
+
+    def _get_default_datum(self, cr, uid, context=None):
+        import pprint; PP = pprint.PrettyPrinter()
+        import pdb; pdb.set_trace()
+        print 'dans analytic'
+        return fields.date.context_today()
+
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': _get_default_datum,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
         'amount': 0.00
     }
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index a28508be4db..56f71d624e2 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -210,4 +210,15 @@ class account_analytic_account(osv.osv):
 
 account_analytic_account()
 
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+
+    def _get_default_date(self, cr, uid, context=None):
+        print 'not called'
+        if context is None:
+            context = {}
+        if context.get('timesheet_date'):
+            return context.get('timesheet_date')
+        return super(account_analytic_line, self)._get_default_date(cr, uid, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 2d19704508d..1d6b295b3a1 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -22,7 +22,6 @@
     partner_id: base.res_partner_4
     partner_invoice_id: base.res_partner_address_7
     partner_shipping_id: base.res_partner_address_7
-    picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.sale_shop_1
 -

From 149451bdf5d2f4d097dad948c3a5b329df27ff00 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 25 Oct 2012 16:54:43 +0200
Subject: [PATCH 10/29] [FIX]  hr_timesheet_sheet: default date on timehseet
 lines should be the date_from of the timesheet if today isn't included in the
 date_from and date_to

bzr revid: qdp-launchpad@openerp.com-20121025145443-5iuohn57h6uxn04t
---
 addons/account/account_analytic_line.py       |  1 -
 addons/analytic/analytic.py                   | 12 ++++-----
 addons/hr_timesheet/hr_timesheet.py           | 11 --------
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  | 25 ++++++++++++-------
 .../hr_timesheet_sheet_view.xml               |  2 +-
 5 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 2117f6e49ea..f0a420f7496 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -39,7 +39,6 @@ class account_analytic_line(osv.osv):
     }
 
     _defaults = {
-        'date': fields.date.context_today,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
     }
     _order = 'date desc'
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 65505a2884e..39506c63958 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -306,14 +306,14 @@ class account_analytic_line(osv.osv):
 
     }
 
-    def _get_default_datum(self, cr, uid, context=None):
-        import pprint; PP = pprint.PrettyPrinter()
-        import pdb; pdb.set_trace()
-        print 'dans analytic'
-        return fields.date.context_today()
+    def _get_default_date(self, cr, uid, context=None):
+        return fields.date.context_today(self, cr, uid, context=context)
+
+    def __get_default_date(self, cr, uid, context=None):
+        return self._get_default_date(cr, uid, context=context)
 
     _defaults = {
-        'date': _get_default_datum,
+        'date': __get_default_date,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
         'amount': 0.00
     }
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 56f71d624e2..a28508be4db 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -210,15 +210,4 @@ class account_analytic_account(osv.osv):
 
 account_analytic_account()
 
-class account_analytic_line(osv.osv):
-    _inherit = 'account.analytic.line'
-
-    def _get_default_date(self, cr, uid, context=None):
-        print 'not called'
-        if context is None:
-            context = {}
-        if context.get('timesheet_date'):
-            return context.get('timesheet_date')
-        return super(account_analytic_line, self)._get_default_date(cr, uid, context=context)
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index e62134ee38a..03f4443c235 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -304,16 +304,26 @@ class hr_timesheet_sheet(osv.osv):
 
 hr_timesheet_sheet()
 
-
-class hr_timesheet_line(osv.osv):
-    _inherit = "hr.analytic.timesheet"
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
 
     def _get_default_date(self, cr, uid, context=None):
         if context is None:
             context = {}
-        if 'date' in context:
-            return context['date']
-        return time.strftime('%Y-%m-%d')
+        #get the default date (should be: today)
+        res = super(account_analytic_line, self)._get_default_date(cr, uid, context=context)
+        #if we got the dates from and to from the timesheet and if the default date is in between, we use the default
+        #but if the default isn't included in those dates, we use the date start of the timesheet as default
+        if context.get('timesheet_date_from') and context.get('timesheet_date_to'):
+            if context['timesheet_date_from'] <= res <= context['timesheet_date_to']:
+                return res
+            return context.get('timesheet_date_from')
+        #if we don't get the dates from the timesheet, we return the default value from super()
+        return res
+
+
+class hr_timesheet_line(osv.osv):
+    _inherit = "hr.analytic.timesheet"
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -359,9 +369,6 @@ class hr_timesheet_line(osv.osv):
                   },
             ),
     }
-    _defaults = {
-        'date': _get_default_date,
-    }
 
     def _check_sheet_state(self, cr, uid, ids, context=None):
         if context is None:
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index fc35a17377f..741b59d4393 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -94,7 +94,7 @@
                             <group col="4">
                                 <field name="state_attendance" groups="base.group_hr_attendance"/>
                             </group>
-                            <field colspan="4" context="{'user_id':user_id}" name="timesheet_ids" nolabel="1">
+                            <field colspan="4" context="{'user_id': user_id, 'timesheet_date_from': date_from, 'timesheet_date_to': date_to}" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
                                     <field name="date"/>
                                     <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1}"/>

From a1b8d8c72c371827fd1d13d298f5669badd7406c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 09:35:08 +0100
Subject: [PATCH 11/29] [IMP] clean project css

bzr revid: fp@openerp.com-20121028083508-dxuik2l81dwoxii8
---
 addons/project/project_view.xml             | 2 +-
 addons/project_issue/project_issue_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c1d4b1d3d45..897a462a3aa 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -239,7 +239,7 @@
 
                                     <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> <field name="task_count"/> Tasks</a>
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <span groups="project.group_time_work_estimation_tasks">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6ff5388ce4a..efb464d9e4c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -378,7 +378,7 @@
                     <field name="issue_count" invisible="1"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
-                    <a t-if="record.use_issues.raw_value"
+                    <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
                         <field name="issue_count"/> Issues</a>
                 </xpath>

From 67a66d0ca47ec4a39c80182a192ea4c57ca704a0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 11:33:28 +0100
Subject: [PATCH 12/29] [IMP] Useability: contracts

bzr revid: fp@openerp.com-20121028103328-qjqeznq9a95mcdpe
---
 .../account_analytic_analysis_view.xml        | 22 ++++++---
 addons/analytic/analytic.py                   |  2 +-
 .../analytic_user_function.py                 | 45 ++++++++++---------
 .../analytic_user_function_view.xml           | 41 ++++++++++++-----
 .../hr_timesheet_invoice.py                   |  3 +-
 5 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 7678dc59f75..e1708cdd018 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -116,13 +116,21 @@
                         </tr>
                     </table>
                     <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-                        <field name="pricelist_id"
-                            class="oe_inline"
-                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice"
-                            class="oe_inline"
-                            widget="selection"
-                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <p class="oe_grey oe_edit_only" colspan="2">
+                            When invoicing on timesheet, OpenERP uses the
+                            pricelist of the contract which uses the price
+                            defined on the product related to each employee to
+                            define the customer invoice price rate.
+                        </p>
+                        <group>
+                            <field name="pricelist_id"
+                                class="oe_inline"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                            <field name="to_invoice"
+                                class="oe_inline"
+                                widget="selection"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        </group>
                     </group>
                  </xpath>
             </field>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5ea8c59b848..369dbc829c2 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -156,7 +156,7 @@ class account_analytic_account(osv.osv):
         'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
-        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract.'),
+        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract, based on the timesheet.'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 9233845f7eb..c3338cd3c84 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -21,39 +21,51 @@
 
 from osv import fields,osv
 from tools.translate import _
+import decimal_precision as dp
 
 class analytic_user_funct_grid(osv.osv):
-
     _name="analytic.user.funct.grid"
-    _description= "Relation table between users and products on a analytic account"
+    _description= "Price per User"
     _columns={
         'user_id': fields.many2one("res.users", "User", required=True,),
-        'product_id': fields.many2one("product.product", "Product", required=True,),
+        'product_id': fields.many2one("product.product", "Service", required=True,),
         'account_id': fields.many2one("account.analytic.account", "Analytic Account", required=True,),
-        }
+        'uom_id': fields.related("product_id", "uom_id", relation="product.uom", string="Unit of Measure", type="many2one", readonly=True),
+        'price': fields.float('Price', digits_compute=dp.get_precision('Product Price'), help="Price per hour for this user.", required=True),
+    }
+    def onchange_user_product_id(self, cr, uid, ids, user_id, product_id, context=None):
+        if not user_id:
+            return {}
+        emp_obj = self.pool.get('hr.employee')
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)
+        if not emp_id:
+            return {}
 
-analytic_user_funct_grid()
+        value = {}
+        emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
+        if emp.product_id and not product_id:
+            value['product_id'] = emp.product_id.id
+            prod = emp.product_id
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        if prod:
+            value['price'] = prod.list_price
+            value['uom_id'] = prod.uom_id.id
+        return {'value': value}
 
 
 class account_analytic_account(osv.osv):
-
     _inherit = "account.analytic.account"
     _columns = {
         'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
     }
 
-account_analytic_account()
-
 
 class hr_analytic_timesheet(osv.osv):
-
     _inherit = "hr.analytic.timesheet"
-
-
     # Look in account, if no value for the user => look in parent until there is no more parent to look
     # Take the first found... if nothing found => return False
     def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
-
         temp=self.pool.get('analytic.user.funct.grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
         account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
         if temp:
@@ -64,7 +76,6 @@ class hr_analytic_timesheet(osv.osv):
             else:
                 return False
 
-
     def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0):
         res = {}
         if not (account_id):
@@ -106,12 +117,6 @@ class hr_analytic_timesheet(osv.osv):
         return res
 
     def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0):
-        res = {}
-        if not (user_id):
-            #avoid a useless call to super
-            return res
-
-        #get the old values from super
         res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
 
         if account_id:
@@ -143,5 +148,3 @@ class hr_analytic_timesheet(osv.osv):
 
 hr_analytic_timesheet()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 6fa141f480d..490b3026d7f 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -7,9 +7,11 @@
             <field name="name">analytic_user_funct_grid.tree</field>
             <field name="model">analytic.user.funct.grid</field>
             <field name="arch" type="xml">
-                <tree string="User's Product for this Analytic Account" editable="bottom">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1" />
+                <tree string="Invoicing Data" editable="bottom">
+                    <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                    <field name="product_id" on_change="onchange_user_product_id(user_id, product_id)" domain="[('type','=','service')]"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
                 </tree>
             </field>
         </record>
@@ -18,9 +20,13 @@
             <field name="name">analytic_user_funct_grid.form</field>
             <field name="model">analytic.user.funct.grid</field>
             <field name="arch" type="xml">
-                <form string="User's Product for this Analytic Account">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1"/>
+                <form string="Invoicing Data">
+                    <group>
+                        <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="product_id" domain="[('type','=','service')]" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="price"/>
+                        <field name="uom_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -29,13 +35,26 @@
         <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
+            <field eval="60" name="priority"/>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//notebook/page" position="after">
-                    <page string="Users/Products Rel.">
-                        <field name="user_product_ids" colspan="4" nolabel="1"/>
-                    </page>
-                </xpath>
+                <separator name="description" position="before">
+                    <div name="user_function_price" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <separator string="Invoice Price Rate per User"/>
+                        <p class="oe_grey oe_edit_only">
+                            Define a specific service (e.g. Senior Consultant)
+                            and price for some users to use these data instead
+                            of the default values when invoicing the customer.
+                        </p>
+                        <p class="oe_grey oe_edit_only">
+                            OpenERP will recursively search on parent accounts
+                            to check if specific conditions are defined for a
+                            specific user. This allows to set invoicing
+                            conditions for a group of contracts.
+                        </p>
+                        <field name="user_product_ids"/>
+                    </div>
+                </separator>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 67fcb100468..88094b4a0e0 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -70,8 +70,7 @@ class account_analytic_account(osv.osv):
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invoicing Ratio',
-            help="This field allows you to define the rate in case you plan to reinvoice " \
-            "the costs in this analytic account: timesheets, expenses, ..."),
+            help="You usually invoice 100% of the timesheets. But if you mix fixed price and timesheet invoicing, you may use another ratio. For instance, if you do a 20% advance invoice (fixed price, based on a sale order), you should invoice the rest on timesheet with a 80% ratio."),
     }
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),

From af4b056f242219127fee061e7a1e007c31d83ca5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 12:05:06 +0100
Subject: [PATCH 13/29] [IMP] cleaned timesheets and contracts useability

bzr revid: fp@openerp.com-20121028110506-v53w8oh42xzrm9ff
---
 .../account_analytic_analysis_view.xml                      | 2 +-
 addons/analytic/analytic.py                                 | 2 +-
 addons/analytic/analytic_view.xml                           | 6 ++++--
 addons/hr_timesheet/hr_timesheet.py                         | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index e1708cdd018..513eb4c0ee2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -91,7 +91,7 @@
                                     or view 
                                 </span>
                                 <div attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
-                                    No hours to invoice, create 
+                                    Nothing to invoice, create 
                                 </div>
 
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 369dbc829c2..f4c77177d0c 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -156,7 +156,7 @@ class account_analytic_account(osv.osv):
         'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
-        'quantity_max': fields.float('Prepaid Units', help='Sets the higher limit of time to work on the contract, based on the timesheet.'),
+        'quantity_max': fields.float('Prepaid Service Units', help='Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 4d3296866b4..8098279b3ea 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -39,8 +39,10 @@
                                     <p colspan="2" class="oe_grey oe_edit_only">
                                         Once the end date of the contract is
                                         passed or the maximum number of service
-                                        units is reached, the account manager
-                                        is warned by email to renew the contract.
+                                        units (e.g. support contract) is
+                                        reached, the account manager is warned
+                                        by email to renew the contract with the
+                                        customer.
                                     </p>
                                     <field name="date_start"/>
                                     <label for="date" string="End Date"/>
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 3248f31a082..9e5337492d9 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -154,7 +154,7 @@ class hr_analytic_timesheet(osv.osv):
         'date': lambda self, cr, uid, ctx: ctx.get('date', fields.date.context_today(self,cr,uid,context=ctx)),
         'user_id': lambda obj, cr, uid, ctx: ctx.get('user_id', uid),
     }
-    def on_change_account_id(self, cr, uid, ids, account_id):
+    def on_change_account_id(self, cr, uid, ids, account_id, context=None):
         return {'value':{}}
 
     def on_change_date(self, cr, uid, ids, date):

From eff45f038d0398fd72e761eb445258a58d99a188 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 13:17:30 +0100
Subject: [PATCH 14/29] [IMP] invoice on timesheet using user price

bzr revid: fp@openerp.com-20121028121730-1sbhsoyxa220oktn
---
 .../account_analytic_analysis.py              | 42 ++++++-------------
 .../analytic_user_function.py                 | 10 ++++-
 .../wizard/hr_timesheet_invoice_create.py     | 23 ++++++----
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 70beb41ac13..0fffde30719 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -74,36 +74,18 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = 0.0
                 res2 = {}
-                if parent_ids:
-                    # Amount uninvoiced hours to invoice at sale price
-                    # Warning
-                    # This computation doesn't take care of pricelist !
-                    # Just consider list_price
-                    cr.execute("""SELECT account_analytic_account.id, \
-                                COALESCE(SUM (product_template.list_price * \
-                                    account_analytic_line.unit_amount * \
-                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
-                                    AS ca_to_invoice \
-                            FROM product_template \
-                            JOIN product_product \
-                                ON product_template.id = product_product.product_tmpl_id \
-                            JOIN account_analytic_line \
-                                ON account_analytic_line.product_id = product_product.id \
-                            JOIN account_analytic_journal \
-                                ON account_analytic_line.journal_id = account_analytic_journal.id \
-                            JOIN account_analytic_account \
-                                ON account_analytic_account.id = account_analytic_line.account_id \
-                            JOIN hr_timesheet_invoice_factor \
-                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
-                            WHERE account_analytic_account.id IN %s \
-                                AND account_analytic_line.invoice_id IS NULL \
-                                AND account_analytic_line.to_invoice IS NOT NULL \
-                                AND account_analytic_journal.type = 'general' \
-                            GROUP BY account_analytic_account.id;""", (parent_ids,))
-                    for account_id, sum in cr.fetchall():
-                        if account_id not in res:
-                            res[account_id] = {}
-                        res[account_id][f] = round(sum, dp)
+                for account in accounts:
+                    cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+                            "FROM account_analytic_line as line " \
+                            "WHERE account_id = %s " \
+                                "AND invoice_id is NULL AND to_invoice IS NOT NULL " \
+                            "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id,))
+
+                    res[account.id][f] = 0.0
+                    for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+                        price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
+                        factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
+                        res[account.id][f] += price * qty * (100-factor.factor or 0.0) / 100.0
 
                 # sum both result on account_id
                 for id in ids:
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index c3338cd3c84..e5902ca56c2 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -146,5 +146,13 @@ class hr_analytic_timesheet(osv.osv):
                 res ['value']['general_account_id']= a
         return res
 
-hr_analytic_timesheet()
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        print 'Call'
+        for grid in account.user_product_ids:
+            if grid.user_id.id==user_id:
+                print '***', grid.price
+                return grid.price
+        return super(account_analytic_line, self)._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 2e220a9397b..5ec60c1ef52 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -29,6 +29,15 @@ from tools.translate import _
 
 class account_analytic_line(osv.osv):
     _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        pro_price_obj = self.pool.get('product.pricelist')
+        if account.pricelist_id:
+            pl = account.pricelist_id.id
+            price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=context)[pl]
+        else:
+            price = 0.0
+        return price
+
 
     #
     # data = {
@@ -45,7 +54,6 @@ class account_analytic_line(osv.osv):
         invoice_obj = self.pool.get('account.invoice')
         product_obj = self.pool.get('product.product')
         invoice_factor_obj = self.pool.get('hr_timesheet_invoice.factor')
-        pro_price_obj = self.pool.get('product.pricelist')
         fiscal_pos_obj = self.pool.get('account.fiscal.position')
         product_uom_obj = self.pool.get('product.uom')
         invoice_line_obj = self.pool.get('account.invoice.line')
@@ -99,13 +107,13 @@ class account_analytic_line(osv.osv):
             last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
             invoices.append(last_invoice)
 
-            cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+            cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
+                    "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
 
-            for product_id, factor_id, qty, uom, line_name in cr.fetchall():
+            for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
                 if data.get('product'):
                      product_id = data['product'][0]
                 product = product_obj.browse(cr, uid, product_id, context=context2)
@@ -118,11 +126,8 @@ class account_analytic_line(osv.osv):
 
                 ctx =  context.copy()
                 ctx.update({'uom':uom})
-                if account.pricelist_id:
-                    pl = account.pricelist_id.id
-                    price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
-                else:
-                    price = 0.0
+
+                price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
 
                 general_account = product.product_tmpl_id.property_account_income or product.categ_id.property_account_income_categ
                 if not general_account:

From 06f1c8ddfe1059761a39c7327cac59a179370994 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 13:19:43 +0100
Subject: [PATCH 15/29] [IMP] remove print statement

bzr revid: fp@openerp.com-20121028121943-0ipufxo9omjoalm3
---
 addons/analytic_user_function/analytic_user_function.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index e5902ca56c2..c2a7ae8f05a 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -149,10 +149,8 @@ class hr_analytic_timesheet(osv.osv):
 class account_analytic_line(osv.osv):
     _inherit = "account.analytic.line"
     def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
-        print 'Call'
         for grid in account.user_product_ids:
             if grid.user_id.id==user_id:
-                print '***', grid.price
                 return grid.price
         return super(account_analytic_line, self)._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
 

From f721ff1d14e267d04e2d8aa24a95e5b190b9e943 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 13:32:16 +0100
Subject: [PATCH 16/29] [FIX] launch config wizards after changing settings

bzr revid: fp@openerp.com-20121028123216-sj9ds9xa9wtiuzyy
---
 openerp/addons/base/res/res_config.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index c24fc11a377..1aa108c14d2 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -361,6 +361,7 @@ class res_config_installer(osv.osv_memory):
             'to install', ['uninstalled'], context=context)
         cr.commit() #TOFIX: after remove this statement, installation wizard is fail
         new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
+
 res_config_installer()
 
 DEPRECATION_MESSAGE = 'You are using an addon using old-style configuration '\
@@ -538,6 +539,10 @@ class res_config_settings(osv.osv_memory):
             ir_module.button_uninstall(cr, uid, to_uninstall_ids, context=context)
             ir_module.button_immediate_install(cr, uid, to_install_ids, context=context)
 
+        config = self.pool.get('res.config').next(cr, uid, [], context=context) or {}
+        if config.get('type') not in ('ir.actions.act_window_close',):
+            return config
+
         # force client-side reload (update user menu and current view)
         return {
             'type': 'ir.actions.client',

From 4f0c5bf19c04442a41d81d1f0045093858967b80 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 16:15:37 +0100
Subject: [PATCH 17/29] [IMP] contract useability and invoicing

bzr revid: fp@openerp.com-20121028151537-98wz6qiosmumbqvg
---
 .../account_analytic_analysis_view.xml        |  4 ++--
 addons/analytic/analytic.py                   |  4 ++--
 addons/hr_timesheet/hr_timesheet.py           |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     | 17 ++++++++++++++++
 .../hr_timesheet_invoice_data.xml             |  5 +++++
 .../hr_timesheet_invoice_view.xml             |  4 ++--
 .../hr_timesheet_final_invoice_create.py      |  7 +++++--
 .../wizard/hr_timesheet_invoice_create.py     |  3 ++-
 ...hr_timesheet_invoice_create_final_view.xml | 20 ++++++++++++-------
 addons/sale/sale_view.xml                     | 15 +-------------
 10 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 513eb4c0ee2..2e89f85821d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -61,7 +61,7 @@
                                 </span>
 
                                 <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
-                                    No order to invoice, view
+                                    No order to invoice, create
                                 </span>
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
@@ -84,7 +84,7 @@
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
-                                    <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
+                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
                                         type="action"
                                         class="oe_link"
                                         string="⇒ Invoice"/>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index f4c77177d0c..3cb98d81f43 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -141,11 +141,11 @@ class account_analytic_account(osv.osv):
         'name': fields.char('Account/Contract Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
         'code': fields.char('Reference', size=24, select=True),
-        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True,
+        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
                                   "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
-                                  "The special type 'Template of Project' allows you to define a template with default data that you can reuse easily."),
+                                  "The special type 'Template of Contract' allows you to define a template with default data that you can reuse easily."),
         'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 9e5337492d9..216541501b1 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -195,7 +195,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
+        'use_timesheets': fields.boolean('Use Timesheets', help="Check this field if this project manages timesheets"),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, context=None):
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 55c4680b6a1..ebdd05ed59c 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -85,6 +85,23 @@
             <field name="src_model">account.analytic.account</field>
             <field name="view_mode">tree,form</field>
             <field name="view_type">form</field>
+            <field name="help" type="html">
+              <p>
+                No activity yet on this contract.
+              </p><p>
+                In OpenERP, contracts and projects are implemented using
+                analytic account. So, you can track costs and revenues to analyse
+                your margins easily.
+              </p><p>
+                Costs will be created automatically when you register supplier
+                invoices, expenses or timesheets.
+              </p><p>
+                Revenues will be created automatically when you create customer
+                invoices. Customer invoices can be created based on sale orders
+                (fixed price invoices), on timesheets (based on the work done) or
+                on expenses (e.g. reinvoicing of travel costs).
+              </p>
+            </field>
         </record>
 
  
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
index 462888e0b39..5c0bc6d702f 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -16,5 +16,10 @@
             <field name="customer_name">50%</field>
             <field name="factor">50.0</field>
         </record>
+        <record id="timesheet_invoice_factor4" model="hr_timesheet_invoice.factor">
+            <field name="name">80%</field>
+            <field name="customer_name">80%</field>
+            <field name="factor">20.0</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 95fa39a6eda..e58b33634f8 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <group string="Invoice on Timesheets Options" name="invoice_on_timesheets" col="4">
-                        <field name="pricelist_id" />
-                        <field name="to_invoice" widget="selection"/>
+                        <field name="pricelist_id" groups="product.group_sale_pricelist"/>
+                        <field name="to_invoice"/>
                     </group>
                  </xpath>
                 <xpath expr="//field[@name='use_timesheets']" position="replace">
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 4b98f7ec23f..2671cd1ab90 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -36,14 +36,17 @@ class final_invoice_create(osv.osv_memory):
     _description = 'Create invoice from timesheet final'
     _columns = {
         'date': fields.boolean('Date', help='Display date in the history of works'),
-        'time': fields.boolean('Time spent', help='Display time in the history of works'),
-        'name': fields.boolean('Name of entry', help='Display detail of work in the invoice line.'),
+        'time': fields.boolean('Time Spent', help='Display time in the history of works'),
+        'name': fields.boolean('Log of Activity', help='Display detail of work in the invoice line.'),
         'price': fields.boolean('Cost', help='Display cost of the item you reinvoice'),
         'product': fields.many2one('product.product', 'Product', help='The product that will be used to invoice the remaining amount'),
     }
 
     def do_create(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [], context=context)[0]
+        # hack for fixing small issue (context should not propagate implicitly between actions)
+        if 'default_type' in context:
+            del context['default_type']
         ids = self.pool.get('account.analytic.line').search(cr, uid, [('invoice_id','=',False),('to_invoice','<>', False), ('account_id', 'in', context['active_ids'])], context=context)
         invs = self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, ids, data, context=context)
         mod_obj = self.pool.get('ir.model.data')
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 5ec60c1ef52..1201cc7d4e5 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -169,7 +169,8 @@ class account_analytic_line(osv.osv):
                         details.append(line['name'])
                     note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
 
-                curr_line['name'] += "\n".join(map(lambda x: unicode(x) or '',note))
+                if note:
+                    curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
                 invoice_line_obj.create(cr, uid, curr_line, context=context)
                 cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index a0a0ceea2ac..d1c95212139 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -26,13 +26,19 @@
             <field name="model">hr.timesheet.invoice.create.final</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
-                    <separator string="Do you want to display work details on the invoice?" colspan="4"/>
-                    <field name="date"/>
-                    <field name="time"/>
-                    <field name="name"/>
-                    <field name="price"/>
-                    <separator string="Force to use a special product" colspan="4"/>
-                    <field name="product"/>
+                    <p>Do you want to show details of each activity to your customer?</p>
+                    <group>
+                        <group>
+                            <field name="date"/>
+                            <field name="time"/>
+                        </group><group>
+                            <field name="name"/>
+                            <field name="price"/>
+                        </group>
+                    </group>
+                    <group string="Force to use a special product" groups="base.group_no_one">
+                        <field name="product"/>
+                    </group>
                 <footer>
                     <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
                     or
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index bdc687f6e87..3d1c84659a3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -306,20 +306,6 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="History">
-                            <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}">
-                                <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
-                                    <field name="date_invoice"/>
-                                    <field name="number"/>
-                                    <field name="partner_id" string="Customer"/>
-                                    <field name="user_id"/>
-                                    <field name="date_due"/>
-                                    <field name="amount_total"/>
-                                    <field name="state"/>
-                                </tree>
-                            </field>
-                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
@@ -360,6 +346,7 @@
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>

From 75e76aef95c46c394e7e78df9c6421eacb244fbf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 16:24:19 +0100
Subject: [PATCH 18/29] [IMP] filter timesheets to invoice

bzr revid: fp@openerp.com-20121028152419-sufllvbm16q1nuw5
---
 .../hr_timesheet_invoice_view.xml                  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index e58b33634f8..f4536309d70 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -91,6 +91,20 @@
             </field>
         </record>
 
+        <record id="view_hr_timesheet_line_search_to_invoice" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.search.to_invoice</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <separator/>
+                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
+                    <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
+                </xpath>
+            </field>
+        </record>
+
+
         <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.to_invoice</field>
             <field name="model">account.analytic.line</field>

From 892c44f2974a666dafd070d48373ad4fb199ef6d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 16:37:55 +0100
Subject: [PATCH 19/29] [FIX]

bzr revid: fp@openerp.com-20121028153755-thiih4im6dzaxn28
---
 addons/sale_stock/sale_stock_view.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index a033e3e6d33..328581bf77c 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -68,18 +68,6 @@
                        <field name="shipped"/>
                        <field name="invoice_exists" invisible="1"/>
                    </field>
-                   <field name="invoice_ids" position="after">
-                       <separator string="Delivery Orders"/>
-                       <field name="picking_ids" context="{'default_type': 'out'}">
-                           <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
-                               <field name="name"/>
-                               <field name="partner_id" string="Customer"/>
-                               <field name="min_date"/>
-                               <field name="state"/>
-                               <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" context="{'default_type': 'out'}"/>
-                           </tree>
-                       </field>
-                   </field>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='type']" position="before">                   
                        <label for="delay"/>
                        <div>

From c645cff9528152d2967f0ed19c8f316a212080a0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 17:45:05 +0100
Subject: [PATCH 20/29] [FIX]

bzr revid: fp@openerp.com-20121028164505-n339qqi3nws4951b
---
 .../account_analytic_analysis_view.xml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 2e89f85821d..fd32edba0a1 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -90,9 +90,9 @@
                                         string="⇒ Invoice"/>
                                     or view 
                                 </span>
-                                <div attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                <span attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
                                     Nothing to invoice, create 
-                                </div>
+                                </span>
 
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
                                     string="Timesheets" type="action"

From e5a7eb11bc900fe2f82b80fd49853381d49c9548 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 17:49:09 +0100
Subject: [PATCH 21/29] [fIX] typo

bzr revid: fp@openerp.com-20121028164909-a20voaqf4swbe4r8
---
 .../analytic_contract_hr_expense_view.xml                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index bef0321a7c1..5628846a6a0 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -28,15 +28,15 @@
                                     class="oe_link"
                                     string="⇒ Invoice" type="object"
                                     />
-                                of view
+                                or view
                             </span>
                             <span attrs="{'invisible': [('expense_to_invoice','&lt;&gt;',0)]}" class="oe_grey">
-                                None to invoice, create 
+                                Nothing to invoice, create 
                             </span>
                             <button
                                 name="open_hr_expense"
                                 class="oe_link"
-                                string="Expenses" type="object"/>
+                                string="expenses" type="object"/>
                         </td>
                     </tr>
                 </xpath>

From bcf7db1651bef48b0495d6234c18dcc4dee506ce Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 29 Oct 2012 05:00:21 +0000
Subject: [PATCH 22/29] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121029050021-3df666wg6wqeormq
---
 addons/mail/i18n/hr.po | 147 ++++++++++++++++++++++-------------------
 1 file changed, 78 insertions(+), 69 deletions(-)

diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 36de7acc0b1..4535063726e 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -8,45 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-12-22 17:13+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"PO-Revision-Date: 2012-10-28 19:42+0000\n"
+"Last-Translator: Marijan Rajic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-29 05:00+0000\n"
+"X-Generator: Launchpad (build 16194)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Tip poruke"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Trajno obrisati e-poštu nakon slanja"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Otvori povezani dokument"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Attachments"
-msgstr "Otvori privitke"
+msgstr "Otvori priloge"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Message Details"
-msgstr "Detalji poruke"
+msgstr "Detalji porukue"
 
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "Povijest komunikacije"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,73 +57,73 @@ msgstr "Grupiraj po..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Sastavi e-poštu"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Verzija poruke u običnom tekstu"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Sadržaj"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Primatelji poruke"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
 #: field:mail.message.common,body_text:0
 msgid "Text Contents"
-msgstr ""
+msgstr "Sadržaj"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Primljeno"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Thread"
-msgstr ""
+msgstr "Nit"
 
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Izlazni poslužitelj e-pošte"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odgovori na"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Verzija poruke u Rich-text/HTML formatu"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Auto brisanje"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Primatelji skrivene kopije poruke"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
@@ -134,13 +134,13 @@ msgstr "Partner"
 #: field:mail.compose.message,subject:0 field:mail.message,subject:0
 #: field:mail.message.common,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Naslov"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "Na %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "Od"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Poruka e-pošte"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Pošalji"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Neuspjelo"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Odgovor"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Poslano"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,39 +185,41 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tip poruke, obično 'html' ili 'običan tekst', koristi se za odabir običnog "
+"ili bogatije formatiranog teksta"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Primatelji"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Čarobnjak za sastavljanje e-pošte"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Povezani ID dokumenta"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Napredno"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Povezani model dokumenta"
 
 #. module: mail
 #: view:mail.message:0
@@ -227,42 +229,42 @@ msgstr "Mjesec"
 #. module: mail
 #: view:mail.message:0
 msgid "Email Search"
-msgstr "Pretraživanje e-mailova"
+msgstr "Pretraga e-pošte"
 
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Originalna varijanta poruke, kakva je poslana na mrežu"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Partner Name"
-msgstr "Naziv partnera"
+msgstr "Ime partnera"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Pokušaj ponovo"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Odlazno"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Pošalji odmah"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Povezani partner"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,19 +275,19 @@ msgstr "Datum"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filteri..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s je napisao:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Formatirani tekst"
 
 #. module: mail
 #: field:mail.message,original:0
@@ -346,18 +348,18 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Povezani korisnik"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -366,11 +368,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cjelovito zaglavlje poruke, npr. zaglavlje SMTP sesije (obično dostupno samo "
+"kod dolaznih poruka)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mjesec kreiranja"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +391,7 @@ msgstr "Detalji"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Niti e-pošte"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +400,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Pošiljatelj poruke, preuzet iz korisničkih preferenci. Ukoliko je prazno, "
+"biti će poruka a ne e-pošta."
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Tijelo (obično)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Vi"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Jedinstveni identifikator poruke"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Tijelo (formatirano)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +433,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s napisano %s: \n"
+" Predmet: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -445,64 +454,64 @@ msgstr "Poruke"
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "Zaglavlja poruke"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
 #: field:mail.message.common,email_bcc:0
 msgid "Bcc"
-msgstr "Bcc"
+msgstr "Skrivena kopija"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Reference poruke, poput identifikatora prethodnih poruka"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Greška! Nije moguće kreirati pridružene članove rekurzivno."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Primatelji skrivene kopije"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Isporuka nije uspjela"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Poruka e-pošte"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Nit e-pošte"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Prilog e-pošte"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Željena povratna adresa za poruku"

From f9585ff4f0dd7d8cd1d38f161155c795b83819ee Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 29 Oct 2012 10:56:10 +0100
Subject: [PATCH 23/29] [IMP] account: tiny usability improvement

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

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index ab271eabc34..41121db20f7 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -120,7 +120,7 @@ class account_config_settings(osv.osv_memory):
         'group_analytic_accounting': fields.boolean('Analytic accounting',
             implied_group='analytic.group_analytic_accounting',
             help="Allows you to use the analytic accounting."),
-        'group_check_supplier_invoice_total': fields.boolean('Check the Total of Supplier Invoices', 
+        'group_check_supplier_invoice_total': fields.boolean('Check the total of supplier invoices', 
             implied_group="account.group_supplier_inv_check_total"),
     }
 

From 987ae161a35ee09b3d8175776720c14c4ebe4ba1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 29 Oct 2012 11:14:52 +0100
Subject: [PATCH 24/29] [IMP] Small focus improvement in kanban quick create

bzr revid: nicolas.vanhoren@openerp.com-20121029101452-quivvbjmyehu6x1s
---
 addons/web_kanban/static/src/js/kanban.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 39df8123aed..76920da6a47 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1040,6 +1040,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
         });
         $(".oe_kanban_quick_create_add", this.$el).click(function () {
             self.quick_add();
+            self.focus();
         });
         $(".oe_kanban_quick_create_close", this.$el).click(function (ev) {
             ev.preventDefault();

From 5d6e4af5294ba96772a10a21ac4f1c5a2d15ed80 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 29 Oct 2012 15:59:01 +0530
Subject: [PATCH 25/29] [IMP]implement favicon basis on percentage of request
 and response.

bzr revid: vme@tinyerp.com-20121029102901-e3j6bmgbko94z0mz
---
 addons/web/static/src/js/chrome.js | 161 +++++++++++++++++------------
 1 file changed, 95 insertions(+), 66 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index fd3434e2105..39b93e0937a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -229,71 +229,18 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
         });
     },
 });
-
 instance.web.Loading = instance.web.Widget.extend({
     template: 'Loading',
     init: function(parent) {
         this._super(parent);
+        var self = this;
         this.count = 0;
         this.blocked_ui = false;
-        this.old_title = document.title;
         this.request_count = 0;
         this.response_count = 0;
         this.session.on("request", this, this.request_call);
         this.session.on("response", this, this.response_call);
         this.session.on("response_failed", this, this.response_call);
-        this.draw_favicon(50);
-    },
-    draw_favicon: function(percentage){
-        var self = this;
-        var canvas = this.get_canvas();
-        var faviconImage = new Image();
-        var context = canvas.getContext("2d");
-        faviconImage.onload = function() {
-            console.log("Image Loaded");
-            if (context) {
-                context.clearRect(0, 0, 16, 16);
-                // Draw shadow
-                context.beginPath();
-                context.moveTo(canvas.width / 2, canvas.height / 2);
-                context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2), 0, Math.PI * 2, false);
-                context.fillStyle = "red";
-                context.fill();
-                // Draw background
-                context.beginPath();
-                context.moveTo(canvas.width / 2, canvas.height / 2);
-                context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, 0, Math.PI * 2, false);
-                context.fillStyle = "yellow";
-                context.fill();
-                // Draw pie
-                if (percentage > 0) {
-                    context.beginPath();
-                    context.moveTo(canvas.width / 2, canvas.height / 2);
-                    context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false);
-                    context.lineTo(canvas.width / 2, canvas.height / 2);
-                    context.fillStyle = "white";
-                    context.fill();
-                }
-                var link = document.createElement('link');
-                link.type = 'image/x-icon';
-                link.rel = 'icon';
-                link.href = canvas.toDataURL();
-                var src = $('link[type="image/x-icon"]').attr("href");
-                if (!src.match(/^data/)) {
-                    faviconImage.crossOrigin = 'anonymous';
-                }
-                document.getElementsByTagName('head')[0].appendChild(link);
-                console.log("canvas to url",canvas.toDataURL());
-            }
-        }
-        faviconImage.src = $('link[type="image/x-icon"]').attr("href");
-        console.log("favicon",faviconImage);
-    },
-    get_canvas: function(){
-        canvas = document.createElement("canvas");
-        canvas.width = 16;
-        canvas.height = 16;
-        return canvas;
     },
     destroy: function() {
         this.on_rpc_event(-this.count);
@@ -307,12 +254,8 @@ instance.web.Loading = instance.web.Widget.extend({
         this.response_count += 1;
         this.on_rpc_event(-1);
     },
-    loading_title:function(percentage){
-        document.title = percentage + "% processed |" + this.old_title;
-    },
     on_rpc_event : function(increment) {
         var self = this;
-        this.loading_title(parseInt(this.response_count * 100 / this.request_count))
         if (!this.count && increment === 1) {
             // Block UI after 3s
             this.long_running_timer = setTimeout(function () {
@@ -323,16 +266,10 @@ instance.web.Loading = instance.web.Widget.extend({
 
         this.count += increment;
         if (this.count > 0) {
-            if (instance.session.debug) {
-                this.$el.text(_.str.sprintf( _t("Loading (%d)"), this.count));
-            } else {
-                this.$el.text(_t("Loading"));
-            }
-            this.$el.show();
+            this.draw_favicon(parseInt(this.response_count * 100 / this.request_count));
             this.getParent().$el.addClass('oe_wait');
         } else {
             this.count = 0;
-            document.title = this.old_title;
             clearTimeout(this.long_running_timer);
             // Don't unblock if blocked by somebody else
             if (self.blocked_ui) {
@@ -341,10 +278,102 @@ instance.web.Loading = instance.web.Widget.extend({
             }
             this.$el.fadeOut();
             this.getParent().$el.removeClass('oe_wait');
+            this.stop_favicon();
         }
     }
 });
-
+instance.web.favicon = instance.web.Loading.include({
+    init: function(parent){
+        this._super(parent);
+        var self = this;
+        this.original_favi = $('link[type="image/x-icon"]');
+        this.canvas = null;
+        this.link = null;
+        this.interval = null;
+        this.old_title = document.title;
+        this.local_counter = 0;
+        this.options = {
+            'border':"white",
+            'background' :"gray",
+            'inner_circle':"white",
+            'fill_color':"red",
+            'width': 5
+        }
+    },
+    start_favicon: function(second, options){
+        var count = 0;
+        var self = this;
+        this.interval = setInterval(function(){
+           if (++count > 100) {self.stop_favicon(); return false;}
+           self.draw_favicon(count, options);
+        }, second || 1);
+    },
+    stop_favicon: function(){
+        if(this.interval)
+            clearInterval(this.interval);
+        $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href"));
+        $('head').append(this.original_favi);
+        document.title = this.old_title;
+    },
+    loading_title:function(percentage){
+        document.title = percentage + "% processed |" + this.old_title;
+    },
+    draw_favicon: function(percentage, options){
+        var self = this;
+        var options = _.extend(this.options, options || {});
+        var get_canvas =  function(){
+            if(!this.canvas){
+                this.canvas = document.createElement("canvas");
+                this.canvas.width = 16;
+                this.canvas.height = 16;
+            }
+            return this.canvas;
+        };
+        var get_link = function(canvas_url){
+            if(!this.link)
+                this.link =  $('<link></link>').attr({ type : 'image/x-icon',rel : 'icon'});
+            $(this.link).attr('href',canvas_url);
+            return this.link;
+        };
+        var canvas = get_canvas();
+        var src = self.original_favi.attr("href");
+        var faviconImage = new Image();
+        var context = canvas.getContext("2d");
+        var draw_context = function(context, x, y, r, sAngle, eAngle, counterclockwise ,color){
+                context.beginPath();
+                context.moveTo(canvas.width / 2, canvas.height / 2);
+                context.arc(x, y, r, sAngle, eAngle, counterclockwise);
+                context.fillStyle = color ;
+                context.fill();
+                return context
+        }
+        faviconImage.onload = function() {
+            if (context) {
+                context.clearRect(0, 0, 16, 16);
+                // Draw shadow
+                draw_context(context,canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) + 2, 0, Math.PI * 2, false ,options.border)
+                // Draw background
+                draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) , 0, Math.PI * 2, false,options.background)
+                // Draw pie
+                if (percentage > 0) {
+                    draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) , (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false,options.fill_color);
+                    context.lineTo(canvas.width / 2, canvas.height / 2)
+                }
+                //Inner Circle
+                draw_context(context, canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - options.width, 0, Math.PI * 2, false, options.inner_circle)
+                if (!src.match(/^data/)) {
+                    faviconImage.crossOrigin = 'anonymous';
+                }
+                if(self.count > 0 ){
+                    $('link[type="image/x-icon"]').remove();
+                    $('head').append(get_link(canvas.toDataURL()));
+                }
+            }
+        }
+        this.loading_title(percentage);
+        faviconImage.src = self.original_favi.attr("href");
+    },
+});
 instance.web.DatabaseManager = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);

From a5505925bd63ea7885b3221b282401a495deaf56 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 29 Oct 2012 17:27:10 +0530
Subject: [PATCH 26/29] [IMP]minor change.

bzr revid: vme@tinyerp.com-20121029115710-kpcfose7n8q749tm
---
 addons/web/static/src/js/chrome.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0b2ac1db7c7..2478ae954e6 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -266,8 +266,8 @@ instance.web.Loading = instance.web.Widget.extend({
 
         this.count += increment;
         if (this.count > 0) {
+            this.favicon_drawable = true;
             this.draw_favicon(parseInt(this.response_count * 100 / this.request_count));
-            this.getParent().$el.addClass('oe_wait');
         } else {
             this.count = 0;
             clearTimeout(this.long_running_timer);
@@ -276,8 +276,6 @@ instance.web.Loading = instance.web.Widget.extend({
                 this.blocked_ui = false;
                 instance.web.unblockUI();
             }
-            this.$el.fadeOut();
-            this.getParent().$el.removeClass('oe_wait');
             this.stop_favicon();
         }
     }
@@ -292,32 +290,40 @@ instance.web.favicon = instance.web.Loading.include({
         this.interval = null;
         this.old_title = document.title;
         this.local_counter = 0;
+        this.favicon_drawable = true;
         this.options = {
-            'border':"white",
-            'background' :"gray",
-            'inner_circle':"white",
-            'fill_color':"red",
-            'width': 5
+            'border':"white",//border of favicon
+            'background' :"gray",//main color of circle
+            'inner_circle':"white",//innter circle color
+            'fill_color':"red",//fill color 
+            'width': 5 //width of circle
         }
     },
+    
+    //when time interval is known than start favicon can be used.
     start_favicon: function(second, options){
         var count = 0;
         var self = this;
         this.interval = setInterval(function(){
            if (++count > 100) {self.stop_favicon(); return false;}
+           self.favicon_drawable = true;
            self.draw_favicon(count, options);
         }, second || 1);
     },
+    
     stop_favicon: function(){
         if(this.interval)
             clearInterval(this.interval);
+        this.favicon_drawable = false;
         $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href"));
         $('head').append(this.original_favi);
         document.title = this.old_title;
     },
+    
     loading_title:function(percentage){
         document.title = percentage + "% processed |" + this.old_title;
     },
+    
     draw_favicon: function(percentage, options){
         var self = this;
         var options = _.extend(this.options, options || {});
@@ -364,7 +370,7 @@ instance.web.favicon = instance.web.Loading.include({
                 if (!src.match(/^data/)) {
                     faviconImage.crossOrigin = 'anonymous';
                 }
-                if(self.count > 0 ){
+                if(self.favicon_drawable){
                     $('link[type="image/x-icon"]').remove();
                     $('head').append(get_link(canvas.toDataURL()));
                 }
@@ -372,7 +378,7 @@ instance.web.favicon = instance.web.Loading.include({
         }
         this.loading_title(percentage);
         faviconImage.src = self.original_favi.attr("href");
-    },
+    }
 });
 instance.web.DatabaseManager = instance.web.Widget.extend({
     init: function(parent) {

From 5e4b67c1a3d8799c9d7a32b97039e6823b4936a8 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 29 Oct 2012 17:32:13 +0530
Subject: [PATCH 27/29] [IMP]check if interval presents then first stop that.

bzr revid: vme@tinyerp.com-20121029120213-61uy6frqo0ormdc6
---
 addons/web/static/src/js/chrome.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2478ae954e6..821ed2d0fa6 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -302,6 +302,8 @@ instance.web.favicon = instance.web.Loading.include({
     
     //when time interval is known than start favicon can be used.
     start_favicon: function(second, options){
+        if(!this.interval)
+            this.stop_favicon();
         var count = 0;
         var self = this;
         this.interval = setInterval(function(){
@@ -318,6 +320,7 @@ instance.web.favicon = instance.web.Loading.include({
         $('link[type="image/x-icon"]').attr('href', this.original_favi.attr("href"));
         $('head').append(this.original_favi);
         document.title = this.old_title;
+        this.interval = null;
     },
     
     loading_title:function(percentage){

From a7bee43a5b13b92267707c1514cc610bb5fa2fd3 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 29 Oct 2012 17:43:13 +0530
Subject: [PATCH 28/29] [IMP]

bzr revid: vme@tinyerp.com-20121029121313-v12kb501m6vzi9c2
---
 addons/web/static/src/js/chrome.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 821ed2d0fa6..6cc416f448e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -270,6 +270,8 @@ instance.web.Loading = instance.web.Widget.extend({
             this.draw_favicon(parseInt(this.response_count * 100 / this.request_count));
         } else {
             this.count = 0;
+            this.request_count = 0;
+            this.response_count = 0;
             clearTimeout(this.long_running_timer);
             // Don't unblock if blocked by somebody else
             if (self.blocked_ui) {

From 5ea001c82c519e8b8ddbb75d8ea2a53756ba3779 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 29 Oct 2012 17:52:18 +0530
Subject: [PATCH 29/29] [REM]unused variable.

bzr revid: vme@tinyerp.com-20121029122218-yuv3o313upbkfkuq
---
 addons/web/static/src/js/chrome.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 6cc416f448e..1255e61e7dc 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -233,7 +233,6 @@ instance.web.Loading = instance.web.Widget.extend({
     template: 'Loading',
     init: function(parent) {
         this._super(parent);
-        var self = this;
         this.count = 0;
         this.blocked_ui = false;
         this.request_count = 0;
@@ -291,7 +290,6 @@ instance.web.favicon = instance.web.Loading.include({
         this.link = null;
         this.interval = null;
         this.old_title = document.title;
-        this.local_counter = 0;
         this.favicon_drawable = true;
         this.options = {
             'border':"white",//border of favicon