解决冲突

sf_sale/models/quick_easy_order_old.py

@@ -228,6 +228,7 @@ class QuickEasyOrder(models.Model):
                     'quality_standard_mimetype': '',
                     'machining_drawings': item.machining_drawings,
                     'quality_standard': '',
+                    'part_name': '',
                 })
             # res['bfm_process_order_list'] = json.dumps(res['bfm_process_order_list'])
             product_id = self.env.ref('sf_dlm.product_template_sf').sudo()

sf_sale/models/sale_order.py

@@ -208,7 +208,8 @@ class RePurchaseOrder(models.Model):
         compute='_compute_user_id',
         store=True)
 
-    purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型', default='standard')
+    purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型',
+                                     default='standard')
 
     @api.depends('partner_id')
     def _compute_user_id(self):
@@ -273,6 +274,7 @@ class RePurchaseOrder(models.Model):
                 'partner_id': server_template.seller_ids.partner_id.id,
                 'origin': ','.join(production_process),
                 'state': 'draft',
+                'purchase_type': 'consignment',
                 'order_line': server_product_process})
             # self.env.cr.commit()
 

sf_sale/views/purchase_order_view.xml

@@ -218,6 +218,7 @@
             <field name="context">
                 {"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1}
             </field>
+            <field name="view_mode">tree,kanban,form,activity</field>
         </record>
     </data>
 </odoo>

sf_sale/views/quick_easy_order_view.xml

@@ -74,7 +74,7 @@
                                 <!--                                <field name="process_id"/>-->
                                 <field name="parameter_ids" widget="many2many_tags" string="表面工艺参数"
                                        options="{'no_create': True}"/>
-                                <field name="machining_precision" required="1"/>
+<!--                                <field name="machining_precision" required="1"/>-->
                                 <field name="processing_time"/>
                                 <field name="quantity" options="{'format': false}"/>
                                 <field name="unit_price"/>

sf_sale/views/sale_order_view.xml

@@ -95,7 +95,7 @@
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
                 </field>
                 <field name="payment_term_id" position="after">
-                    <field name="deadline_of_delivery"  readonly="0"/>
+                    <field name="deadline_of_delivery" readonly="0"/>
                     <field name="payments_way" invisible="1"/>
                     <field name="pay_way" invisible="1"/>
                     <!--                     <field name="schedule_status" readonly="1"/> -->
@@ -283,6 +283,8 @@
             </field>
         </record>
         <record id="sale.product_template_action" model="ir.actions.act_window">
+            <field name="view_mode">tree,kanban,form,activity</field>
+            <field name="view_id" ref="product.product_template_tree_view"/>
             <field name="context">{"search_default_categ_id":1,
                 "search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}
             </field>