From cd2bdd2748699c66b313cbd351f8ac50022dbb79 Mon Sep 17 00:00:00 2001 From: Alexandr Date: Fri, 30 Apr 2021 16:09:43 +0500 Subject: [PATCH] module can be installd + format --- models/account_invoice.py | 14 +++++++------- models/res_partner_contract.py | 10 ++++++++-- models/res_partner_contract_annex.py | 3 ++- utils/misc.py | 3 ++- wizard/res_partner_contract_wizard.py | 3 ++- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/models/account_invoice.py b/models/account_invoice.py index 35cc6a4..b23e588 100755 --- a/models/account_invoice.py +++ b/models/account_invoice.py @@ -11,13 +11,13 @@ class AccountInvoice(models.Model): error_message = "" if any(not so.contract_annex_id.contract_id for so in sale_order_ids): error_message = _("There is a Sale order without binding contract.") - if any(not so.contract_annex_id for so in sale_order_ids): + if any(not so.contract_annex_id for so in sale_order_ids): error_message = _("There is a Sale order without annex.") if error_message: raise UserError(error_message) def action_invoice_print(self): - ''' + """ for so in self.env["sale.order"].search([]): if self.id in so.invoice_ids.ids: order = so @@ -32,16 +32,16 @@ class AccountInvoice(models.Model): ) ) self.sent = True - ''' + """ - sale_orders_ids = self.env["sale.order"].search([ - ("invoice_ids", "in", self.ids) - ]) + sale_orders_ids = self.env["sale.order"].search( + [("invoice_ids", "in", self.ids)] + ) if not sale_orders_ids: return super().action_invoice_print() self.check_contract_presence(sale_orders_ids) - self.filtered(lambda inv: not inv.is_move_sent).write({'is_move_sent': True}) + self.filtered(lambda inv: not inv.is_move_sent).write({"is_move_sent": True}) view = self.env.ref( "{}.res_partner_wizard_print_document_view".format(MODULE_NAME) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 1eb5912..e4c8864 100755 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -3,13 +3,19 @@ import datetime from odoo import _, fields, models from ..utils import MODULE_NAME + # from ..utils.misc import Extension, IDocument -class PartnerContract(models.Model): #, IDocument, Extension): +class PartnerContract(models.Model): # , IDocument, Extension): _name = "res.partner.contract" _description = "Contract" - _inherit = ["mail.thread", "mail.activity.mixin", "mail.followers", "client_contracts.utils"] + _inherit = [ + "mail.thread", + "mail.activity.mixin", + "mail.followers", + "client_contracts.utils", + ] def _get_default_name(self): """Returns name format `№YYMM-D-N`, diff --git a/models/res_partner_contract_annex.py b/models/res_partner_contract_annex.py index 4875f0d..b2f491c 100755 --- a/models/res_partner_contract_annex.py +++ b/models/res_partner_contract_annex.py @@ -3,10 +3,11 @@ import math from odoo import _, api, fields, models from ..utils import MODULE_NAME + # from ..utils.misc import Extension, IDocument -class ContractOrderAnnex(models.Model): # , IDocument, Extension): +class ContractOrderAnnex(models.Model): # , IDocument, Extension): _name = "res.partner.contract.annex" _inherit = ["client_contracts.utils"] _description = "Contract Annex" diff --git a/utils/misc.py b/utils/misc.py index aab7646..afc9e63 100755 --- a/utils/misc.py +++ b/utils/misc.py @@ -1,7 +1,8 @@ import datetime as dt + # import inspect -from odoo import models # , fields +from odoo import models # , fields from odoo.tools.misc import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 27ca4e6..1f4ffe8 100755 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -6,12 +6,13 @@ from odoo.exceptions import ValidationError from ..utils import MODULE_NAME from ..utils.docxtpl import get_document_from_values_stream + # from ..utils.misc import Extension _logger = logging.getLogger(__name__) -class ContractWizard(models.TransientModel): #, Extension): +class ContractWizard(models.TransientModel): # , Extension): _name = "res.partner.contract.wizard" _inherit = ["client_contracts.utils"]