[MERGE] merge from trunk addons3

bzr revid: pso@tinyerp.com-20101118132021-3a3x203cx3qns3of
2010-11-18 18:50:21 +05:30
parent 3e5ee057bf 50266a0007
commit d9a5bb7365
2 changed files with 3 additions and 4 deletions
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,10 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import event
+import event_project
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>