openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-diagnostic-object-view-move-file-ysa into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-diagnostic-object-view-move-file-ysa/+merge/60459

[IMP] training_diagnostic :- remove object and view directory and move py and xml file in module directory. 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-diagnostic-object-view-move-file-ysa/+merge/60459
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-diagnostic-object-view-move-file-ysa.

=== modified file 'training_diagnostic/__init__.py'
--- training_diagnostic/__init__.py	2010-06-04 13:23:49 +0000
+++ training_diagnostic/__init__.py	2011-05-10 06:23:23 +0000
@@ -1,3 +1,4 @@
 
-import object
+import training_diagnostic
+import training
 import report

=== modified file 'training_diagnostic/__openerp__.py'
--- training_diagnostic/__openerp__.py	2011-05-04 07:09:13 +0000
+++ training_diagnostic/__openerp__.py	2011-05-10 06:23:23 +0000
@@ -38,9 +38,9 @@
     'demo_xml' : [
     ],
     'update_xml' : [
-        'view/training_diagnostic_view.xml',
-        'view/training_exam.xml',
-        'view/training.xml',
+        'training_diagnostic_view.xml',
+        'training_exam.xml',
+        'training.xml',
         'data/training.xml',
         'data/report.xml',
         'security/ir.model.access.csv',

=== removed directory 'training_diagnostic/object'
=== removed file 'training_diagnostic/object/__init__.py'
--- training_diagnostic/object/__init__.py	2011-03-23 11:41:59 +0000
+++ training_diagnostic/object/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-import training_diagnostic
-import training
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'training_diagnostic/object/training.py' => 'training_diagnostic/training.py'
=== renamed file 'training_diagnostic/view/training.xml' => 'training_diagnostic/training.xml'
=== renamed file 'training_diagnostic/object/training_diagnostic.py' => 'training_diagnostic/training_diagnostic.py'
=== renamed file 'training_diagnostic/view/training_diagnostic_view.xml' => 'training_diagnostic/training_diagnostic_view.xml'
=== renamed file 'training_diagnostic/view/training_exam.xml' => 'training_diagnostic/training_exam.xml'
=== removed directory 'training_diagnostic/view'