diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index b7c51dded6a..0440dfcaf51 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -162,7 +162,6 @@ class SaleOrder(models.Model): require_payment = fields.Boolean('Online Payment', default=_get_default_require_payment, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help='Request an online payment to the customer in order to confirm orders automatically.') - remaining_validity_days = fields.Integer(compute='_compute_remaining_validity_days', string="Remaining Days Before Expiration") create_date = fields.Datetime(string='Creation Date', readonly=True, index=True, help="Date on which sales order is created.") user_id = fields.Many2one( @@ -302,13 +301,6 @@ class SaleOrder(models.Model): else: order.expected_date = False - def _compute_remaining_validity_days(self): - for record in self: - if record.validity_date: - record.remaining_validity_days = (record.validity_date - fields.Date.today()).days + 1 - else: - record.remaining_validity_days = 0 - @api.depends('transaction_ids') def _compute_authorized_transaction_ids(self): for trans in self: diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index 2e95e9ca4a0..c8bbb314ebc 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -153,12 +153,10 @@ -
  • - This offer expires in -
    - - - daysday +
  • + This offer expires on +
    +