diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py
index 45c95030..0ca6457c 100644
--- a/sf_sale/__manifest__.py
+++ b/sf_sale/__manifest__.py
@@ -26,6 +26,7 @@
'assets': {
'web.assets_backend': [
'sf_sale/static/js/setTableWidth.js',
+ 'sf_sale/static/src/css/purchase_list.css',
]
},
'demo': [
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 11fa0096..a0e321a0 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -55,8 +55,9 @@ class ReSaleOrder(models.Model):
store=True, readonly=False, copy=False, precompute=True,
states=READONLY_FIELD_STATES, default=fields.Datetime.now)
- delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
- tracking=True)
+ delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')],
+ default='normal',
+ string='时效', tracking=True)
order_code = fields.Char('平台订单号', readonly=True)
@@ -278,8 +279,9 @@ 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', '委外加工'), ('outsourcing', '工序外协'), ('outside', '外购订单')],
+ string='采购类型', default='standard')
origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
diff --git a/sf_sale/static/src/css/purchase_list.css b/sf_sale/static/src/css/purchase_list.css
new file mode 100644
index 00000000..2deacb9c
--- /dev/null
+++ b/sf_sale/static/src/css/purchase_list.css
@@ -0,0 +1,3 @@
+.purchase_order_list_name {
+ min-width: 62px !important;
+}
\ No newline at end of file
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 28890cbd..f70dbb6d 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -235,6 +235,9 @@
+
+ purchase_order_list_name
+
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 641e4278..4373689d 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -261,6 +261,10 @@
+
+
+
+
@@ -293,6 +297,9 @@
+
+
+