[IMP] Fix and improve for v10

* Add some additional error handling
* Update attributes and values for v10
* Add validation skip on create/write for partner IDs
* Add rx dispense force to circumvent over-dispenses in CP, which are allowed
* Remove all alpha characters in rx line dose units to fix SD-1979
* Fix unit handling
* Fix missing orders in dispenses by adding a relation in the order line for lookups
* Handle undocumented order state (0)
* Fix account lookup
* Hard code day category to match with pre-existing codes
* Add active toggle button to carepoint.backend view
* Add change/write date/users
* Fix adapter search return in multi-pk instances
* Add NDC concept to carepoint item
* Add NDC inference on rx export
* Add import NDC by control code

connector_carepoint/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import models

connector_carepoint/__manifest__.py

@@ -1,37 +1,38 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': 'CarePoint Connector',
-    'description': 'Two-Way Sync With CarePoint',
-    'version': '10.0.1.0.0',
-    'category': 'Connector',
-    'author': "LasLabs",
-    'license': 'AGPL-3',
-    'website': 'https://laslabs.com',
-    'depends': [
-        'connector',
-        'first_databank',
-        'medical_physician_us',
-        'delivery',
-        'l10n_multilang',
-        'l10n_us',
+    "name": "CarePoint Connector",
+    "description": "Two-Way Sync With CarePoint",
+    "version": "10.0.1.0.0",
+    "category": "Connector",
+    "author": "LasLabs",
+    "license": "AGPL-3",
+    "website": "https://laslabs.com",
+    "depends": [
+        "connector",
+        "first_databank",
+        "medical_physician_us",
+        "medical_patient_us",
+        "delivery",
+        "l10n_multilang",
+        "l10n_us",
     ],
     "external_dependencies": {
         "python": [
-            'carepoint',
+            "carepoint",
         ],
     },
-    'data': [
-        'views/carepoint_backend_view.xml',
-        'views/connector_menu.xml',
-        'data/medical_drug_form_data.xml',
-        'data/carepoint_state_data.xml',
-        'data/carepoint_carepoint_account_data.xml',
-        'data/ir_cron_data.xml',
-        'security/ir.model.access.csv',
+    "data": [
+        "views/carepoint_backend_view.xml",
+        "views/connector_menu.xml",
+        "data/medical_drug_form_data.xml",
+        "data/carepoint_state_data.xml",
+        "data/carepoint_carepoint_account_data.xml",
+        "data/ir_cron_data.xml",
+        "security/ir.model.access.csv",
     ],
-    'installable': True,
-    'application': False,
+    "installable": True,
+    "application": False,
 }

connector_carepoint/backend.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import odoo.addons.connector.backend as backend

connector_carepoint/connector.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import models, fields, api

connector_carepoint/consumer.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.addons.connector.connector import Binder

connector_carepoint/data/carepoint_state_data.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
+
+    <record model="carepoint.state" id="state_0">
+            <field name="name">New</field>
+            <field name="code">0</field>
+            <field name="order_state">draft</field>
+            <field name="invoice_state">draft</field>
+            <field name="prescription_state">draft</field>
+        </record>
+
         <record model="carepoint.state" id="state_10">
             <field name="name">Entered</field>
             <field name="code">10</field>

connector_carepoint/data/medical_units.txt

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 #

connector_carepoint/models/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 # Backend

connector_carepoint/models/account_invoice_line.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging

connector_carepoint/models/address.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging

connector_carepoint/models/address_abstract.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging

connector_carepoint/models/address_organization.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging

connector_carepoint/models/address_patient.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging

connector_carepoint/models/address_physician.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging

connector_carepoint/models/address_store.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging

connector_carepoint/models/carepoint_account.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging
@@ -89,6 +89,27 @@ def create(self, data):
         data['ID'] = self.carepoint.get_next_sequence('acct_id')
         return super(CarepointAccountAdapter, self).create(data)
 
+    def read(self, _id, attributes=None, return_all=False):
+        """ Gets record by id and returns the object
+        :param _id: Id of record to get from Db. Can be comma sep str
+            for multiple indexes
+        :type _id: mixed
+        :param attributes: Attributes to rcv from db. None for *
+        :type attributes: list or None
+        :rtype: :class:`sqlalchemy.engine.ResultProxy`
+        """
+        if ',' in str(_id):
+            return super(CarepointAccountAdapter, self).read(
+                _id, attributes, return_all,
+            )
+        model_obj = self._get_cp_model()
+        domain = {'ID': _id}
+        res = self.carepoint.search(model_obj, domain, attributes)
+        try:
+            return res if return_all else res[0]
+        except IndexError:
+            return None
+
 
 @carepoint
 class CarepointAccountUnit(ConnectorUnit):
@@ -99,6 +120,7 @@ def _import_accounts(self, patient_id):
         importer = self.unit_for(CarepointAccountImporter)
         accounts = adapter.search(pat_id=patient_id)
         for account in accounts:
+            _logger.debug('ACCOUNT %s', account)
             importer.run(account)
 
 

connector_carepoint/models/carepoint_backend.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging
@@ -173,6 +173,10 @@ class CarepointBackend(models.Model):
         comodel_name='account.payment.term',
         required=True,
     )
+    can_export = fields.Boolean(
+        default=True,
+        help='Uncheck this to disable data exporting for this backend.',
+    )
     import_items_from_date = fields.Datetime()
     import_patients_from_date = fields.Datetime()
     import_physicians_from_date = fields.Datetime()
@@ -182,6 +186,16 @@ class CarepointBackend(models.Model):
     import_phones_from_date = fields.Datetime()
     import_pickings_from_date = fields.Datetime()
     import_invoices_from_date = fields.Datetime()
+    import_fdb_ndc_control_code = fields.Selection([
+        ('0', 'Not Controlled'),
+        ('1', 'C1'),
+        ('2', 'C2'),
+        ('3', 'C3'),
+        ('4', 'C4'),
+        ('5', 'C5'),
+    ],
+        help='Federal drug scheduling code for medicament.',
+    )
     company_id = fields.Many2one(
         string='Company',
         comodel_name='res.company',
@@ -272,8 +286,6 @@ def _import_from_date(self, model, from_date_field,
                 filters[chg_date_field]['>='] = fields.Datetime.from_string(
                     from_date
                 )
-            else:
-                from_date = None
             import_batch.delay(session, model, backend.id, filters=filters)
         # Records from Carepoint are imported based on their `add_date`
         # date.  This date is set on Carepoint at the beginning of a
@@ -288,6 +300,21 @@ def _import_from_date(self, model, from_date_field,
         next_time = fields.Datetime.to_string(next_time)
         self.write({from_date_field: next_time})
 
+    @api.multi
+    def import_fdb_ndc_by_control_code(self):
+        """ It triggers an import of FDB NDCs by DEA code. """
+        session = self.__get_model_session()
+        for backend in self:
+            backend.check_carepoint_structure()
+            import_batch.delay(
+                session,
+                'carepoint.fdb.ndc',
+                backend.id,
+                filters={
+                    'dea': int(backend.import_fdb_ndc_control_code),
+                },
+            )
+
     @api.model
     def resync_all(self, binding_model):
         """ Resync all bindings for model """

connector_carepoint/models/carepoint_item.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging
@@ -30,6 +30,11 @@ class CarepointItem(models.Model):
         ondelete='cascade',
         required=True,
     )
+    ndc_id = fields.Many2one(
+        string='NDC',
+        comodel_name='fdb.ndc',
+        required=True,
+    )
     warehouse_id = fields.Many2one(
         string='Warehouse',
         comodel_name='stock.warehouse',
@@ -124,16 +129,26 @@ def warehouse_id(self, record):
     def carepoint_id(self, record):
         return {'carepoint_id': record['item_id']}
 
+    @mapping
+    @only_create
+    def ndc_id(self, record):
+        self._get_ndc(record)
+        return {'ndc_id': ndc_id.id}
+
     @mapping
     @only_create
     def odoo_id(self, record):
         """ It binds on a medicament of an existing NDC """
-        ndc_id = self.env['fdb.ndc'].search(
+        ndc = self._get_ndc(record)
+        if ndc:
+            return {'odoo_id': ndc.medicament_id.id}
+
+    def _get_ndc(self, record):
+        """ It returns the FDB NDC for the record. """
+        return self.env['fdb.ndc'].search(
             [('name', '=', record['NDC'].strip())],
             limit=1,
         )
-        if len(ndc_id):
-            return {'odoo_id': ndc_id[0].medicament_id.id}
 
 
 @carepoint

connector_carepoint/models/carepoint_organization.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import logging
@@ -11,6 +11,7 @@
 from ..unit.backend_adapter import CarepointCRUDAdapter
 from ..unit.mapper import (PartnerImportMapper,
                            ExportMapper,
+                           CommonDateImporterMixer,
                            trim,
                            )
 from ..backend import carepoint
@@ -69,7 +70,8 @@ class CarepointOrganizationAdapter(CarepointCRUDAdapter):
 
 
 @carepoint
-class CarepointOrganizationBatchImporter(DelayedBatchImporter):
+class CarepointOrganizationBatchImporter(DelayedBatchImporter,
+                                         CommonDateImporterMixer):
     """ Import the Carepoint Organizations.
     For every organization in the list, a delayed job is created.
     """
@@ -109,7 +111,8 @@ def odoo_id(self, record):
 
 
 @carepoint
-class CarepointOrganizationImporter(CarepointImporter):
+class CarepointOrganizationImporter(CarepointImporter,
+                                    CommonDateImporterMixer):
     _model_name = ['carepoint.org.bind']
     _base_mapper = CarepointOrganizationImportMapper
 

connector_carepoint/models/carepoint_state.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015-2016 LasLabs Inc.
+# Copyright 2015-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import models, fields