Merge lp:~echeverrifm/oemedical/oemedical_gynecology_and_obstetrics into lp:oemedical

[Federico Manuel Echeverri Choux]

[IMP] Improve oemedical_gynecology_and_obstetrics module (Fix __openerp__.py file, remove comments or description of module, change dependences )
Improve Gynecology and obstetrics module [clean old code of models]

[Pedro Manuel Baeza (pedro.baeza)]

Seems OK for me, but please put a proper description on each module to know what it its functionality and features.

Regards.

review: Approve

[lp:~echeverrifm/oemedical/oemedical_gynecology_and_obstetrics]

126. By Federico Manuel Echeverri Choux on 2014-02-12

[IMP] Improve oemedical_gynecology_and_obstetrics [ Improve description of Gynecology and Obstetrics module ]

[Federico Manuel Echeverri Choux (echeverrifm)]

> Seems OK for me, but please put a proper description on each module to know
> what it its functionality and features.
>
> Regards.

Hello Pedro

I did it.

About OeMedical gynecology and obstetrics
-----------------------------------------

- Ginecology
    - Mestrual History
- Detection
    - Mammography History
- PAP / COLPO
    - PAP History
    - Colposcopy History
- Obstetrics
    - Pregnancy history

Regards

[lp:~echeverrifm/oemedical/oemedical_gynecology_and_obstetrics]

127. By Federico Manuel Echeverri Choux on 2014-02-13

[IMP] Improve oemedical_gynecology_and_obstetrics [ Improve inherit view of patient ]

[Federico Manuel Echeverri Choux (echeverrifm)]

Hello Pedro

I find a few problems
- inherit view of patient
- remove menu xml
- security

Could you tell me if it's ok.

Regards

[Pedro Manuel Baeza (pedro.baeza)]

On the revision you have pushed, there is only one change on the view. Rest of the explained things are not covered.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM thanks

review: Approve (code review, no tests)

=== modified file 'oemedical_gynecology_and_obstetrics/__init__.py'
--- oemedical_gynecology_and_obstetrics/__init__.py	2014-01-15 10:20:02 +0000
+++ oemedical_gynecology_and_obstetrics/__init__.py	2014-02-13 01:55:45 +0000
@@ -20,7 +20,7 @@
 #
 #/#############################################################################
 
-import models
+from . import models
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'oemedical_gynecology_and_obstetrics/__openerp__.py'
--- oemedical_gynecology_and_obstetrics/__openerp__.py	2014-01-15 10:20:02 +0000
+++ oemedical_gynecology_and_obstetrics/__openerp__.py	2014-02-13 01:55:45 +0000
@@ -34,58 +34,29 @@
 ##############################################################################
 {
 
-    'name': 'OeMedical : Free Health and Hospital Information System',
+    'name': 'OeMedical : gynecology and obstetrics',
     'version': '1.0',
     'author': "OeMEdical Team",
     'category': 'Generic Modules/Others',
-    'depends': ['base', 'sale', 'purchase', 'account', 'product'],
+    'depends': ['oemedical'],
     'application': True,
     'description': """
 
-About OeMedical
----------------
-
-OeMedical is a multi-user, highly scalable, centralized Electronic
-Medical Record (EMR) and Hospital Information System for openERP.
-
-OeMedical provides a free universal Health and Hospital Information System,
-so doctors and institutions all over the world,
-specially in developing countries will benefit from a centralized,
-high quality, secure and scalable system.
-
-OeMedical at a glance:
-
-    * Strong focus in family medicine and Primary Health Care
-    
-    * Major interest in Socio-economics (housing conditions, substance abuse,
-    education...)
-    
-    * Diseases and Medical procedures standards (like ICD-10 / ICD-10-PCS ...)
-    
-    * Patient Genetic and Hereditary risks : Over 4200 genes related to
-    diseases (NCBI / Genecards)
-    
-    * Epidemiological and other statistical reports
-    
-    * 100% paperless patient examination and history taking
-    
-    * Patient Administration 
-    (creation, evaluations / consultations, history ... )
-    
-    * Doctor Administration
-    
-    * Lab Administration
-    
-    * Medicine / Drugs information (vademécum)
-    
-    * Medical stock and supply chain management
-    
-    * Hospital Financial Administration
-    
-    * Designed with industry standards in mind
-    
-    * Open Source : Licensed under AGPL
-    
+About OeMedical gynecology and obstetrics
+-----------------------------------------
+
+- Ginecology
+    - Mestrual History
+- Detection
+    - Mammography History
+- PAP / COLPO
+    - PAP History
+    - Colposcopy History
+- Obstetrics
+    - Pregnancy history
+
+
+
 """,
     "website": "http://launchpad.net/oemedical",
     "licence": "AGPL v3",
@@ -106,6 +77,6 @@
     'qweb': [
     ],
     "active": False,
-    "installable": False,
+    "installable": True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'oemedical_gynecology_and_obstetrics/models/__init__.py'
--- oemedical_gynecology_and_obstetrics/models/__init__.py	2014-01-15 10:20:02 +0000
+++ oemedical_gynecology_and_obstetrics/models/__init__.py	2014-02-13 01:55:45 +0000
@@ -19,7 +19,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #/#############################################################################
-import oemedical_gynecology_and_obstetrics
+
+from . import oemedical_gynecology_and_obstetrics
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'oemedical_gynecology_and_obstetrics/models/oemedical_gynecology_and_obstetrics.py'
--- oemedical_gynecology_and_obstetrics/models/oemedical_gynecology_and_obstetrics.py	2014-01-15 10:20:02 +0000
+++ oemedical_gynecology_and_obstetrics/models/oemedical_gynecology_and_obstetrics.py	2014-02-13 01:55:45 +0000
@@ -68,7 +68,6 @@
                                 ], 'IUGR', sort=False),
                 }
 
-PatientPregnancy()
 
 class PrenatalEvaluation(orm.Model):
 
@@ -121,7 +120,6 @@
             'iugr' : fields.boolean('IUGR', help="Intra Uterine Growth Restriction"),
         }
 
-PrenatalEvaluation()
 
 
 
@@ -154,7 +152,6 @@
         'temperature' : fields.float('Temperature'),
             }
 
-PuerperiumMonitor()
 
 
 class PerinatalMonitor(orm.Model):
@@ -182,7 +179,7 @@
                 ('t', 'Footling Breech'),
                 ], 'Fetus Position', select=True),
             }
-PerinatalMonitor()
+
 
 
 class OemedicalPerinatal(orm.Model):
@@ -246,7 +243,7 @@
             'mother_deceased' : fields.boolean('Deceased', help="Mother died in the process"),
             'notes' : fields.text('Notes'),
             }
-OemedicalPerinatal()
+
 
 
 class OeMedicalPatient(orm.Model):
@@ -291,7 +288,7 @@
             }
 
 
-OeMedicalPatient()
+
 
 
 class PatientMenstrualHistory(orm.Model):
@@ -320,7 +317,7 @@
 
             }
 
-PatientMenstrualHistory()
+
 
 
 class PatientMammographyHistory(orm.Model):
@@ -339,7 +336,7 @@
             'comments' : fields.char('Remarks'),
             }
 
-PatientMammographyHistory()
+
 
 
 class PatientPAPHistory(orm.Model):
@@ -362,7 +359,7 @@
                             ], 'result', help="Please check the lab results if the module is installed"),
             'comments' : fields.char('Remarks'),
             }
-PatientPAPHistory()
+
 
 
 class PatientColposcopyHistory(orm.Model):
@@ -381,7 +378,7 @@
             'comments' : fields.char('Remarks'),
             }
 
-PatientColposcopyHistory()
+
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'oemedical_gynecology_and_obstetrics/views/oemedical_gynecology_and_obstetrics_view.xml'
--- oemedical_gynecology_and_obstetrics/views/oemedical_gynecology_and_obstetrics_view.xml	2014-01-15 10:20:02 +0000
+++ oemedical_gynecology_and_obstetrics/views/oemedical_gynecology_and_obstetrics_view.xml	2014-02-13 01:55:45 +0000
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//notebook/page[@string='Misc']" position="before">
+                    <xpath expr="//notebook/page[@string='General Information']" position="after">
                         <page string="Gyneco / Obs" attrs="{'invisible':[('sex','=', 'm')]}" >
                             <notebook>
                                 <page string="Gyneco" >