Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_manufacturing/models/stock.py

@@ -715,15 +715,15 @@ class ReStockMove(models.Model):
 class ReStockQuant(models.Model):
     _inherit = 'stock.quant'
 
-    def action_apply_inventory(self):
-        inventory_diff_quantity = self.inventory_diff_quantity
-        super(ReStockQuant, self).action_apply_inventory()
-        if inventory_diff_quantity >= 1:
-            stock = self.env['stock.move'].search([('product_id', '=', self.product_id.id), ('is_inventory', '=', True),
-                                                   ('reference', '=', '更新的产品数量'), ('state', '=', 'done')],
-                                                  limit=1, order='id desc')
-            if self.product_id.categ_type == '夹具':
-                stock._register_fixture()
-            elif self.product_id.categ_type == '刀具':
-                stock._register_cutting_tool()
-        return True
+    # def action_apply_inventory(self):
+    #     inventory_diff_quantity = self.inventory_diff_quantity
+    #     super(ReStockQuant, self).action_apply_inventory()
+    #     if inventory_diff_quantity >= 1:
+    #         stock = self.env['stock.move'].search([('product_id', '=', self.product_id.id), ('is_inventory', '=', True),
+    #                                                ('reference', '=', '更新的产品数量'), ('state', '=', 'done')],
+    #                                               limit=1, order='id desc')
+    #         if self.product_id.categ_type == '夹具':
+    #             stock._register_fixture()
+    #         elif self.product_id.categ_type == '刀具':
+    #             stock._register_cutting_tool()
+    #     return True

sf_manufacturing/security/ir.model.access.csv

@@ -135,6 +135,7 @@ access_sf_agv_site_group_sf_order_user,sf_agv_site_group_sf_order_user,model_sf_
 access_sf_agv_task_route_group_sf_order_user,sf_agv_task_route_group_sf_order_user,model_sf_agv_task_route,sf_base.group_sf_order_user,1,1,1,0
 access_center_control_interface_log_admin,center_control_interface_log_admin,model_center_control_interface_log,base.group_system,1,1,1,0
 
-access_sf_model_type_group_sf_stock_manager,sf_model_type_group_sf_mrp_manager,model_sf_model_type,sf_warehouse.group_sf_stock_manager,1,0,0,0
-access_mrp_bom_byproduct_group_sf_stock_manager,mrp_bom_byproduct_group_sf_mrp_manager,mrp.model_mrp_bom_byproduct,sf_warehouse.group_sf_stock_manager,1,0,0,0
+access_sf_model_type_group_sf_stock_manager,sf_model_type_group_sf_mrp_manager,model_sf_model_type,sf_base.group_sf_stock_manager,1,0,0,0
+access_mrp_bom_byproduct_group_sf_stock_user,mrp_bom_byproduct_group_sf_stock_user,mrp.model_mrp_bom_byproduct,sf_base.group_sf_stock_user,1,0,0,0
+access_mrp_bom_byproduct_group_sf_stock_manager,mrp_bom_byproduct_group_sf_mrp_manager,mrp.model_mrp_bom_byproduct,sf_base.group_sf_stock_manager,1,0,0,0