Merge branch 'fix/creation-sr-for-companies' into 'master'

Set company fields in SR creation

See merge request coopdevs/odoo-somconnexio-python-client!14

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+* Set company fields in SR creation [#14](https://gitlab.com/coopdevs/odoo-somconnexio-python-client/-/merge_requests/14)
+
 ## [0.1.11]
 ### Added
 * Add member field to the Partner resource. [#13](https://gitlab.com/coopdevs/odoo-somconnexio-python-client/-/merge_requests/10)

odoo_somconnexio_python_client/tryton_mappers/crm_lead_from_contract_form.py

@@ -133,8 +133,6 @@ class CRMLeadFromContractForm:
                     ),
                     "previous_owner_name": (
                         self.contract_data.get("mobile_surname")
-                        or self.contract_data.get("tradename")
-                        or ""
                     ),
                     "previous_owner_first_name": self.contract_data.get("mobile_name"),
                     "icc_donor": self.contract_data.get("mobile_icc_number"),

odoo_somconnexio_python_client/tryton_mappers/subscription_request_from_partner_form.py

@@ -86,15 +86,20 @@ class SubscriptionRequestFromPartnerForm:
             "birthdate": self.partner_data.get("birth_date").strftime("%Y-%m-%d"),
             "gender": self.partner_data.get("sex"),
             "is_company": self._is_company(),
-            "company_name": self.partner_data.get("tradename"),
-            # TODO: Lastname, Tradename, Phone???
+            "company_name": self._get_company_name(),
             "voluntary_contribution": int(
                 self.partner_data.get("contribute_somconnexio_option")
             ),
         }
 
+    def _get_company_name(self):
+        if self._is_company():
+            return self.partner_data.get("tradename") or self.partner_data.get("name")
+        else:
+            return None
+
     def _get_name(self):
-        if self.partner_data.get("party_type") == "organization":
+        if self._is_company():
             return self.partner_data.get("name")
         else:
             return " ".join(

tests/tryton_mappers/test_subscription_request_from_partner_form.py

@@ -53,10 +53,21 @@ class SubscriptionRequestFromPartnerFormTests(unittest.TestCase):
     def test_company_to_dict(self):
         partner_data = FakePartnerForm().data
         partner_data["party_type"] = "organization"
-        partner_data["tradename"] = "CompanyName"
+        partner_data["tradename"] = "CompanyTradeName"
+        partner_data["name"] = "CompanyName"
 
         sr_data = SubscriptionRequestFromPartnerForm(partner_data).to_dict()
 
         self.assertEqual(sr_data["name"], partner_data.get("name"))
         self.assertTrue(sr_data["is_company"])
         self.assertEqual(sr_data["company_name"], partner_data.get("tradename"))
+
+    def test_company_to_dict_without_tradename(self):
+        partner_data = FakePartnerForm().data
+        partner_data["party_type"] = "organization"
+        partner_data["tradename"] = None
+        partner_data["name"] = "CompanyName"
+
+        sr_data = SubscriptionRequestFromPartnerForm(partner_data).to_dict()
+
+        self.assertEqual(sr_data["company_name"], partner_data.get("name"))