Merge acc3750 into 0282b14

connector_carepoint/connector.py

@@ -2,7 +2,7 @@
 # Copyright 2015-2016 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields
+from openerp import models, fields, api
 from openerp.addons.connector.connector import ConnectorEnvironment
 from openerp.addons.connector.checkpoint import checkpoint
 
@@ -37,16 +37,29 @@ class CarepointBinding(models.AbstractModel):
         comodel_name='carepoint.backend',
         string='Carepoint Backend',
         required=True,
+        readonly=True,
         ondelete='restrict',
+        default=lambda s: s._default_backend_id(),
     )
     # fields.Char because 0 is a valid Carepoint ID
     carepoint_id = fields.Char(string='ID on Carepoint')
+    created_at = fields.Date('Created At (on Carepoint)')
+    updated_at = fields.Date('Updated At (on Carepoint)')
 
     _sql_constraints = [
         ('carepoint_uniq', 'unique(backend_id, carepoint_id)',
          'A binding already exists with the same Carepoint ID.'),
     ]
 
+    @api.model
+    def _default_backend_id(self):
+        return self.env['carepoint.backend'].search([
+            ('is_default', '=', True),
+            ('active', '=', True),
+        ],
+            limit=1,
+        )
+
 
 def add_checkpoint(session, model_name, record_id, backend_id):
     """ Add a row in the model ``connector.checkpoint`` for a record,

connector_carepoint/data/carepoint_carepoint_account_data.xml

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
+<odoo noupdate="1">
 
-        <record model="medical.patient" id="patient_null">
-            <field name="name">Null Patient</field>
-            <field name="active" eval="False" />
-        </record>
-
-        <record model="carepoint.carepoint.account" id="account_null">
-            <field name="patient_id" ref="connector_carepoint.patient_null" />
-            <field name="carepoint_id">0</field>
-        </record>
+    <record model="medical.patient" id="patient_null">
+        <field name="name">Null Patient</field>
+        <field name="active" eval="False" />
+    </record>
 
-    </data>
-</openerp>
+</odoo>

connector_carepoint/models/__init__.py

@@ -12,12 +12,12 @@
 from . import procurement_order
 from . import account_invoice_line
 from . import stock_picking
+from . import stock_warehouse
 
 # Medical Models
 from . import medical_pharmacy
 from . import medical_patient
 from . import medical_physician
-from . import medical_medicament
 from . import medical_prescription_order
 from . import medical_prescription_order_line
 
@@ -30,6 +30,8 @@
 # CarePoint Mappings/Binds
 from . import account
 from . import carepoint_state
+from . import carepoint_item
+from . import carepoint_vendor
 
 # FDB
 from . import fdb_ndc

connector_carepoint/models/account.py

@@ -29,14 +29,6 @@ class CarepointAccount(models.Model):
         required=True,
         ondelete='restrict',
     )
-    backend_id = fields.Many2one(
-        comodel_name='carepoint.backend',
-        string='Carepoint Backend',
-        store=True,
-        readonly=True,
-        # override 'carepoint.binding', can't be INSERTed if True:
-        required=False,
-    )
 
 
 class Account(models.Model):

connector_carepoint/models/account_invoice_line.py

@@ -37,21 +37,6 @@ class CarepointAccountInvoiceLine(models.Model):
         required=True,
         ondelete='cascade'
     )
-    backend_id = fields.Many2one(
-        comodel_name='carepoint.backend',
-        string='Carepoint Backend',
-        store=True,
-        readonly=True,
-        # override 'carepoint.binding', can't be INSERTed if True:
-        required=False,
-    )
-    created_at = fields.Date('Created At (on Carepoint)')
-    updated_at = fields.Date('Updated At (on Carepoint)')
-
-    _sql_constraints = [
-        ('odoo_uniq', 'unique(backend_id, odoo_id)',
-         'A Carepoint binding for this order already exists.'),
-    ]
 
 
 class AccountInvoiceLine(models.Model):

connector_carepoint/models/address.py

@@ -36,21 +36,6 @@ class CarepointCarepointAddress(models.Model):
         required=True,
         ondelete='cascade'
     )
-    backend_id = fields.Many2one(
-        comodel_name='carepoint.backend',
-        string='Carepoint Backend',
-        store=True,
-        readonly=True,
-        # override 'carepoint.binding', can't be INSERTed if True:
-        required=False,
-    )
-    created_at = fields.Date('Created At (on Carepoint)')
-    updated_at = fields.Date('Updated At (on Carepoint)')
-
-    _sql_constraints = [
-        ('odoo_uniq', 'unique(backend_id, odoo_id)',
-         'A Carepoint binding for this address already exists.'),
-    ]
 
 
 class CarepointAddress(models.Model):

connector_carepoint/models/address_patient.py

@@ -33,21 +33,6 @@ class CarepointCarepointAddressPatient(models.Model):
         required=True,
         ondelete='cascade'
     )
-    backend_id = fields.Many2one(
-        comodel_name='carepoint.backend',
-        string='Carepoint Backend',
-        store=True,
-        readonly=True,
-        # override 'carepoint.binding', can't be INSERTed if True:
-        required=False,
-    )
-    created_at = fields.Date('Created At (on Carepoint)')
-    updated_at = fields.Date('Updated At (on Carepoint)')
-
-    _sql_constraints = [
-        ('odoo_uniq', 'unique(backend_id, odoo_id)',
-         'A Carepoint binding for this address already exists.'),
-    ]
 
 
 class CarepointAddressPatient(models.Model):

connector_carepoint/models/address_pharmacy.py

@@ -32,21 +32,6 @@ class CarepointCarepointAddressPharmacy(models.Model):
         required=True,
         ondelete='cascade'
     )
-    backend_id = fields.Many2one(
-        comodel_name='carepoint.backend',
-        string='Carepoint Backend',
-        store=True,
-        readonly=True,
-        # override 'carepoint.binding', can't be INSERTed if True:
-        required=False,
-    )
-    created_at = fields.Date('Created At (on Carepoint)')
-    updated_at = fields.Date('Updated At (on Carepoint)')
-
-    _sql_constraints = [
-        ('odoo_uniq', 'unique(backend_id, odoo_id)',
-         'A Carepoint binding for this address already exists.'),
-    ]
 
 
 class CarepointAddressPharmacy(models.Model):

connector_carepoint/models/address_physician.py

@@ -32,21 +32,6 @@ class CarepointCarepointAddressPhysician(models.Model):
         required=True,
         ondelete='cascade'
     )
-    backend_id = fields.Many2one(
-        comodel_name='carepoint.backend',
-        string='Carepoint Backend',
-        store=True,
-        readonly=True,
-        # override 'carepoint.binding', can't be INSERTed if True:
-        required=False,
-    )
-    created_at = fields.Date('Created At (on Carepoint)')
-    updated_at = fields.Date('Updated At (on Carepoint)')
-
-    _sql_constraints = [
-        ('odoo_uniq', 'unique(backend_id, odoo_id)',
-         'A Carepoint binding for this address already exists.'),
-    ]
 
 
 class CarepointAddressPhysician(models.Model):

connector_carepoint/models/carepoint_backend.py

@@ -155,7 +155,7 @@ class CarepointBackend(models.Model):
         comodel_name='account.payment.term',
         required=True,
     )
-    import_medicaments_from_date = fields.Datetime()
+    import_items_from_date = fields.Datetime()
     import_patients_from_date = fields.Datetime()
     import_physicians_from_date = fields.Datetime()
     import_prescriptions_from_date = fields.Datetime()
@@ -291,9 +291,9 @@ def cron_import_sale_order(self):
         self.search([]).import_sale_order()
 
     @api.multi
-    def import_medical_medicament(self):
-        self._import_from_date('carepoint.medical.medicament',
-                               'import_medicaments_from_date')
+    def import_carepoint_item(self):
+        self._import_from_date('carepoint.carepoint.item',
+                               'import_items_from_date')
         return True
 
     @api.multi