diff --git a/models/sale_order.py b/models/sale_order.py index 2a39c4063a0b102ea6d136a2e48f4025a5c6e20a..7cd028c1060cd40f53f70e7ad70ace7e057b3860 100644 --- a/models/sale_order.py +++ b/models/sale_order.py @@ -13,17 +13,19 @@ class SaleOrder(models.Model): def clean_sale_order(self): super(SaleOrder, self).clean_sale_order() sol_line_section = self.order_line.filtered( - lambda s: s.display_type == 'line_section' and s.sale_project_id is not None + lambda s: s.display_type == "line_section" and s.sale_project_id is not None ) for sol_section in sol_line_section: next_sol = False for sol in self.order_line.sorted(key=lambda r: (r.sequence, r.id)): - if sol.sequence > sol_section.sequence \ - or (sol.sequence == sol_section.sequence - and sol.id > sol_section.id): + if sol.sequence > sol_section.sequence or ( + sol.sequence == sol_section.sequence and sol.id > sol_section.id + ): next_sol = sol break - if not next_sol or\ - next_sol.sale_project_id != sol_section.sale_project_id \ - or not next_sol.product_id: + if ( + not next_sol + or next_sol.sale_project_id != sol_section.sale_project_id + or not next_sol.product_id + ): sol_section.unlink() diff --git a/models/sale_project.py b/models/sale_project.py index 8493b1b6350f3e63a4030a65bc480fb8a955b371..b9b5a849385cc69e03aa609cf8b345fbc3e1bea7 100644 --- a/models/sale_project.py +++ b/models/sale_project.py @@ -21,7 +21,7 @@ class SaleProject(models.Model): vat_furniture_categ = ( self.env["product.category"].browse(furniture_categ_id.id).taxes_id ) - lines = self.env['sale.intervention'].read_group( + lines = self.env["sale.intervention"].read_group( (("project_id", "=", self.id),), ("price", "intervention_length", "plant_qty"), "intervention_type_id", @@ -89,9 +89,7 @@ class SaleProject(models.Model): "product_uom_qty": quantity, "sale_project_id": self.id, } - sol_name = ( - "Projet " + self.name + " - " + product_tmpl.name - ) + sol_name = "Projet " + self.name + " - " + product_tmpl.name sols.append( { **data_sol_section,