From a993412a9afe61e602ebae2cf82d17f39a12dce0 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 2 Nov 2010 12:34:53 +0530
Subject: [PATCH 1/3] [IMP] hr_holidays: Reporting/Dashboard/Human Resources
 Dashboard put a column allocated leaves instead of remaining leaves and
 change the string

bzr revid: vth@tinyerp.com-20101102070453-qkfg0x7vhvl43rt7
---
 addons/hr_holidays/report/available_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index d590af5a430..60f47fb656a 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -34,8 +34,8 @@
             <field name="arch" type="xml">
                 <graph string="Available Holidays" type="bar">
                     <field name="holiday_status_id"/>
-                    <field name="taken_leaves" string="Leave Days" operator="+"/>
-                    <field name="max_leave" string="Allocated Days" operator="+"/>
+                    <field name="taken_leaves" string="Taken Leaves" operator="+"/>
+                    <field name="max_leave" string="Allocated Leaves" operator="+"/>
                 </graph>
             </field>
         </record>

From d366367ff2a62c6684f43d883f7e3432c2fc5dcc Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 2 Nov 2010 16:25:42 +0530
Subject: [PATCH 2/3] [FIX] Account: account move line create method

bzr revid: mra@mra-laptop-20101102105542-041r1uivh0u60958
---
 addons/account/account_move_line.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index efa6c5be341..62cfa7cbd6f 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1101,9 +1101,10 @@ class account_move_line(osv.osv):
         journal_obj = self.pool.get('account.journal')
         if context is None:
             context = {}
-        company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
-        if company_id:
-            vals['company_id'] = company_id[0]
+        if vals.get('move_id', False):
+            company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
+            if company_id:
+                vals['company_id'] = company_id[0]
         self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))

From fa454743f4b398b79cc450019aa8ac96ab1e0048 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 2 Nov 2010 16:41:12 +0530
Subject: [PATCH 3/3] [REF]

bzr revid: mra@mra-laptop-20101102111112-5ik1xz0m6mw96saa
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index c780951d07e..04cdc7231e5 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 import time
-import netsvc
-
-from osv import fields, osv
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
+from osv import fields, osv
 from tools.translate import _
+import netsvc
 
 class one2many_mod2(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):