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

[FIX] contract fields

Browse Source
This commit is contained in:
Stepan Savelyev 2019-12-27 18:15:07 +05:00
parent 1ee2b26fe3
commit 88481a40b8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/fields_default.xml
View File

@ -21,12 +21,13 @@ seller_bank = seller.bank_ids[0]
ctx = { ctx = {
"contract_number": self.name, "contract_number": self.name,
"date_conclusion": self.date_conclusion_fix or self.date_conclusion, "date_conclusion": self.date_conclusion_fix or self.date_conclusion,
"seller_name": seller.name, "seller_name": seller.name,
"seller_company_form": seller.company_form, "seller_company_form": 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,
"seller_representer_document_parent": seller.representative_id.representative_document,
"seller_inn": seller.vat, "seller_inn": seller.vat,
"seller_kpp": seller.iec, "seller_kpp": seller.iec,
"seller_ogrn": seller.psrn, "seller_ogrn": seller.psrn,
@ -34,6 +35,7 @@ ctx = {
"seller_phone": seller.phone, "seller_phone": seller.phone,
"seller_email": seller.email, "seller_email": seller.email,
"partner_name": partner.name,
"partner_inn": partner.vat, "partner_inn": partner.vat,
"partner_business_address": partner.full_address, "partner_business_address": partner.full_address,
"partner_phone": partner.phone, "partner_phone": partner.phone,
@ -57,7 +59,6 @@ if seller_bank:
# Person # Person
if not partner.is_company: if not partner.is_company:
ctx.update({ ctx.update({
"partner_name": partner.name,
"partner_name_initials": partner.name_initials_case, # TODO: remove 'case' "partner_name_initials": partner.name_initials_case, # TODO: remove 'case'
"partner_passport_number": partner.passport_number, "partner_passport_number": partner.passport_number,
"partner_passport_date": partner.passport_date, "partner_passport_date": partner.passport_date,
@ -66,12 +67,11 @@ if not partner.is_company:
else: else:
# Company # Company
ctx.update({ ctx.update({
"partner_name":, "partner_company_form": partner.company_form,
"partner_company_form":, "partner_representer_name": partner.representative_id.name,
"partner_representer_name":, "partner_representer_name_parent": partner.representative_id.name_parent_case,
"partner_representer_name_parent":, "partner_representer_name_initials": partner.representative_id.name_initials_case,
"partner_representer_name_initials":, "partner_representer_document_parent": partner.representative_id.representative_document,
"partner_representer_document_parent":,
}) })
if partner.company_form == 'sp': if partner.company_form == 'sp':
@ -137,7 +137,7 @@ if order:
payment_term = order.payment_term_id.name payment_term = order.payment_term_id.name
payment_term = payment_term and payment_term.lower() payment_term = payment_term and payment_term.lower()
delivery_time = order.delivery_time delivery_time = order.delivery_time
ctx.update({ ctx.update({
"amount_whole": whole, "amount_whole": whole,
"amount_fractional": fractional, "amount_fractional": fractional,