From 9a72f832b5bd627483a53dfb9c9184fb8335f601 Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Sun, 6 Jun 2021 18:39:55 +0200 Subject: [PATCH 1/2] [RFC] renaming to invoice -> to_invoice --- pms/models/folio_sale_line.py | 5 ++--- pms/models/pms_folio.py | 8 ++++---- pms/models/pms_reservation.py | 7 +++---- pms/models/pms_service.py | 2 +- pms/views/pms_folio_views.xml | 14 +++++++------- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pms/models/folio_sale_line.py b/pms/models/folio_sale_line.py index f907c4d87..f2bc50420 100644 --- a/pms/models/folio_sale_line.py +++ b/pms/models/folio_sale_line.py @@ -81,12 +81,11 @@ class FolioSaleLine(models.Model): string="Invoice Status", help="Invoice Status; it can be: upselling, invoiced, to invoice, no", readonly=True, - default="no", store=True, selection=[ ("upselling", "Upselling Opportunity"), ("invoiced", "Fully Invoiced"), - ("to invoice", "To Invoice"), + ("to_invoice", "To Invoice"), ("no", "Nothing to Invoice"), ], compute="_compute_invoice_status", @@ -512,7 +511,7 @@ class FolioSaleLine(models.Model): # why status to_invoice?? this behavior is copied from sale order # https://github.com/OCA/OCB/blob/14.0/addons/sale/models/sale.py#L1160 elif not float_is_zero(line.qty_to_invoice, precision_digits=precision): - line.invoice_status = "to invoice" + line.invoice_status = "to_invoice" elif ( float_compare( line.qty_invoiced, diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py index 1899af850..3f9fc27d4 100644 --- a/pms/models/pms_folio.py +++ b/pms/models/pms_folio.py @@ -397,7 +397,7 @@ class PmsFolio(models.Model): store=True, selection=[ ("invoiced", "Fully Invoiced"), - ("to invoice", "To Invoice"), + ("to_invoice", "To Invoice"), ("no", "Nothing to Invoice"), ], compute="_compute_get_invoice_status", @@ -692,7 +692,7 @@ class PmsFolio(models.Model): - no: if the Folio is in status 'draft', we consider that there is nothing to invoice. This is also the default value if the conditions of no other status is met. - - to invoice: if any SO line is 'to invoice', the whole SO is 'to invoice' + - to_invoice: if any SO line is 'to_invoice', the whole SO is 'to_invoice' - invoiced: if all SO lines are invoiced, the SO is invoiced. """ unconfirmed_orders = self.filtered(lambda so: so.state in ["draft"]) @@ -720,9 +720,9 @@ class PmsFolio(models.Model): if order.state in ("draft"): order.invoice_status = "no" elif any( - invoice_status == "to invoice" for invoice_status in line_invoice_status + invoice_status == "to_invoice" for invoice_status in line_invoice_status ): - order.invoice_status = "to invoice" + order.invoice_status = "to_invoice" elif line_invoice_status and all( invoice_status == "invoiced" for invoice_status in line_invoice_status ): diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index f62d4d13b..67525b43d 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -493,17 +493,16 @@ class PmsReservation(models.Model): invoice_status = fields.Selection( string="Invoice Status", help="The status of the invoices in folio. Can be 'invoiced'," - " 'to invoice' or 'no'.", - compute="_compute_invoice_status", + " 'to_invoice' or 'no'.", store=True, readonly=True, selection=[ ("upselling", "Upselling Opportunity"), ("invoiced", "Fully Invoiced"), - ("to invoice", "To Invoice"), + ("to_invoice", "To Invoice"), ("no", "Nothing to Invoice"), ], - default="no", + compute="_compute_invoice_status", ) analytic_tag_ids = fields.Many2many( string="Analytic Tags", diff --git a/pms/models/pms_service.py b/pms/models/pms_service.py index 6fbd0c2de..fe0f1fba9 100644 --- a/pms/models/pms_service.py +++ b/pms/models/pms_service.py @@ -143,7 +143,7 @@ class PmsService(models.Model): compute="_compute_invoice_status", selection=[ ("invoiced", "Fully Invoiced"), - ("to invoice", "To Invoice"), + ("to_invoice", "To Invoice"), ("no", "Nothing to Invoice"), ], ) diff --git a/pms/views/pms_folio_views.xml b/pms/views/pms_folio_views.xml index ca945c881..f8f87122f 100644 --- a/pms/views/pms_folio_views.xml +++ b/pms/views/pms_folio_views.xml @@ -30,7 +30,7 @@ string="Create Invoice" type="action" class="btn-primary" - attrs="{'invisible': [('invoice_status', '!=', 'to invoice')]}" + attrs="{'invisible': [('invoice_status', '!=', 'to_invoice')]}" /> Date: Sun, 6 Jun 2021 21:31:11 +0200 Subject: [PATCH 2/2] [FIX] defaults folio make invoice advance --- pms/wizards/folio_make_invoice_advance.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pms/wizards/folio_make_invoice_advance.py b/pms/wizards/folio_make_invoice_advance.py index cbce18971..6f0896f83 100644 --- a/pms/wizards/folio_make_invoice_advance.py +++ b/pms/wizards/folio_make_invoice_advance.py @@ -13,7 +13,7 @@ class FolioAdvancePaymentInv(models.TransientModel): partner_invoice_id = fields.Many2one( string="Billing contact", help="Invoice address for current partner", - default=lambda self: self._default_partner_invoice_id, + default=lambda self: self._default_partner_invoice_id(), comodel_name="res.partner", ) advance_payment_method = fields.Selection( @@ -41,17 +41,17 @@ class FolioAdvancePaymentInv(models.TransientModel): string="Has down payments", help="Has down payments", readonly=True, - default=lambda self: self._default_has_down_payment, + default=lambda self: self._default_has_down_payment(), ) product_id = fields.Many2one( string="Down Payment Product", - default=lambda self: self._default_product_id, + default=lambda self: self._default_product_id(), comodel_name="product.product", domain=[("type", "=", "service")], ) count = fields.Integer( string="Order Count", - default=lambda self: self._count, + default=lambda self: self._count(), ) amount = fields.Float( string="Down Payment Amount", @@ -62,7 +62,7 @@ class FolioAdvancePaymentInv(models.TransientModel): string="Currency", help="Currency used in invoices", comodel_name="res.currency", - default=lambda self: self._default_currency_id, + default=lambda self: self._default_currency_id(), ) fixed_amount = fields.Monetary( string="Down Payment Amount (Fixed)", @@ -71,14 +71,14 @@ class FolioAdvancePaymentInv(models.TransientModel): deposit_account_id = fields.Many2one( string="Income Account", help="Account used for deposits", - default=lambda self: self._default_deposit_account_id, + default=lambda self: self._default_deposit_account_id(), comodel_name="account.account", domain=[("deprecated", "=", False)], ) deposit_taxes_id = fields.Many2many( string="Customer Taxes", help="Taxes used for deposits", - default=lambda self: self._default_deposit_taxes_id, + default=lambda self: self._default_deposit_taxes_id(), comodel_name="account.tax", )