From 1f159ce453faeb8ff8fdec9ac78838734de6d7cd Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 7 Oct 2010 11:09:21 +0530
Subject: [PATCH 1/4] [FIX] hr_attendance : correction on attendance by week
 report

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

bzr revid: jvo@tinyerp.com-20101007053921-bdbg48glsn4xi27f
---
 addons/hr_attendance/report/timesheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 096de11664e..b0845422655 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -82,7 +82,7 @@ class report_custom(report_rml):
                     for att in attendances:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if att['action'] == 'sign_out':
-                            week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + (dt - ldt).hours
+                            week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + ((dt - ldt).seconds/3600)
                         ldt = dt
 
                 # Week xml representation

From 6f121f968dd33207c1ccaa2a44a6e1e586d6f95a Mon Sep 17 00:00:00 2001
From: "JMA(OpenERP)" <>
Date: Thu, 7 Oct 2010 14:33:42 +0530
Subject: [PATCH 2/4] Account : Corrected the rounding of base of
 account.invoice.tax

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

bzr revid: jvo@tinyerp.com-20101007090342-tltei8skbhp7101u
---
 addons/account/invoice.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 777955d5a8e..2e81c7b054f 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1622,6 +1622,7 @@ class account_invoice_tax(osv.osv):
                     tax_grouped[key]['tax_amount'] += val['tax_amount']
 
         for t in tax_grouped.values():
+            t['base'] = cur_obj.round(cr, uid, cur, t['base'])
             t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
             t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
             t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])

From f9f0865239ae78c807644369d6d3bc8713adba6b Mon Sep 17 00:00:00 2001
From: "Vianney - www.akretion.com.br" <>
Date: Thu, 7 Oct 2010 14:53:15 +0530
Subject: [PATCH 3/4] [FIX] Account_analytic_default : added missing menu

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

bzr revid: jvo@tinyerp.com-20101007092315-q3us1zdrv2q07k8i
---
 .../account_analytic_default_view.xml                 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 95a39eb11e6..939d8474250 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -53,14 +53,14 @@
             </field>
         </record>
 
-        <record id="action_analytic_default_form" model="ir.actions.act_window">
+        <record id="action_analytic_default_list" model="ir.actions.act_window">
             <field name="name">Analytic Defaults</field>
             <field name="res_model">account.analytic.default</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
         </record>
-
+		
         <act_window
             name="Entries"
             id="act_account_acount_move_line_open"
@@ -68,7 +68,12 @@
             src_model="account.account"
             context="{'search_default_account_id': [active_id]}"
             />
-            
+		
+        <menuitem
+            action="action_analytic_default_list"
+            id="menu_analytic_default_list"
+            parent="account.menu_analytic_accounting"/>
+
 
         <act_window
             name="Analytic Rules"

From 9161b4c4c70ee3696770fb80d9fd06e15f823dbf Mon Sep 17 00:00:00 2001
From: "Vianney - www.akretion.com.br" <>
Date: Thu, 7 Oct 2010 15:05:32 +0530
Subject: [PATCH 4/4] [FIX] Account_analytic_default : Corrected salesman
 selection at invoice line creation

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

bzr revid: jvo@tinyerp.com-20101007093532-vacgy037cqlis1od
---
 addons/account_analytic_default/account_analytic_default.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index d0405e1ff52..dce86597a4c 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -111,8 +111,9 @@ class sale_order_line(osv.osv):
         sale_line = self.browse(cr, uid, ids[0], context)
         inv_line_obj = self.pool.get('account.invoice.line')
         anal_def_obj = self.pool.get('account.analytic.default')
+
         for line in inv_line_obj.browse(cr, uid, create_ids, context):
-            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
+            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, sale_line.order_id.user_id.id, time.strftime('%Y-%m-%d'), context)
 
             if rec:
                 inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)