From 4c6d8195826b1b724d339fcaddf6799bc398acd9 Mon Sep 17 00:00:00 2001 From: DavidJForgeFlow Date: Fri, 28 Apr 2023 10:37:41 +0200 Subject: [PATCH 1/2] [IMP] rma: add date to rma_order_line --- rma/models/rma_order_line.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py index fa14e001..b08fd171 100644 --- a/rma/models/rma_order_line.py +++ b/rma/models/rma_order_line.py @@ -207,6 +207,10 @@ class RmaOrderLine(models.Model): for rec in self.filtered(lambda r: r.type == "supplier"): rec.rma_line_count = len(rec.customer_rma_id) + @api.model + def _default_date_rma(self): + return fields.Datetime.now() + delivery_address_id = fields.Many2one( comodel_name="res.partner", string="Partner delivery address", @@ -238,6 +242,9 @@ class RmaOrderLine(models.Model): states={"draft": [("readonly", False)]}, help="Reference of the document that produced this rma.", ) + date = fields.Datetime( + string="Order Date", index=True, default=lambda self: self._default_date_rma() + ) state = fields.Selection( selection=[ ("draft", "Draft"), From fe43bad11c3aa4983f06e3a958564f906e9e1ce9 Mon Sep 17 00:00:00 2001 From: AaronHForgeFlow Date: Fri, 27 Oct 2023 11:49:33 +0200 Subject: [PATCH 2/2] [IMP] rma: date_rma in lines --- rma/models/rma_order.py | 26 +++++++++++++++++++++++++- rma/models/rma_order_line.py | 2 +- rma/views/rma_order_line_view.xml | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/rma/models/rma_order.py b/rma/models/rma_order.py index f93f6e01..ba426002 100644 --- a/rma/models/rma_order.py +++ b/rma/models/rma_order.py @@ -88,7 +88,11 @@ class RmaOrder(models.Model): description = fields.Text() comment = fields.Text("Additional Information") date_rma = fields.Datetime( - string="Order Date", index=True, default=lambda self: self._default_date_rma() + compute="_compute_date_rma", + inverse="_inverse_date_rma", + string="Order Date", + index=True, + default=lambda self: self._default_date_rma(), ) partner_id = fields.Many2one( comodel_name="res.partner", string="Partner", required=True @@ -190,6 +194,26 @@ class RmaOrder(models.Model): self.in_route_id = self.operation_default_id.in_route_id self.out_route_id = self.operation_default_id.out_route_id + @api.depends("rma_line_ids.date_rma") + def _compute_date_rma(self): + """If all order line have same date set date_rma. + If no lines, respect value given by the user. + """ + for rma in self: + if rma.rma_line_ids: + date_rma = rma.rma_line_ids[0].date_rma or False + for rma_line in rma.rma_line_ids: + if rma_line.date_rma != date_rma: + date_rma = False + break + rma.date_rma = date_rma + + def _inverse_date_rma(self): + """When set date_rma set date_rma on all order lines""" + for po in self: + if po.date_rma: + po.rma_line_ids.write({"date_rma": po.date_rma}) + @api.constrains("partner_id", "rma_line_ids") def _check_partner_id(self): if self.rma_line_ids and self.partner_id != self.mapped( diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py index b08fd171..525ba285 100644 --- a/rma/models/rma_order_line.py +++ b/rma/models/rma_order_line.py @@ -242,7 +242,7 @@ class RmaOrderLine(models.Model): states={"draft": [("readonly", False)]}, help="Reference of the document that produced this rma.", ) - date = fields.Datetime( + date_rma = fields.Datetime( string="Order Date", index=True, default=lambda self: self._default_date_rma() ) state = fields.Selection( diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml index eff50667..e0f92723 100644 --- a/rma/views/rma_order_line_view.xml +++ b/rma/views/rma_order_line_view.xml @@ -15,6 +15,7 @@ /> + @@ -40,6 +41,7 @@ /> + @@ -184,6 +186,7 @@ + @@ -385,6 +388,7 @@ +