[MERGE] merged from trunk-dev-addons2

bzr revid: hmo@tinyerp.com-20100927140436-ywejvgzc4kfchzwf
This commit is contained in:
Harry (OpenERP)
2010-09-27 19:34:36 +05:30
29 changed files with 106 additions and 149 deletions
@@ -19,8 +19,7 @@
#
##############################################################################
import time
from datetime import date, datetime, timedelta
from datetime import datetime
from tools.translate import _
from osv import fields, osv
from resource.faces import task as Task