Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

# Conflicts: # sf_sale/models/quick_easy_order.py
2023-10-24 09:59:11 +08:00
parent 093724a277 2b9e768793
commit 4bed65d1df
2 changed files with 13 additions and 12 deletions
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -241,6 +241,7 @@ class QuickEasyOrder(models.Model):
                        product_bom_purchase.bom_create_line_has(purchase_embryo)
                order_id.with_user(self.env.ref("base.user_admin")).sale_order_create_line(product, item)
        except Exception as e:
+            # self.cr.rollback()
            return UserError('工厂创建销售订单和产品失败，请联系管理员')