diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 16992bfcde100..4fa1df7e14207 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -340,6 +340,11 @@ def _sequence_year_range_monthly_regex(self): copy=False, domain=[('display_type', 'in', ('product', 'line_section', 'line_note'))], ) + invoice_sent_status = fields.Selection( + selection=[('sent', 'Sent'), ('not_sent', 'Not sent')], + compute="_compute_is_sent", + copy=False + ) # === Date fields === # invoice_date = fields.Date( @@ -781,6 +786,11 @@ def _compute_invoice_default_sale_person(self): else: move.invoice_user_id = False + @api.depends('is_move_sent') + def _compute_is_sent(self): + for move in self: + move.invoice_sent_status = 'sent' if move.is_move_sent else 'not_sent' + @api.depends('sending_data') def _compute_is_being_sent(self): for move in self: diff --git a/addons/account/models/company.py b/addons/account/models/company.py index fd3d289aa7b52..b54c97ce34c26 100644 --- a/addons/account/models/company.py +++ b/addons/account/models/company.py @@ -164,7 +164,7 @@ class ResCompany(models.Model): 'padding': 5, 'use_date_range': True, 'company_id': self.id, - 'prefix': 'BATCH/%(year)s/', + 'prefix': 'PAY/%(year)s/', }), ) diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml index 443c16484995f..192a8c00a3533 100644 --- a/addons/account/views/account_menuitem.xml +++ b/addons/account/views/account_menuitem.xml @@ -26,7 +26,7 @@ - + diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml index 943748227126e..42e50a5487dbd 100644 --- a/addons/account/views/account_move_views.xml +++ b/addons/account/views/account_move_views.xml @@ -306,6 +306,7 @@ + @@ -523,7 +524,7 @@ - + @@ -549,6 +550,7 @@ invisible="payment_state == 'invoicing_legacy' or move_type == 'entry'" optional="show" /> + diff --git a/addons/l10n_fr_account/models/account_move.py b/addons/l10n_fr_account/models/account_move.py index ff6f3aca58f49..e8e1cd68462c7 100644 --- a/addons/l10n_fr_account/models/account_move.py +++ b/addons/l10n_fr_account/models/account_move.py @@ -16,6 +16,20 @@ def _get_view(self, view_id=None, view_type='form', **options): shipping_fields[0].attrib.pop("groups", None) return arch, view + @api.depends('country_code', 'move_type') + def _compute_show_delivery_date(self): + # EXTENDS 'account' + super()._compute_show_delivery_date() + for move in self: + if move.country_code == 'FR': + move.show_delivery_date = move.is_sale_document() + + def _post(self, soft=True): + for move in self: + if move.country_code == 'FR' and move.is_sale_document() and not move.delivery_date: + move.delivery_date = move.invoice_date or fields.Date.context_today(self) + return super()._post(soft) + @api.depends('company_id.country_code') def _compute_l10n_fr_is_company_french(self): for record in self: