From 713b3de5b9885c96e1b1563d2e72bcea9ddf8a35 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 5 Dec 2008 01:18:08 +0100
Subject: [PATCH] modifs

bzr revid: fp@tinyerp.com-20081205001808-rpu4csh3zvl3qb3x
---
 addons/account/account.py                                    | 2 +-
 addons/event_project/event.py                                | 2 +-
 .../wizard/hr_timesheet_invoice_create.py                    | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 8f1329cc30e..1b618d24cc4 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1369,7 +1369,7 @@ class account_tax(osv.osv):
             r['amount'] *= quantity
         return res
 
-    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
+    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None,tax_parent_tot=0.0):
         taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
 
         res = []
diff --git a/addons/event_project/event.py b/addons/event_project/event.py
index 477f05f61ea..2a4733db73f 100644
--- a/addons/event_project/event.py
+++ b/addons/event_project/event.py
@@ -51,7 +51,7 @@ class event(osv.osv):
     def write(self, cr, uid, ids,vals, *args, **kwargs):
         if 'date_begin' in vals and vals['date_begin']:
             for eve in self.browse(cr, uid, ids):
-                    self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin})
+                    self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin[:10]})
 
         return super(event,self).write(cr, uid, ids,vals, *args, **kwargs)
 
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 98a441e3d61..8125ce3f2fe 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -134,7 +134,10 @@ class invoice_create(wizard.interface):
                     if data['form']['date']:
                         details.append(line['date'])
                     if data['form']['time']:
-                        details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
+                        if line['product_uom_id']:
+                            details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
+                        else:
+                            details.append("%s" % (line['unit_amount'], ))
                     if data['form']['name']:
                         details.append(line['name'])
                     #if data['form']['price']: