提交 4a35904b authored 作者: 贺阳's avatar 贺阳

1、直接创建提单的时候,根据类型,默认客户,以及选择客户的时候进行过滤

2、temu的提单,提单号可以编辑 3、清关员创建附件信息的权限
上级 4a6a9c4f
...@@ -825,8 +825,25 @@ class CcBL(models.Model): ...@@ -825,8 +825,25 @@ class CcBL(models.Model):
bl.bl_ship_package_qty = len(ship_package_ids) bl.bl_ship_package_qty = len(ship_package_ids)
bl.bl_total_qty = len(bl.good_ids.filtered(lambda good: not good.is_cancel)) bl.bl_total_qty = len(bl.good_ids.filtered(lambda good: not good.is_cancel))
def get_default_partner(self):
"""
获取默认的客户
:return:
"""
print(self._context)
type = self._context.get('default_bl_type', 'tk')
partner_ids = self.env['res.partner'].get_type_partner(type)
if partner_ids:
return partner_ids[0]
return False
def get_customer_domain(self):
type = self._context.get('default_bl_type', 'tk')
return [('platform_type', '=', type)]
# 所属客户 # 所属客户
customer_id = fields.Many2one('res.partner', string='Customer') customer_id = fields.Many2one('res.partner', string='Customer', index=True, default=get_default_partner,
domain=lambda self: self.get_customer_domain())
# 大包明细 # 大包明细
big_package_ids = fields.One2many('cc.big.package', 'bl_id', string='Big Packages') big_package_ids = fields.One2many('cc.big.package', 'bl_id', string='Big Packages')
......
...@@ -20,3 +20,13 @@ class ResPartner(models.Model): ...@@ -20,3 +20,13 @@ class ResPartner(models.Model):
('tk', 'TK Platform'), ('tk', 'TK Platform'),
('temu', 'TEMU Platform'), ('temu', 'TEMU Platform'),
], string='Platform Type', default='tk') ], string='Platform Type', default='tk')
def get_type_partner(self, type='tk'):
"""
获取默认的TEMU平台客户
:return:
"""
partner_ids = self.env['res.partner'].search([('platform_type', '=', type)])
if partner_ids:
return partner_ids[0]
return False
...@@ -67,7 +67,7 @@ access_cc_big_package_ccs_base.group_clearance_of_customs_manager,cc_big_package ...@@ -67,7 +67,7 @@ access_cc_big_package_ccs_base.group_clearance_of_customs_manager,cc_big_package
access_cc_clearance_file_base.group_user,cc_clearance_file base.group_user,ccs_base.model_cc_clearance_file,base.group_user,1,0,0,0 access_cc_clearance_file_base.group_user,cc_clearance_file base.group_user,ccs_base.model_cc_clearance_file,base.group_user,1,0,0,0
access_cc_clearance_file_base.group_erp_manager,cc_clearance_file base.group_erp_manager,ccs_base.model_cc_clearance_file,base.group_erp_manager,1,1,1,1 access_cc_clearance_file_base.group_erp_manager,cc_clearance_file base.group_erp_manager,ccs_base.model_cc_clearance_file,base.group_erp_manager,1,1,1,1
access_cc_clearance_file_ccs_base.group_clearance_of_customs_manager,cc_clearance_file ccs_base.group_clearance_of_customs_manager,ccs_base.model_cc_clearance_file,ccs_base.group_clearance_of_customs_manager,1,1,1,1 access_cc_clearance_file_ccs_base.group_clearance_of_customs_manager,cc_clearance_file ccs_base.group_clearance_of_customs_manager,ccs_base.model_cc_clearance_file,ccs_base.group_clearance_of_customs_manager,1,1,1,1
access_cc_clearance_file_ccs_base.group_clearance_of_customs_user,cc_clearance_file ccs_base.group_clearance_of_customs_user,ccs_base.model_cc_clearance_file,ccs_base.group_clearance_of_customs_user,1,0,0,0 access_cc_clearance_file_ccs_base.group_clearance_of_customs_user,cc_clearance_file ccs_base.group_clearance_of_customs_user,ccs_base.model_cc_clearance_file,ccs_base.group_clearance_of_customs_user,1,1,1,1
order_state_change_rule_group_user,order_state_change_rule_group_user,ccs_base.model_order_state_change_rule,base.group_user,1,1,1,1 order_state_change_rule_group_user,order_state_change_rule_group_user,ccs_base.model_order_state_change_rule,base.group_user,1,1,1,1
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<field name="is_history" invisible="1"/> <field name="is_history" invisible="1"/>
<label for="bl_no"/> <label for="bl_no"/>
<h1> <h1>
<field name="bl_no" readonly="True"/> <field name="bl_no" attrs="{'readonly': [('bl_type', '=', 'tk')]}"/>
</h1> </h1>
<group> <group>
<group> <group>
...@@ -342,10 +342,9 @@ ...@@ -342,10 +342,9 @@
<field name="res_model">cc.bl</field> <field name="res_model">cc.bl</field>
<field name="view_mode">tree,form,pivot,graph,calendar</field> <field name="view_mode">tree,form,pivot,graph,calendar</field>
<field name="domain">[('bl_type','=','temu')]</field> <field name="domain">[('bl_type','=','temu')]</field>
<field name="context">{'default_bl_type':'temu'}</field>
<field name="view_id" ref="tree_cc_bl_view"/> <field name="view_id" ref="tree_cc_bl_view"/>
<!-- <field name="view_id" ref="tree_temu_cc_bl_view"/> --> <!-- <field name="view_id" ref="tree_temu_cc_bl_view"/> -->
<field name="context">{'search_default_filter_state_not_finished':1}</field> <field name="context">{'search_default_filter_state_not_finished':1,'default_bl_type':'temu'}</field>
<field name="help" type="html"> <field name="help" type="html">
<p> <p>
</p> </p>
......
...@@ -23,6 +23,17 @@ ...@@ -23,6 +23,17 @@
</field> </field>
</record> </record>
<record id="view_res_partner_filter" model="ir.ui.view">
<field name="name">view_res_partner_filter</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_res_partner_filter"/>
<field name="arch" type="xml">
<xpath expr="//filter[@name='group_country']" position="after">
<filter name="group_platform_type" context="{'group_by': 'platform_type'}"/>
</xpath>
</field>
</record>
<!-- # 增加一个"客户"action, 仅显示为客户的partner,显示模式为树,表单--> <!-- # 增加一个"客户"action, 仅显示为客户的partner,显示模式为树,表单-->
<record model="ir.actions.act_window" id="action_cc_partner"> <record model="ir.actions.act_window" id="action_cc_partner">
<field name="name">Customers</field> <field name="name">Customers</field>
......
...@@ -31,16 +31,6 @@ class BatchGetPodInfoWizard(models.TransientModel): ...@@ -31,16 +31,6 @@ class BatchGetPodInfoWizard(models.TransientModel):
order_id = [self._context.get('active_id')] order_id = [self._context.get('active_id')]
return self.env['cc.bl'].browse(order_id) return self.env['cc.bl'].browse(order_id)
def get_temu_partner(self):
"""
获取默认的TEMU平台客户
:return:
"""
partner_ids = self.env['res.partner'].search([('platform_type', '=', 'temu')])
if partner_ids:
return partner_ids[0]
return False
action_type = fields.Selection([ action_type = fields.Selection([
('获取尾程POD信息', '获取尾程POD信息'), ('获取尾程POD信息', '获取尾程POD信息'),
('创建temu提单', '创建temu提单'), ('创建temu提单', '创建temu提单'),
...@@ -51,8 +41,8 @@ class BatchGetPodInfoWizard(models.TransientModel): ...@@ -51,8 +41,8 @@ class BatchGetPodInfoWizard(models.TransientModel):
partner_id = fields.Many2one( partner_id = fields.Many2one(
'res.partner', 'res.partner',
string='Customer', # 客户 string='Customer', # 客户
default=lambda self: self.get_temu_partner(), default=lambda self: self.env['res.partner'].get_type_partner('temu'),
domain="[('is_customer', '=', True), ('platform_type', '=', 'temu')]"
) )
# 提单号:可输入多个,一行一个 # 提单号:可输入多个,一行一个
bl_numbers = fields.Text( bl_numbers = fields.Text(
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<group> <group>
<group> <group>
<field name="partner_id" options="{'no_create':True}" <field name="partner_id" options="{'no_create':True}"
domain="[('is_customer', '=', True), ('platform_type', '=', 'temu')]"
attrs="{'invisible': [('action_type', '!=', '创建temu提单')]}"/> attrs="{'invisible': [('action_type', '!=', '创建temu提单')]}"/>
<!-- 请输入提单号,可输入多个,一行一个 --> <!-- 请输入提单号,可输入多个,一行一个 -->
<field name="bl_numbers" <field name="bl_numbers"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论