[CLEANUP] templates and annexes

This commit is contained in:
Stepan Savelyev 2019-12-17 13:26:35 +05:00
parent f9b403b570
commit c7ff6c8c27
4 changed files with 11 additions and 47 deletions

View File

@ -24,11 +24,6 @@ modf = self.modf
ctx = {
"contract_number": self.contract_id.name,
# "amount_whole": 0,
# "amount_whole_handwritten": 0,
# "amount_fractional": 0,
# "amount_fractional_handwritten",
"seller_company_name": seller.name,
"seller_business_address": seller.full_address,
"seller_representer_name": seller.representative_id.name,
@ -74,17 +69,6 @@ if seller_bank:
"seller_bank_account": seller_bank.acc_number,
})
if self.order_id:
order = self.order_id
amount = modf(order.amount_total)
fractional, whole = amount
ctx.update({
"amount_whole": whole,
"amount_fractional": fractional,
})
action = ctx
</field>
</record>

View File

@ -23,11 +23,11 @@
<field name="view_type">form</field>
</record>
<!-- res.partner.contract.template action window -->
<!-- res.partner.template.print.contract action window -->
<record id="res_partner_contract_template_action" model="ir.actions.act_window">
<field name="name">res.partner.contract.template.action</field>
<field name="name">res.partner.template.print.contract.action</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner.contract.template</field>
<field name="res_model">res.partner.template.print.contract</field>
<field name="view_mode">tree,form</field>
<field name="view_type">form</field>
</record>

View File

@ -2,11 +2,9 @@
import base64
import logging
import math
from datetime import datetime
from odoo import api, fields, models
from odoo.exceptions import UserError
from pytils import numeral
from ..utils.docxtpl import get_document_from_values_stream
@ -17,7 +15,7 @@ class ContractWizard(models.TransientModel):
_name = "res.partner.contract.wizard"
def _get_default_template(self):
_template = self.env["res.partner.contract.template"].search(
_template = self.env["res.partner.template.print.contract"].search(
[("is_default", "=", True)]
)
if _template:
@ -39,13 +37,12 @@ class ContractWizard(models.TransientModel):
default=lambda self: self.env.context.get("active_id"),
)
delivery_terms = fields.Integer(string="Delivery terms", default=10)
order_id = fields.Many2one("sale.order", string="Appex order", help="Appex",)
partner_id = fields.Many2one(
"res.partner", string="Partner", default=_get_default_partner
)
payment_terms = fields.Integer(string="Payment term", default=45)
template = fields.Many2one(
"res.partner.contract.template",
print_template_contract = fields.Many2one(
"res.partner.template.print.contract",
string="Template",
help="Template for contract",
default=_get_default_template,
@ -62,12 +59,6 @@ class ContractWizard(models.TransientModel):
string="Contract Fields",
)
@api.onchange("partner_id")
def _set_order_domain(self):
current_id = self.env.context.get("active_ids")
domain = [("contract_id", "=", current_id)]
return {"domain": {"order_id": domain}}
@api.onchange("partner_id")
def _onchange_partner_id(self):
"""Creates transient fields for generate contract template
@ -146,4 +137,3 @@ class ContractWizard(models.TransientModel):
Uses in data/fields_default.xml
"""
return math.modf(arg)

View File

@ -1,27 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<act_window id="res_partner_contract_wizard_action" name="Contract wizard" res_model="res.partner.contract.wizard" src_model="res.partner.contract" view_mode="form" target="new"/>
<report id="contract_company_template" model="res.partner.contract.wizard" string="Contract" report_type="qweb-pdf" name="client_contracts.contract_template" file="client_contracts.contract_template" />
<report id="contract_personal_template" model="res.partner.contract.wizard" string="Contract" report_type="qweb-pdf" name="client_contracts.contract_fiz_template" file="client_contracts.contract_fiz_template" />
<report id="contract_appex_only_template_print" model="res.partner.contract.wizard" string="Contract" report_type="qweb-pdf" name="client_contracts.contract_appex_only_template" file="client_contracts.contract_appex_only_template" />
<record id="res_partner_contract_wizard_view" model="ir.ui.view">
<field name="name">Contract print wizard</field>
<field name="model">res.partner.contract.wizard</field>
<field name="arch" type="xml">
<form>
<group>
<!--
<group name="template" string="Templates">
<field name="template" string="Templates">
<field name="attachment_id"/>
</field>
</group>
-->
<group name="requisites" string="Requisites">
<field name="partner_id" string="Partner" readonly="1"/>
<field name="company_id" string="Seller" readonly="1"/>
@ -41,8 +28,11 @@
</field>
</group>
</group>
<button string="Create a document" type="object" name="get_docx_contract" />
<footer/>
</form>
</field>
</record>