[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_invoice-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 09:00:24 +0000 (14:30 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 09:00:24 +0000 (14:30 +0530)
commita73f91f44afee4e4bf4fb8dd8a0ae8a367775cfe
treee6aa256465af22b4d30b6266170299836b3588ba
parenta68dfe914ec97488d2c59f4d904b9db2b1a647ce
parentefccfbc143bb26aa67c4097bea7c87b1e951b769
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_invoice-topbar-tpa

bzr revid: apa@tinyerp.com-20120430090024-w6voc0n9wovrytxy