Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

# Conflicts: # sf_manufacturing/models/stock.py
2023-11-20 17:41:51 +08:00
parent d53e664881 31f07c5156
commit 7391b1324d
15 changed files with 65 additions and 175 deletions
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -11,7 +11,6 @@ from odoo import SUPERUSER_ID, _, api, fields, models
 from odoo.tools import float_compare
 from odoo.addons.stock.models.stock_rule import ProcurementException
 from odoo.addons.sf_base.commons.common import Common
-from odoo.exceptions import ValidationError, UserError
 from odoo.exceptions import UserError