LasLabs · lasley · Feb 1, 2017 · Jul 18, 2017 · Jul 27, 2017 · Jul 27, 2017
diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -10,8 +10,31 @@ records in Odoo.
 Many of the workflows were built in alignment with existing Odoo processes to allow for
 seamless operation with other record types.
 
-This project is moving towards organization and data models inspired by [HL7 FHIR v3](
-https://www.hl7.org/fhir/overview.html).
+# Licensing history
+The current project as it is today represents an evolution of the original work
+from from started from Luis Falcon. See https://sourceforge.net/projects/medical/files/Oldfiles/1.0.1,
+that later became GNU Health (see
+http://health.gnu.org/). The original code was licensed under GPL.
+
+On Nov 27, 2012 derivative code was published in https://github.com/OCA/vertical-medical,
+by Tech-Receptives Solutions Pvt. Ltd., licensed
+under AGPL.  The license change was unauthorized by the original
+author. See https://github.com/OCA/vertical-medical/commit/f0a664749edaea36f6749c34bfb04f1fc4cc9ea4
+
+On Feb 17, 2017 the branch 9.0 of the project was relicensed to GPL.
+https://github.com/OCA/vertical-medical/pull/166. Various prior contributors
+approved the relicense, but not all.
+
+On Jan 25, 2018, GNU Health claimed that the original code and attribution
+should be respected, and after further investigation the Odoo Community
+Association Board agreed to switch the license back to GPL v3 to respect the
+rights of the original author.
+
+Although no trace of relationship was found between the code at the date
+and the original code from 2012, through the commit history of the project one
+can see that the current status of the project is the end result of an
+evolutionary process. The Odoo Community Association Board concluded that
+the original license should be respected for ethical reasons.
 
 [//]: # (addons)
 This part will be replaced when running the oca-gen-addons-table script from OCA/maintainer-tools.

diff --git a/mail_thread_medical_prescription/README.rst b/mail_thread_medical_prescription/README.rst
@@ -1,6 +1,6 @@
-.. image:: https://img.shields.io/badge/license-LGPL--3-blue.svg
+.. image:: https://img.shields.io/badge/license-GPL--3-blue.svg
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
-    :alt: License: LGPL-3
+    :alt: License: GPL-3
 
 ===========================
 Medical Prescription Thread

diff --git a/mail_thread_medical_prescription/__init__.py b/mail_thread_medical_prescription/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from . import models
diff --git a/mail_thread_medical_prescription/__manifest__.py b/mail_thread_medical_prescription/__manifest__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 {
 
@@ -12,7 +12,7 @@
         'medical_prescription',
     ],
     'website': 'https://laslabs.com/',
-    'license': 'LGPL-3',
+    'license': 'GPL-3',
     'data': [
         'views/medical_prescription_order_view.xml',
         'views/medical_prescription_order_line_view.xml'

diff --git a/mail_thread_medical_prescription/models/__init__.py b/mail_thread_medical_prescription/models/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from . import medical_prescription_order
 from . import medical_prescription_order_line
diff --git a/mail_thread_medical_prescription/models/medical_prescription_order.py b/mail_thread_medical_prescription/models/medical_prescription_order.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from odoo import models
 

diff --git a/mail_thread_medical_prescription/models/medical_prescription_order_line.py b/mail_thread_medical_prescription/models/medical_prescription_order_line.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from odoo import models
 

diff --git a/mail_thread_medical_prescription/tests/__init__.py b/mail_thread_medical_prescription/tests/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from . import test_prescription_order
 from . import test_prescription_order_line
diff --git a/mail_thread_medical_prescription/tests/test_prescription_order.py b/mail_thread_medical_prescription/tests/test_prescription_order.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from odoo.tests.common import TransactionCase
 

diff --git a/mail_thread_medical_prescription/tests/test_prescription_order_line.py b/mail_thread_medical_prescription/tests/test_prescription_order_line.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from odoo.tests.common import TransactionCase
 

diff --git a/mail_thread_medical_prescription/views/medical_prescription_order_line_view.xml b/mail_thread_medical_prescription/views/medical_prescription_order_line_view.xml
@@ -2,7 +2,7 @@
 
 <!--
     Copyright 2016 LasLabs Inc.
-    License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 -->
 
 <odoo>

diff --git a/mail_thread_medical_prescription/views/medical_prescription_order_view.xml b/mail_thread_medical_prescription/views/medical_prescription_order_view.xml
@@ -2,7 +2,7 @@
 
 <!--
     Copyright 2016 LasLabs Inc.
-    License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 -->
 
 <odoo>

diff --git a/medical/README.rst b/medical/README.rst
@@ -1,6 +1,6 @@
-.. image:: https://img.shields.io/badge/license-LGPL--3-blue.svg
+.. image:: https://img.shields.io/badge/license-GPL--3-blue.svg
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
-    :alt: License: LGPL-3
+    :alt: License: GPL-3
 
 ============
 Odoo Medical
@@ -105,6 +105,33 @@ Contributors
 * Brett Wood <[email protected]>
 * Jordi Ballester Alomar <[email protected]>
 
+The current project as it is today represents an evolution of the original work
+started by Luis Falcon. See https://sourceforge.net/projects/medical/files/Oldfiles/1.0.1,
+that later became GNU Health (see
+http://health.gnu.org/). The original code was licensed under GPL.
+
+On Nov 27, 2012 derivative code was published in https://github.com/OCA/vertical-medical,
+by Tech-Receptives Solutions Pvt. Ltd., licensed
+under AGPL.  The license change was unauthorized by the original
+author. See https://github.com/OCA/vertical-medical/commit/f0a664749edaea36f6749c34bfb04f1fc4cc9ea4
+
+On Feb 17, 2017 the branch 9.0 of the project was relicensed to LGPL.
+https://github.com/OCA/vertical-medical/pull/166. Various prior contributors
+approved the relicense, but not all.
+
+On Jan 25, 2018, GNU Health claimed that the original code and attribution
+should be respected, and after further investigation the Odoo Community
+Association Board agreed to switch the license back to GPL v3 to respect the
+rights of the original author.
+
+Although no trace of relationship was found between the code at the date
+and the original code from 2012, through the commit history of the project one
+can see that the current status of the project is the end result of an
+evolutionary process. The Odoo Community Association Board concluded that
+the original license should be respected for ethical reasons.
+
+More information can be read here - https://odoo-community.org/blog/our-blog-1/post/vertical-medical-75.
+
 Maintainer
 ----------
 

diff --git a/medical/__init__.py b/medical/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from . import models
diff --git a/medical/__manifest__.py b/medical/__manifest__.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
-# Copyright 2004-2009 Tiny SPRL
-# Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# Copyright 2016-2018 LasLabs Inc.
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 {
     'name': 'Odoo Medical',
-    'version': '10.0.1.0.2',
+    'version': '10.0.1.0.4',
     'category': 'Medical',
     'depends': [
         'product',
+        'base_locale_uom_default'
     ],
     'author': 'LasLabs, Odoo Community Association (OCA)',
     'website': 'https://odoo-community.org/',
-    'license': 'LGPL-3',
+    'license': 'GPL-3',
     'data': [
         'security/medical_security.xml',
         'security/ir.model.access.csv',

diff --git a/medical/demo/medical_patient_demo.xml b/medical/demo/medical_patient_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
 <odoo>
 

diff --git a/medical/models/__init__.py b/medical/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from . import medical_abstract_entity
 from . import medical_patient

diff --git a/medical/models/medical_abstract_entity.py b/medical/models/medical_abstract_entity.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 import threading
 

diff --git a/medical/models/medical_patient.py b/medical/models/medical_patient.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+# Copyright 2008 Luis Falcon <[email protected]>
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from datetime import date, datetime
 from dateutil.relativedelta import relativedelta

diff --git a/medical/models/res_partner.py b/medical/models/res_partner.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+# Copyright 2008 Luis Falcon <[email protected]>
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from datetime import datetime
 

diff --git a/medical/static/src/js/medical.tour.js b/medical/static/src/js/medical.tour.js
@@ -1,5 +1,5 @@
 /* Copyright 2016 LasLabs Inc.
- * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */
+ * License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */
 
 odoo.define("medical.tour", function (require) {
     "use strict";

diff --git a/medical/templates/assets.xml b/medical/templates/assets.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
 <odoo>
 

diff --git a/medical/tests/__init__.py b/medical/tests/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from . import test_res_partner
 from . import test_medical_patient
diff --git a/medical/tests/test_medical_patient.py b/medical/tests/test_medical_patient.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2015 ACSONE SA/NV
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from datetime import date, datetime, timedelta
 from dateutil.relativedelta import relativedelta

diff --git a/medical/tests/test_res_partner.py b/medical/tests/test_res_partner.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 from odoo.tests.common import TransactionCase
 

diff --git a/medical/views/medical_abstract_entity.xml b/medical/views/medical_abstract_entity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+<!-- Copyright 2016-2018 LasLabs Inc.
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
 <odoo>
 
@@ -123,6 +123,7 @@
                                        attrs="{'invisible': [('is_company', '=', True)]}"
                                 />
                                 <field name="lang" />
+                                <field name="gender" attrs="{'invisible': [('is_company', '=', True)]}"/>
                             </group>
                         </group>
                         <group name="main_data">
@@ -385,9 +386,6 @@
                 <field name="partner_id" invisible="1" />
                 <filter string="Deactivated"
                         domain="[('active', '=', 0)]" />
-                <filter string="Tag"
-                        domain="[]"
-                        context="{'group_by':'category_id'}" />
                 <filter string="Parent"
                         domain="[]"
                         context="{'group_by':'parent_id'}" />

diff --git a/medical/views/medical_menu.xml b/medical/views/medical_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
 <odoo>
 

diff --git a/medical/views/medical_patient.xml b/medical/views/medical_patient.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
 <odoo>
 

diff --git a/medical/views/res_partner.xml b/medical/views/res_partner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
 <odoo>
 

diff --git a/medical_app_pharmacy/README.rst b/medical_app_pharmacy/README.rst
@@ -1,6 +1,6 @@
-.. image:: https://img.shields.io/badge/license-LGPL--3-blue.svg
+.. image:: https://img.shields.io/badge/license-GPL--3-blue.svg
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
-    :alt: License: LGPL-3
+    :alt: License: GPL-3
 
 =======================
 Medical Apps - Pharmacy

diff --git a/medical_app_pharmacy/__init__.py b/medical_app_pharmacy/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016-2017 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl)
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl)
diff --git a/medical_app_pharmacy/__manifest__.py b/medical_app_pharmacy/__manifest__.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016-2017 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl)
+# License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl)
 
 {
     'name': 'Medical Apps - Pharmacy',
     'version': '10.0.1.0.0',
     'author': 'LasLabs, Odoo Community Association (OCA)',
     'category': 'Medical',
     'website': 'https://laslabs.com',
-    'license': 'LGPL-3',
+    'license': 'GPL-3',
     'application': True,
     'installable': True,
     'depends': [

diff --git a/medical_app_pharmacy/static/src/js/medical_app_pharmacy.tour.js b/medical_app_pharmacy/static/src/js/medical_app_pharmacy.tour.js
@@ -1,5 +1,5 @@
 /* Copyright 2016-2017 LasLabs Inc.
- * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl) */
+ * License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl) */
 
 odoo.define('medical_app_pharmacy.tour', function (require) {
     'use strict';

diff --git a/medical_app_pharmacy/templates/assets.xml b/medical_app_pharmacy/templates/assets.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016-2017 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl) -->
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl) -->
 
 <odoo>
     <template id="assets_backend" inherit_id="web.assets_backend" name="Pharmacy App - Backend Assets">

diff --git a/medical_app_pharmacy/views/medical_app_pharmacy_menu.xml b/medical_app_pharmacy/views/medical_app_pharmacy_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016-2017 LasLabs Inc.
-     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl) -->
+     License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl) -->
 
 <odoo>
     <menuitem id="pharmacy_app_menu"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     <!--
         Copyright 2016 LasLabs Inc.
-        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+        License GPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
     -->
     <odoo>
@@ Expand Down @@