Merge branch 'development' into 'master'

Development

See merge request odoo/client_contracts!13

data/fields_default.xml

@@ -14,12 +14,7 @@
 self = record
 
 partner = self.partner_id # res.partner
-partner_bank = partner.bank_ids and partner.bank_ids[0] # res.partner.bank
-partner_bank_name = partner_bank.bank_id.name + (" г. {city}".format(city=partner_bank.bank_id.city) if partner_bank.bank_id.city else "")
-
 seller = self.company_id
-seller_bank = seller.bank_ids and seller.bank_ids[0]
-seller_bank_name = seller_bank.bank_id.name + (" г. {city}".format(city=seller_bank.bank_id.city) if seller_bank.bank_id.city else "")
 
 # Functions
 _ = self._
@@ -77,21 +72,35 @@ ctx = {
     "partner_email": partner.email,
 }
 
-if partner_bank:
+seller_bank = seller.bank_ids and seller.bank_ids[0]
-    ctx.update({
-        "partner_bank": partner_bank_name,
-        "partner_rs": partner_bank.acc_number,
-        "partner_ks": partner_bank.bank_id.corr_account,
-        "partner_bic": partner_bank.bank_id.bic,
-    })
 if seller_bank:
+
+    bank = seller_bank.bank_id
+    bank_name = bank and bank.name or ""
+    bank_city = "г. {city}".format(city=bank.city) if bank and bank.city else ""
+    seller_bank_name = "{} {}".format(bank_name, bank_city).strip()
+
     ctx.update({
         "seller_bank": seller_bank_name,
         "seller_rs": seller_bank.acc_number,
-        "seller_ks": seller_bank.bank_id.corr_account,
+        "seller_ks": bank.corr_account,
-        "seller_bic": seller_bank.bank_id.bic,
+        "seller_bic": bank.bic,
     })
 
+partner_bank = partner.bank_ids and partner.bank_ids[0]
+if partner_bank:
+    
+    bank = partner_bank.bank_id
+    bank_name = bank and bank.name or ""
+    bank_city = "г. {city}".format(city=bank.city) if bank and bank.city else ""
+    partner_bank_name = "{} {}".format(bank_name, bank_city).strip()
+
+    ctx.update({
+        "partner_bank": partner_bank_name,
+        "partner_rs": partner_bank.acc_number,
+        "partner_ks": bank.corr_account,
+        "partner_bic": bank.bic,
+    })
 
 # Person
 if not partner.is_company:
@@ -158,12 +167,6 @@ self = record
 seller = self.company_id
 partner = self.partner_id
 
-seller_bank = seller.bank_ids and seller.bank_ids[0]
-seller_bank_name = seller_bank.bank_id.name + (" г. {city}".format(city=seller_bank.bank_id.city) if seller_bank.bank_id.city else "")
-
-partner_bank = partner.bank_ids and partner.bank_ids[0]
-partner_bank_name = partner_bank.bank_id.name + (" г. {city}".format(city=partner_bank.bank_id.city) if partner_bank.bank_id.city else "")
-
 # Functions
 _ = self.contract_id._
 get_date = self.contract_id.get_date
@@ -242,19 +245,34 @@ ctx = {
     "partner_email": partner.email,
 }
 
-if partner_bank:
+seller_bank = seller.bank_ids and seller.bank_ids[0]
-    ctx.update({
-        "partner_bank": partner_bank_name,
-        "partner_rs": partner_bank.acc_number,
-        "partner_ks": partner_bank.bank_id.corr_account,
-        "partner_bic": partner_bank.bank_id.bic,
-    })
 if seller_bank:
+
+    bank = seller_bank.bank_id
+    bank_name = bank and bank.name or ""
+    bank_city = "г. {city}".format(city=bank.city) if bank and bank.city else ""
+    seller_bank_name = "{} {}".format(bank_name, bank_city).strip()
+
     ctx.update({
         "seller_bank": seller_bank_name,
         "seller_rs": seller_bank.acc_number,
-        "seller_ks": seller_bank.bank_id.corr_account,
+        "seller_ks": bank.corr_account,
-        "seller_bic": seller_bank.bank_id.bic,
+        "seller_bic": bank.bic,
+    })
+
+partner_bank = partner.bank_ids and partner.bank_ids[0]
+if partner_bank:
+    
+    bank = partner_bank.bank_id
+    bank_name = bank and bank.name or ""
+    bank_city = "г. {city}".format(city=bank.city) if bank and bank.city else ""
+    partner_bank_name = "{} {}".format(bank_name, bank_city).strip()
+
+    ctx.update({
+        "partner_bank": partner_bank_name,
+        "partner_rs": partner_bank.acc_number,
+        "partner_ks": bank.corr_account,
+        "partner_bic": bank.bic,
     })
 
 

models/res_partner_contract_annex.py

@@ -58,7 +58,7 @@ class ContractOrderAnnex(models.Model, IDocument, Extension):
                 record.counter or record.contract_id.contract_annex_number, record.name
             )
 
-    @api.depends("specification_name", "contract_id", "order_id")
+    @api.depends("contract_id", "order_id")
     def _compute_specification_name(self):
         self.specification_name = _("{name} from {date}").format(
             name="{}-{}".format(self.contract_id.name, self.order_id.name),

wizard/res_partner_contract_wizard.py

@@ -69,17 +69,17 @@ class ContractWizard(models.TransientModel, Extension):
         "res.partner.contract.field.transient", "_contract_wizard_id",
     )
 
-    @api.depends("company_id", "target")
+    @api.depends("target")
     def _compute_company_id(self):
         if self.target:
             self.company_id = self.target.company_id
 
-    @api.depends("partner_id", "target")
+    @api.depends("target")
     def _compute_partner_id(self):
         if self.target:
             self.partner_id = self.target.partner_id
 
-    @api.depends("document_name", "document_template", "target")
+    @api.depends("document_template", "target")
     def _compute_document_name(self):
         self.document_name = self.target.get_name_by_document_template(
             self.document_template