projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 886c827 a2536d5)
[UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622
authorYannick Vaucher <yannick.vaucher@camptocamp.com>
Mon, 28 Apr 2014 14:20:17 +0000 (16:20 +0200)
committerYannick Vaucher <yannick.vaucher@camptocamp.com>
Mon, 28 Apr 2014 14:20:17 +0000 (16:20 +0200)
commit22d1c0956ffab1ef190cd67daed75cf8ff12963c
tree4d82933e6a6b10a1c4e7efcc97a18b75c876e162tree | snapshot
parent886c82745873f77eef21a8158fb601086f168891commit | diff
parenta2536d5e3271160d9d67d49268b0d4f7960588bfcommit | diff
[UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622

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

bzr revid: yannick.vaucher@camptocamp.com-20140428142017-3warx1ai72cfetj1
addons/hr_timesheet_sheet/hr_timesheet_sheet.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.