diff --git a/partner_financial_risk/models/res_partner.py b/partner_financial_risk/models/res_partner.py
index 02b31582a..b43ebda67 100644
--- a/partner_financial_risk/models/res_partner.py
+++ b/partner_financial_risk/models/res_partner.py
@@ -88,12 +88,12 @@ class ResPartner(models.Model):
     @api.depends(
         'risk_sale_order', 'risk_sale_order_include', 'risk_sale_order_limit',
         'risk_invoice_draft', 'risk_invoice_draft_include',
-        'risk_invoice_draft_limit',
-        'risk_invoice_open', 'risk_invoice_open_include', 'risk_invoice_open_limit',
+        'risk_invoice_draft_limit', 'risk_invoice_open',
+        'risk_invoice_open_include', 'risk_invoice_open_limit',
         'risk_invoice_unpaid', 'risk_invoice_unpaid_include',
-        'risk_invoice_unpaid_limit',
-        'risk_account_amount', 'risk_account_amount_include',
-        'risk_account_amount_limit')
+        'risk_invoice_unpaid_limit', 'risk_account_amount',
+        'risk_account_amount_include', 'risk_account_amount_limit',
+        'credit_limit',)
     def _compute_risk_exception(self):
         risk_field_list = self._risk_field_list()
         for partner in self:
diff --git a/partner_financial_risk/tests/test_partner_financial_risk.py b/partner_financial_risk/tests/test_partner_financial_risk.py
index ff2677bbe..785d7b551 100644
--- a/partner_financial_risk/tests/test_partner_financial_risk.py
+++ b/partner_financial_risk/tests/test_partner_financial_risk.py
@@ -2,6 +2,8 @@
 # © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from openerp import fields
+from openerp.exceptions import Warning
 from openerp.tests.common import TransactionCase
 
 
@@ -9,8 +11,68 @@ class TestPartnerFinancialRisk(TransactionCase):
     def setUp(self):
         super(TestPartnerFinancialRisk, self).setUp()
         self.partner = self.env['res.partner'].create({
-            'name': 'test',
+            'name': 'Partner test',
+            'customer': True,
         })
+        self.product = self.env.ref('product.product_product_2')
+        self.product.invoice_policy = 'order'
+        self.journal = self.env['account.journal'].create({
+            'type': 'sale',
+            'name': 'Test Sales',
+            'code': 'TSALE',
+        })
+        self.prod_account = self.env.ref('account.demo_coffee_machine_account')
+        self.inv_account = self.env.ref('account.demo_sale_of_land_account')
+        self.sale_order = self.env['sale.order'].create({
+            'partner_id': self.partner.id,
+            'pricelist_id': self.env.ref('product.list0').id,
+            'order_line': [(0, 0, {
+                'name': self.product.name,
+                'product_id': self.product.id,
+                'product_uom_qty': 1,
+                'product_uom': self.product.uom_id.id,
+                'price_unit': 100.0})],
+        })
+        self.invoice = self.env['account.invoice'].create({
+            'journal_id': self.journal.id,
+            # 'account_id': self.inv_account.id,
+            'company_id': self.env.user.company_id.id,
+            'currency_id': self.env.user.company_id.currency_id.id,
+            'partner_id': self.partner.id,
+            'invoice_line_ids': [(0, 0, {
+                'account_id': self.prod_account.id,
+                'name': 'Test line',
+                'price_unit': 50,
+                'quantity': 10,
+            })]
+        })
+
+    def test_sale_order(self):
+        self.sale_order.action_confirm()
+        self.assertAlmostEqual(self.partner.risk_sale_order, 100.0)
+
+        invoice_so_id = self.sale_order.action_invoice_create()
+        self.assertAlmostEqual(self.partner.risk_invoice_draft, 600.0)
+        invoice_so = self.invoice.browse(invoice_so_id)
+        invoice_so.date_due = fields.Date.today()
+        invoice_so.signal_workflow('invoice_open')
+        self.assertAlmostEqual(self.partner.risk_invoice_open, 100.0)
+
+        self.partner.risk_invoice_open_include = True
+        self.assertAlmostEqual(self.partner.risk_total, 100.0)
+        self.assertTrue(self.partner.risk_exception)
+        self.partner.credit_limit = 100.0
+        self.assertFalse(self.partner.risk_exception)
 
-    def test_partner_financial_risk(self):
-        self.assertEqual(self.partner.name, 'test')
+    def test_invoices(self):
+        self.partner.risk_invoice_draft_include = True
+        self.assertAlmostEqual(self.partner.risk_invoice_draft, 500.0)
+        self.assertAlmostEqual(self.partner.risk_total, 500.0)
+        self.invoice.signal_workflow('invoice_open')
+        self.assertAlmostEqual(self.partner.risk_invoice_draft, 0.0)
+        self.assertFalse(self.invoice.date_due)
+        self.partner.risk_invoice_unpaid_include = True
+        self.assertAlmostEqual(self.partner.risk_total, 500.0)
+        self.partner.risk_total = 100.0
+        with self.assertRaises(Warning):
+            self.sale_order.action_confirm()