解决冲突

2025-02-20 13:51:24 +08:00
parent 05dac9fb0c cb2777ba3e
commit 52e585e637
55 changed files with 760 additions and 751 deletions
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -132,7 +132,7 @@ class ReSaleOrder(models.Model):
            'name': '%s/%s/%s/%s/%s/%s' % (
                self.format_float(product.model_long),
                self.format_float(product.model_width),
-                self.format_float(product.model_height), 
+                self.format_float(product.model_height),
                self.format_float(product.model_volume),
                machining_accuracy_name,
                product.materials_id.name),