1.修复采购总监审核采购单审核不通过后-还显示【审核】按钮2.新增采购总监审核采购单审核不通过后-还显示【审核】按钮3.产品详情界面的删除按钮要隐藏

sf_dlm/data/product_data.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data noupdate="1">
         <record id="product_category_embryo_sf" model="product.category">
             <field name="name">坯料</field>
             <field name="type">坯料</field>
@@ -35,10 +34,15 @@
             <field name="type">功能刀具</field>
         </record>
 
-         <record id="res_partner_bfm" model="res.partner">
-            <field name="name">业务平台</field>
-<!--            <field name="company_id" ref="base.main_company"/>-->
-        </record>
+<!--        <record id="res_partner_bfm" model="res.partner">-->
+<!--            <field name="name">业务平台</field>-->
+<!--            &lt;!&ndash;            <field name="company_id" ref="base.main_company"/>&ndash;&gt;-->
+<!--        </record>-->
+
+<!--        <record id="res_users_bfm" model="res.users">-->
+<!--            <field name="name">业务平台</field>-->
+<!--            <field name="partner_id" ref="res_partner_bfm"/>-->
+<!--        </record>-->
 
         <record id="product_functional_tool_sf" model="product.product">
             <field name="name">功能刀具</field>

sf_manufacturing/models/mrp_production.py

@@ -247,7 +247,7 @@ class MrpProduction(models.Model):
                         'state': 'pending',
                     }]
             if production.product_id.categ_id.type == '成品':
-                production.fetchCNC()
+                # production.fetchCNC()
                 # 根据加工面板的面数及对应的工序模板生成工单
                 i = 0
                 processing_panel_len = len(production.product_id.model_processing_panel.split(','))

sf_manufacturing/models/mrp_workorder.py

@@ -232,7 +232,7 @@ class ResMrpWorkOrder(models.Model):
             'processing_panel': k,
             'quality_point_ids': route.route_workcenter_id.quality_point_ids,
             'routing_type': route.routing_type,
-            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
+            'work_state': '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
                                                                                route.routing_type,
                                                                                production.product_id),

sf_manufacturing/models/product_template.py

@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):

sf_sale/models/auto_quatotion_common.py

@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+# from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)

sf_sale/models/quick_easy_order.py

@@ -5,8 +5,8 @@ import os
 import json
 from datetime import datetime
 import requests
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError

sf_sale/models/sale_order.py

@@ -7,6 +7,19 @@ from odoo.exceptions import UserError
 class ReSaleOrder(models.Model):
     _inherit = 'sale.order'
 
+    state = fields.Selection(
+        selection=[
+            ('draft', "报价"),
+            ('sent', "报价已发送"),
+            ('sale', "销售订单"),
+            ('done', "已锁定"),
+            ('cancel', '已废弃'),
+        ],
+        string="状态",
+        readonly=True, copy=False, index=True,
+        tracking=3,
+        default='draft')
+
     deadline_of_delivery = fields.Date('订单交期', tracking=True)
     person_of_delivery = fields.Char('交货人')
     telephone_of_delivery = fields.Char('交货人电话号码')
@@ -37,7 +50,8 @@ class ReSaleOrder(models.Model):
             'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
             'partner_id': partner.id,
             'check_status': 'approved',
-            'state': 'draft',
+            'state': 'sale',
+            'user_id': partner.user_id.id,
             'person_of_delivery': delivery_name,
             'telephone_of_delivery': delivery_telephone,
             'address_of_delivery': delivery_address,
@@ -59,11 +73,12 @@ class ReSaleOrder(models.Model):
         self.check_status = 'pending'
 
     def get_customer(self):
-        customer = self.env['res.partner'].search([('name', '=', '业务平台')])
+        customer = self.env['res.partner'].search([('name', '=', '业务平台')], limit=1, order='id asc')
         if customer:
             return customer
         else:
             partner = self.env['res.partner'].create({'name': '业务平台'})
+            self.env['res.users'].create({'name': '业务平台', 'partner_id': partner.id})
             return partner
 
     # 业务平台分配工厂时在创建完产品后再创建销售明细信息
@@ -107,6 +122,10 @@ class ResaleOrderLine(models.Model):
     model_glb_file = fields.Binary('模型的glb文件')
     check_status = fields.Selection(related='order_id.check_status')
 
+    def create(self, vals_list):
+        lines = super(ResaleOrderLine, self).create(vals_list)
+        return lines
+
 
 class RePurchaseOrder(models.Model):
     _inherit = 'purchase.order'

sf_sale/security/ir.model.access.csv

@@ -20,8 +20,8 @@ access_product_template_group_plan_dispatch,product_template_group_plan_dispatch
 access_product_template_group_plan_director,product_template_group_plan_director,product.model_product_template,sf_base.group_plan_director,1,1,1,0
 access_stock_picking_group_sale_salemanager,stock_picking_group_sale_salemanager,stock.model_stock_picking,sf_base.group_sale_salemanager,1,0,0,0
 access_stock_picking_group_sale_director,stock_picking_group_sale_director,stock.model_stock_picking,sf_base.group_sale_director,1,0,0,0
-access_stock_picking_group_purchase,stock_picking_group_purchase,stock.model_stock_picking,sf_base.group_purchase,1,0,0,0
-access_stock_picking_group_purchase_director,stock_picking_group_purchase_director,stock.model_stock_picking,sf_base.group_purchase_director,1,0,0,0
+access_stock_picking_group_purchase,stock_picking_group_purchase,stock.model_stock_picking,sf_base.group_purchase,1,1,1,0
+access_stock_picking_group_purchase_director,stock_picking_group_purchase_director,stock.model_stock_picking,sf_base.group_purchase_director,1,1,1,0
 access_account_move_group_sale_salemanager,account_move_group_sale_salemanager,account.model_account_move,sf_base.group_sale_salemanager,1,0,0,0
 access_account_move_group_sale_director,account_move_group_sale_director,account.model_account_move,sf_base.group_sale_director,1,0,0,0
 access_resource_resource_group_sale_director,resource_resource_group_sale_director,resource.model_resource_resource,sf_base.group_sale_director,1,1,1,0
@@ -33,8 +33,8 @@ access_mrp_bom_group_quality,mrp_bom_group_quality,mrp.model_mrp_bom,sf_base.gro
 access_mrp_bom_group_quality_director,mrp_bom_group_quality_director,mrp.model_mrp_bom,sf_base.group_quality_director,1,0,0,0
 access_stock_move_group_sale_salemanager,stock_move_group_sale_salemanager,stock.model_stock_move,sf_base.group_sale_salemanager,1,0,0,0
 access_stock_move_group_sale_director,stock_move_group_sale_director,stock.model_stock_move,sf_base.group_sale_director,1,0,0,0
-access_stock_move_group_purchase,stock_move_group_purchase,stock.model_stock_move,sf_base.group_purchase,1,0,0,0
-access_stock_move_group_purchase_director,stock_move_group_purchase_director,stock.model_stock_move,sf_base.group_purchase_director,1,0,0,0
+access_stock_move_group_purchase,stock_move_group_purchase,stock.model_stock_move,sf_base.group_purchase,1,1,1,0
+access_stock_move_group_purchase_director,stock_move_group_purchase_director,stock.model_stock_move,sf_base.group_purchase_director,1,1,1,0
 access_stock_warehouse_orderpoint_group_sale_salemanager,stock_warehouse_orderpoint_group_sale_salemanager,stock.model_stock_warehouse_orderpoint,sf_base.group_sale_salemanager,1,0,0,0
 access_stock_warehouse_orderpoint_group_sale_director,stock_warehouse_orderpoint_group_sale_director,stock.model_stock_warehouse_orderpoint,sf_base.group_sale_director,1,0,0,0
 access_stock_warehouse_orderpoint_group_purchase,stock_warehouse_orderpoint_group_purchase,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase,1,1,0,0

sf_sale/views/purchase_order_view.xml

@@ -11,14 +11,14 @@
                 </field>
                 <field name="currency_id" position="after">
                     <field name="check_status" invisible="1"/>
-<!--                    <field name="state"/>-->
+                    <!--                    <field name="state"/>-->
                     <field name="remark" attrs="{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
                         ['pending','approved'])]}"/>
                 </field>
                 <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="after">
                     <button name="sf_sale.action_purchase_order_check_wizard" string="审核" type="action"
                             context="{'default_order_id':active_id}" groups="sf_base.group_purchase_director"
-                            attrs="{'invisible': ['&amp;',('check_status','in', ['approved',False]),('state', 'in', ['purchase'])]}"
+                            attrs="{'invisible': ['&amp;',('check_status','in', ['approved',False,'fail']),('state', 'in', ['purchase'])]}"
                             class="oe_highlight"/>
 
                 </xpath>

sf_sale/views/sale_order_view.xml

@@ -237,6 +237,9 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="sale.product_template_form_view"/>
             <field name="arch" type="xml">
+                <form position="attributes">
+                    <attribute name="delete">False</attribute>
+                </form>
                 <field name="categ_id" position="replace">
                     <field name='categ_id' invisible="1"/>
                 </field>

sf_tool_management/models/base.py

@@ -240,7 +240,7 @@ class FunctionalToolWarning(models.Model):
 class StockMoveLine(models.Model):
     _inherit = 'stock.move.line'
     _description = '功能刀具出入库记录'
-    _order = 'install_tool_time desc'
+    # _order = 'install_tool_time desc'
 
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称')
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,