Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: ssi@tinyerp.com-20101115091100-wi1sp13as3d05g2t

diff --cc addons/caldav/caldav_view.xml
Simple merge

diff --cc addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 6d022a3,6d022a3..a9c1cb1
--- 1/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
--- 2/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@@ -87,6 -87,6 +87,7 @@@ class account_analytic_line(osv.osv)
      _columns = {
          'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
          'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
++        
      }
  
      def unlink(self, cursor, user, ids, context=None):