Yaltik/docx_report_generation
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

[FIX] TypeError: unsupported operand type(s) for +: 'bool' and 'str'

Browse Source
This commit is contained in:
Stepan Savelyev 2020-02-05 15:41:49 +05:00
parent bae702b06d
commit 0ad6526d3e
1 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
data/fields_default.xml
View File

@ -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:
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,
})
seller_bank = seller.bank_ids and seller.bank_ids[0]
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_bic": seller_bank.bank_id.bic,
"seller_ks": bank.corr_account,
"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:
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,
})
seller_bank = seller.bank_ids and seller.bank_ids[0]
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_bic": seller_bank.bank_id.bic,
"seller_ks": bank.corr_account,
"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,
})