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

Revert "[RM] _() from action context"

Browse Source 
This reverts commit 9e226228b7c9ac9b5c6ac1846fda1e8f339a1ad1.
This commit is contained in:
Stepan Savelyev 2019-12-30 15:42:46 +05:00
parent 607dd42dd1
commit 467b1b200c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/fields_default.xml
View File

@ -166,7 +166,7 @@ ctx = {
"yyyy": yyyy, "yyyy": yyyy,
"seller_name": seller.name, "seller_name": seller.name,
"seller_company_form": seller.read(["company_form"])[0]['company_form'], "seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.company_form)),
"seller_representer_name": seller.representative_id.name, "seller_representer_name": seller.representative_id.name,
"seller_representer_name_parent": seller.representative_id.name_genitive, "seller_representer_name_parent": seller.representative_id.name_genitive,
"seller_representer_name_initials": seller.representative_id.name_initials, "seller_representer_name_initials": seller.representative_id.name_initials,
@ -204,7 +204,7 @@ if seller_bank:
# Person # Person
if not partner.is_company: if not partner.is_company:
ctx.update({ ctx.update({
"partner_representer_name_initials": partner.name_initials, "partner_representer_name_initials": partner.name_initials, # TODO: remove 'case'
"partner_representer_passport_number": partner.passport_number, "partner_representer_passport_number": partner.passport_number,
"partner_representer_passport_date": partner.passport_date, "partner_representer_passport_date": partner.passport_date,
"partner_representer_passport_department": partner.passport_department, "partner_representer_passport_department": partner.passport_department,
@ -212,7 +212,7 @@ if not partner.is_company:
else: else:
# Company # Company
ctx.update({ ctx.update({
"partner_company_form": partner.read(["company_form"])[0]['company_form'], "partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)),
"partner_representer_name_parent": partner.representative_id.name_genitive, "partner_representer_name_parent": partner.representative_id.name_genitive,
"partner_representer_document_parent": partner.representative_document, "partner_representer_document_parent": partner.representative_document,
}) })

8
models/res_partner_contract.py
View File

@ -115,6 +115,14 @@ class PartnerContract(models.Model):
date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT) date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT)
return date return date
def _(self, arg):
"""Uses in xml action (data/fields_default)
Arguments:
arg {str} -- String to translate
"""
return _(arg)
class PrintTemplate(models.Model): class PrintTemplate(models.Model):
_name = "res.partner.template.print" _name = "res.partner.template.print"