Merge lp:~jeffery9/oemedical/oemedical into lp:oemedical

[jeffery chen fan]

fix xml data loading order and wrong import

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Jeffery, thank you very much for the MP.

Please remove import line instead commenting it, to keep the code clean.

BTW, the rest seems OK.

Regards.

review: Needs Fixing

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Same as Pedro, please remove the import line.

Otherwise as we talk about import you could also improve

from osv import fields, osv

by repacing it with

from openerp.osv import fields, osv

review: Needs Fixing (code review, no tests)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I set this one WIP as there was no activity from author

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Hello,

The management of the project has moved to Github: https://github.com/OCA/vertical-medical

Please migrate your merge proposal to Github. You may want to check https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub for an explanation on how to proceed.

Thanks for contributing to the project

review: Needs Resubmitting

Unmerged revisions

109. By jeffery chen fan on 2013-11-05

wrong import mx module

108. By jeffery chen fan on 2013-11-05

change the xml loading order
for lab depends on the oemedical_menu.xml

=== 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 _