openerp-community-reviewer team mailing list archive

[jeffery chen fan <jeffery9@xxxxxxxxx>]

jeffery chen fan has proposed merging lp:~jeffery9/oemedical/oemedical into lp:oemedical.

Requested reviews:
  OEmedical Commiter (oemedical-commiter)

For more details, see:
https://code.launchpad.net/~jeffery9/oemedical/oemedical/+merge/194051

fix xml data loading order and wrong import
-- 
https://code.launchpad.net/~jeffery9/oemedical/oemedical/+merge/194051
Your team OEmedical Commiter is requested to review the proposed merge of lp:~jeffery9/oemedical/oemedical into lp:oemedical.

=== modified file 'oemedical/__openerp__.py'
--- oemedical/__openerp__.py	2013-09-23 18:29:30 +0000
+++ oemedical/__openerp__.py	2013-11-06 02:46:12 +0000
@@ -139,9 +139,9 @@
         'oemedical_genetics/oemedical_disease_gene_view.xml',
         'oemedical_genetics/data/disease_genes.xml',
         'oemedical_socioeconomics/oemedical_socioeconomics_view.xml',
-        'oemedical_lab/oemedical_lab_view.xml',
         'security/ir.model.access.csv',
         'oemedical_menu.xml',
+        'oemedical_lab/oemedical_lab_view.xml',
     ],
     "demo": [
 

=== modified file 'oemedical/oemedical_lab/oemedical_lab.py'
--- oemedical/oemedical_lab/oemedical_lab.py	2013-09-23 18:55:14 +0000
+++ oemedical/oemedical_lab/oemedical_lab.py	2013-11-06 02:46:12 +0000
@@ -17,7 +17,7 @@
 
 
 import time
-from mx import DateTime
+#from mx import DateTime
 import datetime
 from osv import fields, osv
 from tools.translate import _