Merge branch 'feature/修复采购总监权限' into develop

sf_manufacturing/models/agv_setting.py

@@ -60,6 +60,7 @@ class AgvTaskRoute(models.Model):
 class Center_controlInterfaceLog(models.Model):
     _name = 'center_control.interface.log'
     _description = '中控接口调用日志'
+    _order = 'id desc'
 
     name = fields.Char('接口名称')
     content = fields.Char('接口内容')

sf_manufacturing/models/mrp_workorder.py

@@ -877,7 +877,7 @@ class ResMrpWorkOrder(models.Model):
                                 'product_qty': 1,
                                 'product_uom': server_product.uom_id.id
                             }))
-                            self.env['purchase.order'].create({
+                            self.env['purchase.order'].sudo().create({
                                 'partner_id': server_product.seller_ids.partner_id.id,
                                 'origin': record.production_id.name,
                                 'state': 'draft',

sf_sale/models/quick_easy_order_old.py

@@ -222,7 +222,7 @@ class QuickEasyOrder(models.Model):
                             self_machining_id,
                             item, order_id,
                             'self_machining',
-                            i)
+                            i, False)
                         # 创建坯料的bom
                         self_machining_bom = self.env['mrp.bom'].bom_create(self_machining_embryo, 'normal', False)
                         # 创建坯料里bom的组件
@@ -237,7 +237,8 @@ class QuickEasyOrder(models.Model):
                         # 创建坯料
                         outsource_embryo = self.env['product.template'].sudo().no_bom_product_create(outsource_id, item,
                                                                                                      order_id,
-                                                                                                     'subcontract', i)
+                                                                                                     'subcontract', i,
+                                                                                                     False)
                         if outsource_embryo == -3:
                             self.cr.rollback()
                             return UserError(
@@ -256,7 +257,8 @@ class QuickEasyOrder(models.Model):
                     elif product.materials_type_id.gain_way == '采购':
                         purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id, item,
                                                                                                     order_id,
-                                                                                                    'purchase', i)
+                                                                                                    'purchase', i,
+                                                                                                    False)
                         if purchase_embryo == -3:
                             self.cr.rollback()
                             return UserError(

sf_warehouse/security/ir.model.access.csv

@@ -112,7 +112,7 @@ access_stock_inventory_warning,stock.inventory.warning,stock.model_stock_invento
 access_stock_inventory_adjustment_name,stock.inventory.adjustment.name,stock.model_stock_inventory_adjustment_name,sf_base.group_plan_dispatch,1,0,0,0
 
 access_mrp_production_group_purchase,mrp_production_group_purchase,mrp.model_mrp_production,sf_base.group_purchase,1,0,0,0
-access_mrp_production_group_purchase_director,mrp_production_group_purchase_director,mrp.model_mrp_production,sf_base.group_purchase_director,1,0,1,0
+access_mrp_production_group_purchase_director,mrp_production_group_purchase_director,mrp.model_mrp_production,sf_base.group_purchase_director,1,1,1,0
 access_mrp_workorder_group_purchase,mrp_workorder_group_purchase,mrp.model_mrp_workorder,sf_base.group_purchase,1,0,0,0
 access_mrp_workorder_group_purchase_director,mrp_workorder_group_purchase_director,mrp.model_mrp_workorder,sf_base.group_purchase_director,1,0,0,0
 access_mrp_unbuild_group_purchase,mrp_unbuild_group_purchase,mrp.model_mrp_unbuild,sf_base.group_purchase,1,0,0,0