diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 0fffde30719..02f3dbc7852 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -300,7 +300,7 @@ class account_analytic_account(osv.osv):
             res[account.id] = 0.0
             line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'general')], context=context)
             for line in lines_obj.browse(cr, uid, line_ids, context=context):
-                res[account.id] += line.invoice_id.amount_untaxed
+                res[account.id] = line.invoice_id.amount_untaxed
         return res
 
     def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
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 695d589ee2e..eb91f7faa3b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -112,6 +112,7 @@ class account_analytic_line(osv.osv):
                         "AND id IN %s AND to_invoice IS NOT NULL " \
                     "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
 
+            curr_line = {}
             for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
                 if data.get('product'):
                     product_id = data['product'][0]
@@ -133,49 +134,52 @@ class account_analytic_line(osv.osv):
                     raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
                 taxes = product.taxes_id or general_account.tax_ids
                 tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
-                curr_line = {
-                    'price_unit': price,
-                    'quantity': qty,
-                    'discount':factor.factor,
-                    'invoice_line_tax_id': [(6,0,tax )],
-                    'invoice_id': last_invoice,
-                    'name': factor_name,
-                    'product_id': product_id,
-                    'invoice_line_tax_id': [(6,0,tax)],
-                    'uos_id': uom,
-                    'account_id': general_account.id,
-                    'account_analytic_id': account.id,
-                }
-
-                #
-                # Compute for lines
-                #
-                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
-
-                line_ids = cr.dictfetchall()
-                note = []
-                for line in line_ids:
-                    # set invoice_line_note
-                    details = []
-                    if data.get('date', False):
-                        details.append(line['date'])
-                    if data.get('time', False):
-                        if line['product_uom_id']:
-                            details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
-                        else:
-                            details.append("%s" % (line['unit_amount'], ))
-                    if data.get('name', False):
-                        details.append(line['name'])
-                    note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
-
-                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)))
+                invoice_line_ids =  invoice_line_obj.search(cr, uid, [('product_id', '=', product.id), ('invoice_id', '=', last_invoice)])
+                if invoice_line_ids:
+                    invoice_line_obj.write(cr, uid, invoice_line_ids, {'quantity': qty+ curr_line.get('quantity')})
+                else:
+                    curr_line = {
+                        'price_unit': price,
+                        'quantity': qty,
+                        'discount':factor.factor,
+                        'invoice_line_tax_id': [(6,0,tax )],
+                        'invoice_id': last_invoice,
+                        'name': factor_name,
+                        'product_id': product_id,
+                        'invoice_line_tax_id': [(6,0,tax)],
+                        'uos_id': uom,
+                        'account_id': general_account.id,
+                        'account_analytic_id': account.id,
+                    }
+    
+                    #
+                    # Compute for lines
+                    #
+                    cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
+    
+                    line_ids = cr.dictfetchall()
+                    note = []
+                    for line in line_ids:
+                        # set invoice_line_note
+                        details = []
+                        if data.get('date', False):
+                            details.append(line['date'])
+                        if data.get('time', False):
+                            if line['product_uom_id']:
+                                details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
+                            else:
+                                details.append("%s" % (line['unit_amount'], ))
+                        if data.get('name', False):
+                            details.append(line['name'])
+                        note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
+    
+                    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)))
 
             invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
         return invoices
-
 #
 # TODO: check unit of measure !!!
 #