Merge PR OCA#361 into 15.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

sale_financial_risk/models/sale.py

@@ -17,7 +17,7 @@ def evaluate_risk_message(self, partner):
         self.ensure_one()
         risk_amount = self.currency_id._convert(
             self.amount_total,
-            self.company_id.currency_id,
+            partner.risk_currency_id,
             self.company_id,
             self.date_order
             and self.date_order.date()
@@ -128,7 +128,7 @@ def _compute_risk_amount(self):
                 risk_amount = line.price_reduce_taxinc * risk_qty
             line.risk_amount = line.order_id.currency_id._convert(
                 risk_amount,
-                line.company_id.currency_id,
+                line.order_id.partner_id.risk_currency_id,
                 line.company_id,
                 line.order_id.date_order
                 and line.order_id.date_order.date()

sale_financial_risk/tests/test_partner_sale_risk.py

@@ -1,6 +1,7 @@
 # Copyright 2016-2018 Tecnativa - Carlos Dauden
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+from odoo import fields
 from odoo.tests import TransactionCase
 
 
@@ -29,10 +30,22 @@ def setUpClass(cls):
         cls.product_pricelist = cls.env["product.pricelist"].create(
             {"name": "pricelist for sale_financial_risk test"}
         )
-        cls.sale_order = cls.env["sale.order"].create(
+        cls.main_currency = cls.env.company.currency_id
+        cls.EUR = cls.env.ref("base.EUR")
+        cls.other_company = cls.env["res.company"].create(
+            {"name": "Company 2", "currency_id": cls.EUR.id}
+        )
+        cls.sale_order = cls.create_sale_order(cls.main_currency, cls.env.company)
+        cls.env.user.lang = "en_US"
+
+    @classmethod
+    def create_sale_order(cls, currency, company):
+        return cls.env["sale.order"].create(
             {
                 "partner_id": cls.partner.id,
                 "pricelist_id": cls.product_pricelist.id,
+                "currency_id": currency.id,
+                "company_id": company.id,
                 "order_line": [
                     (
                         0,
@@ -43,12 +56,12 @@ def setUpClass(cls):
                             "product_uom_qty": 1,
                             "product_uom": cls.product.uom_id.id,
                             "price_unit": 100.0,
+                            "company_id": company.id,
                         },
                     )
                 ],
             }
         )
-        cls.env.user.lang = "en_US"
 
     def test_sale_order(self):
         self.sale_order.action_confirm()
@@ -178,3 +191,59 @@ def test_open_risk_pivot_info(self):
         self.assertEqual(action["res_model"], "sale.order.line")
         self.assertTrue(action["view_id"])
         self.assertTrue(action["domain"])
+
+    def test_manual_currency_risk_not_exceeded(self):
+        self.product_pricelist.currency_id = self.EUR
+        self.partner.write(
+            {
+                "risk_sale_order_limit": 99,
+                "credit_limit": 99,
+                "risk_sale_order_include": True,
+                "credit_currency": "manual",
+                "manual_credit_currency_id": self.main_currency.id,
+            }
+        )
+        self.env["res.currency.rate"].create(
+            {
+                "currency_id": self.main_currency.id,
+                "name": fields.Date.today(),
+                "rate": 0.5,
+                "company_id": self.other_company.id,
+            }
+        )
+        sale_order = self.create_sale_order(
+            currency=self.EUR, company=self.other_company
+        )
+        result = sale_order.action_confirm()
+
+        # Limit not exceeded
+        self.assertEqual(result, True)
+
+    def test_manual_currency_risk_exceeded(self):
+        self.product_pricelist.currency_id = self.EUR
+        self.partner.write(
+            {
+                "risk_sale_order_limit": 99,
+                "credit_limit": 99,
+                "risk_sale_order_include": True,
+                "credit_currency": "manual",
+                "manual_credit_currency_id": self.main_currency.id,
+            }
+        )
+        self.product_pricelist.currency_id = self.EUR
+        self.env["res.currency.rate"].create(
+            {
+                "currency_id": self.main_currency.id,
+                "name": fields.Date.today(),
+                "rate": 1.5,
+                "company_id": self.other_company.id,
+            }
+        )
+        sale_order = self.create_sale_order(
+            currency=self.EUR, company=self.other_company
+        )
+        result = sale_order.action_confirm()
+
+        # Limit exceeded
+        self.assertNotEqual(result, True)
+        self.assertEqual(result["res_model"], "partner.risk.exceeded.wiz")