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

[Federico Manuel Echeverri Choux]

[IMP] Improve oemedical laboratory module (Fix some problems to install, modify menu sequence and remove comments of this module )

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Please set a description in __openerp__.py

l.71 does it still has errors ?

review: Needs Fixing (code review)

[lp:~echeverrifm/oemedical/oemedical_lab]

125. By Federico Manuel Echeverri Choux on 2014-04-29

[IMP] Add description of oemedical_lab module

126. By Federico Manuel Echeverri Choux on 2014-04-29

[IMP] oemedical_lab module [ remove some comment ]

[Federico Manuel Echeverri Choux (echeverrifm)]

> Please set a description in __openerp__.py
>
> l.71 does it still has errors ?

Hello, Sorry for the delay

I did this corrections

Regards

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

This sentence seams wrong.
l.64 Manager the request, creation and evaluation of laboratory analyses.

Wouldn't this be better? :

Manage request, creation and evaluation of laboratory analysis.

review: Needs Fixing (english)

[lp:~echeverrifm/oemedical/oemedical_lab]

127. By Federico Manuel Echeverri Choux on 2014-05-21

[IMP] Improve description of oemedical_lab module

[Federico Manuel Echeverri Choux (echeverrifm)]

>
> This sentence seams wrong.
> l.64 Manager the request, creation and evaluation of laboratory analyses.
>
> Wouldn't this be better? :
>
> Manage request, creation and evaluation of laboratory analysis.

Hello, Yannick

It's better and done

Regards

[Pedro Manuel Baeza (pedro.baeza)]

LGTM.

Regards.

review: Approve (code review)

[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

127. By Federico Manuel Echeverri Choux on 2014-05-21

[IMP] Improve description of oemedical_lab module

126. By Federico Manuel Echeverri Choux on 2014-04-29

[IMP] oemedical_lab module [ remove some comment ]

125. By Federico Manuel Echeverri Choux on 2014-04-29

[IMP] Add description of oemedical_lab module

124. By Federico Manuel Echeverri Choux on 2014-02-10

[IMP] Improve oemedical laboratory module (Fix some problems to install, modify menu sequence and remove comments of this module )

=== modified file 'oemedical_lab/__openerp__.py'
--- oemedical_lab/__openerp__.py	2014-01-15 10:20:02 +0000
+++ oemedical_lab/__openerp__.py	2014-05-21 20:09:22 +0000
@@ -34,78 +34,35 @@
 ##############################################################################
 {
 
-    'name': 'OeMedical : Free Health and Hospital Information System',
+    'name': 'OeMedical : Laboratory Module',
     'version': '1.0',
     'author': "OeMEdical Team",
     'category': 'Generic Modules/Others',
-    'depends': ['oemedical_emr'],
+    '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 for laboratory
+------------------------------
+
+Manage request, creation and evaluation of laboratory analysis. 
+
     
 """,
     "website": "http://launchpad.net/oemedical",
     "licence": "AGPL v3",
     "data": [
-        #'views/oemedical_lab_view.xml',  # view has errors, please correct before enabling....
+        'views/oemedical_menu.xml',
+        'views/oemedical_lab_view.xml',  
         #'views/oemedical_lab_report.xml',  # not checked yet....
         'security/oemedical_security.xml',
         'security/ir.model.access.csv',
-        'oemedical_menu.xml',
     ],
     "demo": [
 
     ],
     'test':[
-            'test/physician.yml',
-            'test/patient.yml',
-            'test/partners.yml',
-            'test/insurance_plan.yml',
-            'test/insurance.yml',
-            'test/physician_speciality.yml'
+
     ],
     'css': [
 
@@ -117,6 +74,6 @@
 
     ],
     "active": False,
-    "installable": False,
+    "installable": True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'oemedical_lab/security/ir.model.access.csv'
--- oemedical_lab/security/ir.model.access.csv	2014-01-15 10:20:02 +0000
+++ oemedical_lab/security/ir.model.access.csv	2014-05-21 20:09:22 +0000
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_oemedical_lab_group,model,model_oemedical_lab_group,group_oemedical_lab_user,1,1,1,0
+access_oemedical_lab,model,model_oemedical_lab,group_oemedical_lab_user,1,1,1,0

=== modified file 'oemedical_lab/views/oemedical_menu.xml'
--- oemedical_lab/views/oemedical_menu.xml	2014-01-15 10:20:02 +0000
+++ oemedical_lab/views/oemedical_menu.xml	2014-05-21 20:09:22 +0000
@@ -1,211 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
 	<data>
-		<menuitem id="oemedical_root" name="OeMedical" sequence="10" />
-
-
-<!--Menu Patient-->
-
-		<menuitem id="oemedical_patient_root" name="Patient" parent="oemedical_root"
-			sequence="10" />
-		<menuitem id="oemedical_patient" name=" Patient"
-			parent="oemedical_patient_root" sequence="10"
-			action="act_open_oemedical_patient_view" />
-
-		<menuitem id="oemedical_family" name=" Family" parent="oemedical_patient_root"
-			sequence="20" action="act_open_oemedical_family_view" />
-
-		<menuitem id="oemedical_family_member" name=" Family Member"
-			parent="oemedical_patient_root" sequence="30"
-			action="act_open_oemedical_family_member_view" />
-
-
-<!--Appointment-->
-
-		<menuitem id="oemedical_appoitment_root" name="Appoitment"
-			parent="oemedical_root" sequence="20" />
-
-		<menuitem id="oemedical_appointment" name=" Appointment"
-			parent="oemedical_appoitment_root" sequence="10"
-			action="act_open_oemedical_appointment_view" />
-
-<!--Prescriptions-->
-
-		<menuitem id="oemedical_prescription_root" name="Prescription"
-			parent="oemedical_root" sequence="30" />
-
-		<menuitem id="oemedical_prescription_order" name="Prescription Order"
-			parent="oemedical_prescription_root" sequence="10"
-			action="act_open_oemedical_prescription_order_view" />
 
 <!--       Laboratory    -->
 		<menuitem name="Laboratory" id="oemedical_laboratory_menu" 
-            parent="oemedical_root" sequence="4"/>
-
-
-<!--Configurations-->
-
-		<menuitem id="oemedical_root_sub" name="Configuration"
-			parent="oemedical_root" sequence="100" />
-
-<!--       Laboratory       -->
+            parent="oemedical.oemedical_root" sequence="90"/>
+
+
+
+<!--       Laboratory  Config      -->
 		<menuitem name="Laboratory" id="oemedical_conf_laboratory" 
-            parent="oemedical_root_sub" sequence="3"/>
-
-
-<!-- Diseases -->
-
-		<menuitem id="oemedical_root_disease" name="Disease"
-			parent="oemedical_root_sub" sequence="10" />
-
-<!--  Menu of Pathology-->
-
-		<menuitem id="oemedical_pathology_category" name=" Pathology Category"	
-            parent="oemedical_root_disease" sequence="10"	
-            action="act_open_oemedical_pathology_category_view" />
-
-		<menuitem id="oemedical_pathology" name=" Pathology" 
-            parent="oemedical_root_disease"   sequence="30" 
-            action="act_open_oemedical_pathology_view" />
-
-		<menuitem id="oemedical_pathology_group" name=" Pathology Group" 
-            parent="oemedical_root_disease" sequence="20"
-            action="act_open_oemedical_pathology_group_view" />
-
-		<menuitem id="oemedical_root_disease_cat" name="Categories"
-			parent="oemedical_root_disease" sequence="100" />
-
-		<menuitem id="oemedical_disease_group_members" name=" Disease Group"
-			parent="oemedical_root_disease_cat" sequence="10"
-			action="act_open_oemedical_disease_group_members_view" />
-
-<!-- Misc -->
-
-		<menuitem id="oemedical_root_misc" name="Misc"
-			parent="oemedical_root_sub" sequence="200" />
-
-<!-- Occupation  ( Config/misc/Occupation) )--> 
-
-		<menuitem id="oemedical_occupation" name=" Occupation"
-			parent="oemedical_root_misc" sequence="20"
-			action="act_open_oemedical_occupation_view" />
-
-<!-- Medical Specialty  ( Config/misc/specialty) )--> 
-
-		<menuitem id="oemedical_specialty" name=" Medical Specialty"
-            parent="oemedical_root_misc" sequence="10" 
-            action="act_open_oemedical_specialty_view" />
-
-<!-- Ethnicity  ( Config/misc/Ethnicity) )--> 
-
-		<menuitem id="oemedical_ethnicity" name="Ethnicity" parent="oemedical_root_misc"
-			sequence="10" action="act_open_oemedical_ethnicity_view" />
-
-
-
-
-
-
-<!--Medicaments-->
-
-		<menuitem id="oemedical_medicament_root" name="Medicaments"
-			parent="oemedical_root_sub" sequence="50" />
-
-
-		<menuitem id="oemedical_medicament" name="Medicaments"
-			parent="oemedical_medicament_root" sequence="10"
-			action="act_open_oemedical_medicament_view" />
-
-		<menuitem id="oemedical_medication_template" name=" Medication Template"
-			parent="oemedical_medicament_root" sequence="20"
-			action="act_open_oemedical_medication_template_view" />
-
-		<menuitem id="oemedical_medication_frequencies" name="Medication Frequencies"
-			parent="oemedical_medicament_root" sequence="30"
-			action="act_open_oemedical_medication_dosage_view" />
-
-		<menuitem id="oemedical_drug_route" name=" Drug Admin Route"
-			parent="oemedical_medicament_root" sequence="80"
-			action="act_open_oemedical_drug_route_view" />
-
-		<menuitem id="oemedical_drug_form" name=" Drug Form"
-            parent="oemedical_medicament_root" sequence="90"
-            action="act_open_oemedical_drug_form_view" />
-
-
-		<menuitem id="oemedical_medicament_category" name=" Medicament Category"
-			parent="oemedical_medicament_root" sequence="100"
-			action="act_open_oemedical_medicament_category_view" />
-
-<!--Hospital Centers-->
-
-		<menuitem id="oemedical_health_center_root" name="Health Center"
-			parent="oemedical_root_sub" sequence="10" />
-
-		<menuitem id="oemedical_hospital_building" name=" Hospital Building"
-			parent="oemedical_health_center_root" sequence="10"
-			action="act_open_oemedical_hospital_building_view" />
-
-		<menuitem id="oemedical_hospital_unit" name=" Hospital Unit"
-			parent="oemedical_health_center_root" sequence="20"
-			action="act_open_oemedical_hospital_unit_view" />
-
-		<menuitem id="oemedical_hospital_ward" name=" Hospital Ward"
-			parent="oemedical_health_center_root" sequence="30"
-			action="act_open_oemedical_hospital_ward_view" />
-
-		<menuitem id="oemedical_hospital_or" name=" Hospital Or"
-			parent="oemedical_health_center_root" sequence="40"
-			action="act_open_oemedical_hospital_or_view" />
-		
-		<menuitem id="oemedical_hospital_bed" name=" Hospital Bed"
-			parent="oemedical_health_center_root" sequence="50"
-			action="act_open_oemedical_hospital_bed_view" />
-
-		<menuitem id="oemedical_operational_area" name=" Operational Area"
-			parent="oemedical_health_center_root" sequence="60"
-			action="act_open_oemedical_operational_area_view" />
-
-		<menuitem id="oemedical_operational_sector" name=" Operational Sector"
-			parent="oemedical_health_center_root" sequence="70"
-			action="act_open_oemedical_operational_sector_view" />
-
-
-<!--    Physician Conf    -->
-
-        <menuitem name="Health Professionals" id="oemedical_conf_physicians"
-            parent="oemedical_root_sub" sequence="20" />
-
-		<menuitem id="oemedical_physician" name=" Physician" parent="oemedical_conf_physicians"
-			sequence="10" action="act_open_oemedical_physician_view" />
-
-
-<!--    Insurance     -->
-
-        <menuitem name="Insurances" id="oemedical_conf_insurances"
-            parent="oemedical_root_misc" sequence="20" />
-
-		<menuitem id="oemedical_insurance" name=" Insurance" 
-            parent="oemedical_conf_insurances"	sequence="10" 
-            action="act_open_oemedical_insurance_view" />
-
-		<menuitem id="oemedical_insurance_plan" name=" Insurance Plan"
-			parent="oemedical_conf_insurances" sequence="20"
-			action="act_open_oemedical_insurance_plan_view" />
-
-
-
-
-		<menuitem id="oemedical_diagnostic_hypothesis" name=" Diagnostic Hypothesis"
-			parent="oemedical_root_sub" sequence="10"
-			action="act_open_oemedical_diagnostic_hypothesis_view" />
-		<menuitem id="oemedical_predure" name=" Procedure" parent="oemedical_root_sub"
-			sequence="10" action="act_open_oemedical_procedure_view" />
-
-		<menuitem id="oemedical_vaccination" name=" Vaccination"
-			parent="oemedical_root_sub" sequence="10"
-			action="act_open_oemedical_vaccination_view" />
-
+            parent="oemedical.oemedical_root_sub" sequence="150"/>
 
 	</data>
 </openerp>