Merge branch 'develop' into feature/sale_order_route_pick
This commit is contained in:
@@ -32,9 +32,9 @@ class ReSaleOrder(models.Model):
|
||||
tracking=3,
|
||||
default='draft')
|
||||
deadline_of_delivery = fields.Date('订单交期', tracking=True)
|
||||
person_of_delivery = fields.Char('收货人')
|
||||
telephone_of_delivery = fields.Char('电话号码')
|
||||
address_of_delivery = fields.Char('联系地址')
|
||||
# person_of_delivery = fields.Char('收货人')
|
||||
# telephone_of_delivery = fields.Char('电话号码')
|
||||
# address_of_delivery = fields.Char('联系地址')
|
||||
payments_way = fields.Selection([('现结', '现结'), ('月结', '月结')], '结算方式', default='现结', tracking=True)
|
||||
pay_way = fields.Selection([('转账', '转账'), ('微信', '微信'), ('支付宝', '支付宝')], '支付方式')
|
||||
check_status = fields.Selection([('pending', '待审核'), ('approved', '已审核'), ('fail', '不通过')], '审核状态')
|
||||
|
||||
Reference in New Issue
Block a user