1、报价、销售订单列表视图添加平台订单号字段。2、销售订单详情的采购链接按采购类型拆分为委外加工和采购的跳转链接;
This commit is contained in:
@@ -27,7 +27,7 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
|
||||
bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
|
||||
order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
|
||||
company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
|
||||
kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], state='draft')
|
||||
kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft')
|
||||
i = 1
|
||||
# 给sale_order的default_code字段赋值
|
||||
# aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
||||
|
||||
@@ -58,9 +58,11 @@ class ReSaleOrder(models.Model):
|
||||
delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
|
||||
tracking=True)
|
||||
|
||||
order_code = fields.Char('平台订单号', readonly=True)
|
||||
|
||||
# 业务平台分配工厂后在智能工厂先创建销售订单
|
||||
def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
|
||||
deadline_of_delivery, payments_way, pay_way, state='sale'):
|
||||
deadline_of_delivery, payments_way, pay_way, order_number, state='sale'):
|
||||
now_time = datetime.datetime.now()
|
||||
partner = self.get_customer()
|
||||
data = {
|
||||
@@ -76,6 +78,7 @@ class ReSaleOrder(models.Model):
|
||||
'address_of_delivery': delivery_address,
|
||||
'payments_way': payments_way,
|
||||
'pay_way': pay_way,
|
||||
'order_code': order_number,
|
||||
}
|
||||
if deadline_of_delivery:
|
||||
# deadline_of_delivery字段存在为false字符串情况
|
||||
@@ -158,6 +161,68 @@ class ReSaleOrder(models.Model):
|
||||
if not line.tax_id:
|
||||
raise UserError('请对【订单行】中的【税】进行选择')
|
||||
|
||||
consignment_purchase_order_count = fields.Integer(
|
||||
"Number of consignment Purchase Order Generated",
|
||||
compute='_compute_purchase_order_count')
|
||||
|
||||
@api.depends('order_line.purchase_line_ids.order_id')
|
||||
def _compute_purchase_order_count(self):
|
||||
for order in self:
|
||||
order.purchase_order_count = len(order._get_purchase_orders().filtered(
|
||||
lambda po: po.purchase_type not in ['consignment']))
|
||||
order.consignment_purchase_order_count = len(order._get_purchase_orders().filtered(
|
||||
lambda po: po.purchase_type in ['consignment']))
|
||||
|
||||
def action_view_purchase_orders(self):
|
||||
"""
|
||||
采购
|
||||
"""
|
||||
self.ensure_one()
|
||||
purchase_order_ids = self._get_purchase_orders().filtered(
|
||||
lambda po: po.purchase_type not in ['consignment']).ids
|
||||
action = {
|
||||
'res_model': 'purchase.order',
|
||||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
if len(purchase_order_ids) == 1:
|
||||
action.update({
|
||||
'view_mode': 'form',
|
||||
'res_id': purchase_order_ids[0],
|
||||
})
|
||||
else:
|
||||
action.update({
|
||||
'name': _("从 %s生成采购订单", self.name),
|
||||
'domain': [('id', 'in', purchase_order_ids)],
|
||||
'view_mode': 'tree,form',
|
||||
})
|
||||
return action
|
||||
|
||||
def action_view_consignment_purchase_orders(self):
|
||||
"""
|
||||
委外加工
|
||||
"""
|
||||
self.ensure_one()
|
||||
consignment_purchase_order_ids = self._get_purchase_orders().filtered(
|
||||
lambda po: po.purchase_type in ['consignment']).ids
|
||||
action = {
|
||||
'res_model': 'purchase.order',
|
||||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
if len(consignment_purchase_order_ids) == 1:
|
||||
action.update({
|
||||
'view_mode': 'form',
|
||||
'res_id': consignment_purchase_order_ids[0],
|
||||
})
|
||||
else:
|
||||
action.update({
|
||||
'name': _("从 %s生成委外加工订单", self.name),
|
||||
'domain': [('id', 'in', consignment_purchase_order_ids)],
|
||||
'view_mode': 'tree,form',
|
||||
})
|
||||
return action
|
||||
|
||||
|
||||
|
||||
|
||||
class ResaleOrderLine(models.Model):
|
||||
_inherit = 'sale.order.line'
|
||||
|
||||
@@ -170,7 +170,25 @@
|
||||
<field name="is_incoming_material"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='date_order']" position="attributes">
|
||||
<attribute name="string">下单时间</attribute>
|
||||
<attribute name="string">下单日期</attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="sale_order_inherited_form_purchase_sf" model="ir.ui.view">
|
||||
<field name="name">sale.order.inherited.form.purchase</field>
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale_purchase.sale_order_inherited_form_purchase"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//button[@name='action_view_purchase_orders']" position="before">
|
||||
<button class="oe_stat_button" name="action_view_consignment_purchase_orders" type="object" icon="fa-credit-card"
|
||||
groups='purchase.group_purchase_user'
|
||||
attrs="{'invisible': [('consignment_purchase_order_count', '=', 0)]}">
|
||||
<div class="o_field_widget o_stat_info">
|
||||
<span class="o_stat_value"><field name="consignment_purchase_order_count"/></span>
|
||||
<span class="o_stat_text">委外加工</span>
|
||||
</div>
|
||||
</button>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
@@ -180,9 +198,6 @@
|
||||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale_management.sale_order_form_quote"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="date_order" position="attributes">
|
||||
<attribute name="string">下单日期</attribute>
|
||||
</field>
|
||||
<field name="sale_order_template_id" position="after">
|
||||
<field name="remark" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
|
||||
</field>
|
||||
@@ -224,6 +239,7 @@
|
||||
<attribute name="optional">hide</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='create_date']" position="after">
|
||||
<field name="order_code"/>
|
||||
<field name="deadline_of_delivery"/>
|
||||
</xpath>
|
||||
<!-- <field name="state" position="after">
|
||||
@@ -268,6 +284,7 @@
|
||||
<field name="delivery_warning" invisible="1"/>
|
||||
</field>
|
||||
<xpath expr="//field[@name='date_order']" position="after">
|
||||
<field name="order_code"/>
|
||||
<field name="deadline_of_delivery"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='activity_ids']" position="attributes">
|
||||
|
||||
Reference in New Issue
Block a user