From 9b2ff6268c240cee2bf07f7348b9c2ec90c9da97 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sat, 18 May 2024 16:08:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=80=BB=E7=9B=91=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_warehouse/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv index 251fd5bf..f981d477 100644 --- a/sf_warehouse/security/ir.model.access.csv +++ b/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 From 2e151a2292ed4a8951f406f8f72acb2b480fad50 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sat, 18 May 2024 16:14:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=AD=E6=8E=A7=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/agv_setting.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sf_manufacturing/models/agv_setting.py b/sf_manufacturing/models/agv_setting.py index 8526627c..a6724e25 100644 --- a/sf_manufacturing/models/agv_setting.py +++ b/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('接口内容') From 9f2415cfac45d4912f7f5d86c64b92a3ad4f62f7 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sat, 18 May 2024 16:45:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BB=B6?= =?UTF-8?q?=E8=A3=85=E5=A4=B9=E5=B2=97=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 79d5348a..088e6bf7 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/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', From debd788864f6a27b350884ff542e45cb70e5bd1b Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sat, 18 May 2024 16:46:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_sale/models/quick_easy_order_old.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py index 768c483c..dc4c588f 100644 --- a/sf_sale/models/quick_easy_order_old.py +++ b/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(