diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml index 10700231..7bda0168 100644 --- a/sf_manufacturing/views/sale_order_views.xml +++ b/sf_manufacturing/views/sale_order_views.xml @@ -71,7 +71,7 @@ - {'search_default_draft': 1} + {'search_default_supply_method': 1} diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 09dc24dd..1c8480dd 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -150,6 +150,7 @@ class ReSaleOrder(models.Model): 'is_incoming_material': True if item.get('embryo_redundancy_id') else False, 'manual_quotation': item.get('manual_quotation'), 'model_id': item['model_id'], + 'delivery_end_date': item['delivery_end_date'], } return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals) @@ -272,6 +273,8 @@ class ResaleOrderLine(models.Model): model_url = fields.Char('模型文件地址') model_id = fields.Char('模型id') + delivery_end_date = fields.Date('交货截止日期') + @api.depends('embryo_redundancy_id') def _compute_is_incoming_material(self): for line in self: diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 6a5f839b..704f9e5e 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -136,6 +136,10 @@ hide + + + + {'readonly': [('state', 'in', ['cancel','sale'])]}