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

[FIX] no translate of company form in printed template

Browse Source
This commit is contained in:
Stepan Savelyev 2019-12-28 11:04:25 +05:00
parent 146fa6fb3b
commit 894ebfe6d8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/fields_default.xml
View File

@ -40,7 +40,7 @@ ctx = {
"yyyy": yyyy, "yyyy": yyyy,
"seller_name": seller.name, "seller_name": seller.name,
"seller_company_form": dict(seller._fields['company_form'].selection).get(seller.company_form), "seller_company_form": self._(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_parent_case, "seller_representer_name_parent": seller.representative_id.name_parent_case,
"seller_representer_name_initials": seller.representative_id.name_initials_case, "seller_representer_name_initials": seller.representative_id.name_initials_case,
@ -84,7 +84,7 @@ if not partner.is_company:
else: else:
# Company # Company
ctx.update({ ctx.update({
"partner_company_form": dict(partner._fields['company_form'].selection).get(partner.company_form), "partner_company_form": self._(dict(partner._fields['company_form'].selection).get(partner.company_form)),
"partner_representer_name": partner.representative_id.name, "partner_representer_name": partner.representative_id.name,
"partner_representer_name_parent": partner.representative_id.name_parent_case, "partner_representer_name_parent": partner.representative_id.name_parent_case,
"partner_representer_name_initials": partner.representative_id.name_initials_case, "partner_representer_name_initials": partner.representative_id.name_initials_case,

13
models/res_partner_contract.py
View File

@ -99,6 +99,11 @@ class PartnerContract(models.Model):
} }
def get_date(self): def get_date(self):
"""Uses in xml action (data/fields_default)
Returns:
datetime.datetime -- date_conclusion_fix or date_conclusion or create_date
"""
date = self.date_conclusion_fix or self.date_conclusion date = self.date_conclusion_fix or self.date_conclusion
if date: if date:
date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATE_FORMAT) date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATE_FORMAT)
@ -107,6 +112,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"