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

[FIX] Incorrect default template

Browse Source
This commit is contained in:
Stepan Savelyev 2020-07-09 01:19:51 +05:00
parent b24dc4b928
commit 52d1617e17
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/account_invoice.py
View File

@ -27,6 +27,7 @@ class AccountInvoice(models.Model):
view = self.env.ref( view = self.env.ref(
"{}.res_partner_wizard_print_document_view".format(MODULE_NAME) "{}.res_partner_wizard_print_document_view".format(MODULE_NAME)
) )
annex = order.contract_annex_id
return { return {
"name": _("Print Form of Contract Annex"), "name": _("Print Form of Contract Annex"),
"type": "ir.actions.act_window", "type": "ir.actions.act_window",
@ -35,8 +36,9 @@ class AccountInvoice(models.Model):
"view_id": view.id, "view_id": view.id,
"target": "new", "target": "new",
"context": { "context": {
"self_id": order.contract_annex_id.id, "self_id": annex.id,
"active_model": "res.partner.contract.annex", "active_model": "res.partner.contract.annex",
"company_form": annex.partner_id.company_form if annex.partner_id.is_company else "person",
"attachment_model": self._name, "attachment_model": self._name,
"attachment_res_id": self.id, "attachment_res_id": self.id,
}, },

7
models/res_partner_contract.py
View File

@ -101,8 +101,11 @@ class PartnerContract(models.Model, IDocument, Extension):
"view_mode": "form", "view_mode": "form",
"view_id": view.id, "view_id": view.id,
"target": "new", "target": "new",
"context": {"self_id": self.id}, "context": {
} "self_id": self.id,
"active_model": self._name,
"company_form": self.partner_id.company_form if self.partner_id.is_company else "person",},
}
def get_name_by_document_template(self, document_template_id): def get_name_by_document_template(self, document_template_id):
return self.name return self.name

6
models/res_partner_contract_annex.py
View File

@ -113,7 +113,11 @@ class ContractOrderAnnex(models.Model, IDocument, Extension):
"view_mode": "form", "view_mode": "form",
"view_id": view.id, "view_id": view.id,
"target": "new", "target": "new",
"context": {"self_id": self.id}, "context": {
"self_id": self.id,
"active_model": self._name,
"company_form": self.partner_id.company_form if self.partner_id.is_company else "person",
},
} }
def get_name_by_document_template(self, document_template_id): def get_name_by_document_template(self, document_template_id):

5
wizard/res_partner_contract_wizard.py
View File

@ -29,9 +29,7 @@ class ContractWizard(models.TransientModel, Extension):
"res.partner.contract": "contract", "res.partner.contract": "contract",
"res.partner.contract.annex": "annex", "res.partner.contract.annex": "annex",
}.get(self.active_model, False) }.get(self.active_model, False)
company_type = ( company_type = self.env.context.get("company_form", False)
self.partner_id.company_form if self.partner_id.is_company else "person"
)
document_template_domain = [ document_template_domain = [
("template_type", "=", template_type), ("template_type", "=", template_type),
@ -60,6 +58,7 @@ class ContractWizard(models.TransientModel, Extension):
"res.partner.document.template", "res.partner.document.template",
string="Document Template", string="Document Template",
default=_default_document_template, default=_default_document_template,
domain=lambda self: self._get_template_domain(),
readonly=False, readonly=False,
) )
transient_field_ids = fields.One2many( transient_field_ids = fields.One2many(