Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

2023-10-23 17:36:15 +08:00
parent dc8aecba93
commit 919a200750
13 changed files with 372 additions and 10 deletions
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -239,7 +239,6 @@ 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('工厂创建销售订单和产品失败，请联系管理员')