jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1666: (feature/制造功能优化 -> develop)

Browse Source 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1666?initial=true
This commit is contained in:
马广威
2024-12-30 10:02:51 +08:00
committed by Coding
parent da75a8cd35 ad885f1e39
commit 67f4917491
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jikimo_purchase_tier_validation/views/views.xml
View File

@@ -16,7 +16,7 @@
<xpath expr="//header/button[@name='action_rfq_send'][1]" position="before"> <xpath expr="//header/button[@name='action_rfq_send'][1]" position="before">
<field name="validation_status" invisible="1"/> <field name="validation_status" invisible="1"/>
<field name="is_upload_contract_file" invisible="1"/> <field name="is_upload_contract_file" invisible="1"/>
<button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', True)]}"/> <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', '|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', True), ('state', 'not in', ['draft', 'sent'])]}"/>]}"/>
<button name="delete_contract_file" string="删除合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', False)]}"/> <button name="delete_contract_file" string="删除合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', False)]}"/>
</xpath> </xpath>
<xpath expr="//notebook/page[1]" position="before"> <xpath expr="//notebook/page[1]" position="before">

3
sf_sale/models/sale_order.py
View File

@@ -292,6 +292,9 @@ class RePurchaseOrder(models.Model):
# 合同概况 # 合同概况
contract_summary = fields.Text(string='合同概况') contract_summary = fields.Text(string='合同概况')
# 选择是否为紧急采购
urgent_purchase = fields.Selection([('no', '否'), ('yes', '是')], string='紧急采购', default='no')
@api.depends('origin') @api.depends('origin')
def _compute_purchase_type(self): def _compute_purchase_type(self):
for purchase in self: for purchase in self:

1
sf_sale/views/purchase_order_view.xml
View File

@@ -181,6 +181,7 @@
<field name="partner_id" position="after"> <field name="partner_id" position="after">
<field name="purchase_type" string="采购类型" readonly="1"/> <field name="purchase_type" string="采购类型" readonly="1"/>
<field name="picking_type_id" string="作业类型" domain="[('code','=','incoming'), '|', ('warehouse_id', '=', False), ('warehouse_id.company_id', '=', company_id)]" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/> <field name="picking_type_id" string="作业类型" domain="[('code','=','incoming'), '|', ('warehouse_id', '=', False), ('warehouse_id.company_id', '=', company_id)]" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
<field name="urgent_purchase"/>
<label for="date_planned" string="最近交货日期"/> <label for="date_planned" string="最近交货日期"/>
<div name="date_planned_div" class="o_row"> <div name="date_planned_div" class="o_row">
<field name="date_planned" attrs="{'readonly': [('state', 'not in', ('draft', 'sent', 'to approve', 'purchase'))]}"/> <field name="date_planned" attrs="{'readonly': [('state', 'not in', ('draft', 'sent', 'to approve', 'purchase'))]}"/>