Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts: # sf_warehouse/security/ir.model.access.csv
2024-03-01 11:34:59 +08:00
parent 4185b79e0d 3f037b2051
commit b73e46dbc4
31 changed files with 766 additions and 404 deletions
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -310,7 +310,7 @@ class SfShelf(models.Model):
 class ShelfLocation(models.Model):
    _name = 'sf.shelf.location'
    _description = '货位'
-    _order = 'name'
+    _order = 'name, id'

    # current_location_id = fields.Many2one('sf.shelf.location', string='当前位置')
    # # 目的位置
--- a/sf_warehouse/security/ir.model.access.csv
+++ b/sf_warehouse/security/ir.model.access.csv
@@ -35,6 +35,7 @@ access_product_tag_stock_manager_group_sf_stock_user,product.tag.stock.manager,p
 access_stock_warehouse_orderpoint_group_sf_stock_user,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,sf_warehouse.group_sf_stock_user,1,0,0,0
 access_stock_warehouse_orderpoint_system_group_sf_stock_user,stock.warehouse.orderpoint system,stock.model_stock_warehouse_orderpoint,sf_warehouse.group_sf_stock_user,1,1,1,0
 access_stock_quant_user_group_sf_stock_user,stock.quant user,stock.model_stock_quant,sf_warehouse.group_sf_stock_user,1,1,1,0
+
 access_stock_quant_all,stock.quant all users,stock.model_stock_quant,base.group_user,1,0,0,0
 access_stock_quant_package_all,stock.quant.package all users,stock.model_stock_quant_package,base.group_user,1,0,0,0
 access_stock_quant_package_stock_manager_group_sf_stock_user,stock.quant.package stock manager,stock.model_stock_quant_package,sf_warehouse.group_sf_stock_user,1,1,1,0