Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/消息提醒优化
# Conflicts: # sf_sale/views/purchase_order_view.xml
This commit is contained in:
guanhuan
@@ -16,10 +16,11 @@
|
||||
<button name="button_confirm" type="object" states="draft" context="{'validate_analytic': True}"
|
||||
string="Confirm Order" id="draft_confirm"/>
|
||||
<button name="action_view_picking"
|
||||
string="接收产品" class="oe_highlight" type="object"
|
||||
attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('purchase','done')), ('incoming_picking_count', '=', 0)]}"
|
||||
data-hotkey="y" groups="stock.group_stock_user"/>
|
||||
<button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object" data-hotkey="x" />
|
||||
string="接收产品" class="oe_highlight" type="object"
|
||||
attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('purchase','done')), ('incoming_picking_count', '=', 0)]}"
|
||||
data-hotkey="y" groups="stock.group_stock_user"/>
|
||||
<button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object"
|
||||
data-hotkey="x"/>
|
||||
</xpath>
|
||||
<xpath expr="//header/button[@name='button_cancel'][2]" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
@@ -130,6 +131,16 @@
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
|
||||
<attribute name="options">{'no_create': True}</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="attributes">
|
||||
<attribute name="optional">hide</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
|
||||
<field name="part_name" optional="hide"/>
|
||||
<!-- <field name="part_number" optional="show"/>-->
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='date_order']" position="attributes">
|
||||
<attribute name="string">报价截止日期</attribute>
|
||||
</xpath>
|
||||
<field name="partner_ref" position="attributes">
|
||||
<attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}
|
||||
</attribute>
|
||||
@@ -159,10 +170,14 @@
|
||||
</attribute>
|
||||
</field>
|
||||
|
||||
<!-- 添加采购类型字段 -->
|
||||
<!-- 添加采购类型字段 -->
|
||||
<field name="partner_ref" position="after">
|
||||
<field name="purchase_type" string="采购类型" readonly="1"/>
|
||||
</field>
|
||||
<!-- 添加销售订单号字段-->
|
||||
<field name="effective_date" position="after">
|
||||
<field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -174,6 +189,25 @@
|
||||
<xpath expr="//tree//header//button[@name='action_create_invoice']" position="attributes">
|
||||
<attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='user_id']" position="attributes">
|
||||
<attribute name="string">采购员</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='activity_ids']" position="attributes">
|
||||
<attribute name="optional">hide</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='date_order']" position="attributes">
|
||||
<attribute name="string">报价截止日期</attribute>
|
||||
<attribute name="widget">''</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='date_order']" position="after">
|
||||
<field name="date_planned"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='name']" position="after">
|
||||
<field name="purchase_type"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='name']" position="attributes">
|
||||
<attribute name="class">purchase_order_list_name</attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -203,9 +237,24 @@
|
||||
<attribute name="decoration-warning">delivery_warning == 'warning'</attribute>
|
||||
<attribute name="decoration-danger">delivery_warning == 'overdue'</attribute>
|
||||
</tree>
|
||||
<field name="name" position="after">
|
||||
<field name="delivery_warning" invisible="1"/>
|
||||
</field>
|
||||
<xpath expr="//field[@name='activity_ids']" position="attributes">
|
||||
<attribute name="optional">hide</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='date_planned']" position="replace">
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='user_id']" position="attributes">
|
||||
<attribute name="string">采购员</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='user_id']" position="after">
|
||||
<field name="date_planned" string="预计到货日期" optional="show"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='name']" position="after">
|
||||
<field name="purchase_type"/>
|
||||
<field name="delivery_warning" invisible="1"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='name']" position="attributes">
|
||||
<attribute name="class">purchase_order_list_name</attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -232,8 +281,29 @@
|
||||
<xpath expr="//field[@name='name']" position="replace">
|
||||
<field name="name" string="单据编码" filter_domain="[('name', 'ilike', self)]"/>
|
||||
</xpath>
|
||||
<!-- <xpath expr="//search" position="inside">-->
|
||||
<!-- <searchpanel>-->
|
||||
<!-- <field name="purchase_type" icon="fa-filter"/>-->
|
||||
<!-- <field name="state" icon="fa-filter"/>-->
|
||||
<!-- </searchpanel>-->
|
||||
<!-- </xpath>-->
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="purchase_order_view_search_sf" model="ir.ui.view">
|
||||
<field name="name">purchase.order.list.select.sf</field>
|
||||
<field name="model">purchase.order</field>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_view_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//search" position="inside">
|
||||
<searchpanel>
|
||||
<field name="purchase_type" icon="fa-filter" enable_counters="1"/>
|
||||
<field name="state" icon="fa-filter" enable_counters="1"/>
|
||||
</searchpanel>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="purchase.product_normal_action_puchased" model="ir.actions.act_window">
|
||||
<field name="context">
|
||||
{"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1}
|
||||
|
||||
@@ -103,6 +103,7 @@
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
|
||||
<field name="model_glb_file" widget="Viewer3D" optional="show"
|
||||
string="模型文件" attrs="{'readonly': [('state', 'in', ['draft'])]}"/>
|
||||
<field name="part_name" optional="hide"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
|
||||
<field name="remark"/>
|
||||
@@ -169,20 +170,36 @@
|
||||
<field name="manual_quotation" />
|
||||
<field name="is_incoming_material"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='date_order']" position="attributes">
|
||||
<attribute name="string">下单时间</attribute>
|
||||
<xpath expr="//sheet//group//group[@name='order_details']//div[@class='o_td_label'][2]//label[@for='date_order']" position="attributes">
|
||||
<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>
|
||||
|
||||
<record model="ir.ui.view" id="view_sale_management_order_form_quote_inherit_sf">
|
||||
<field name="name">sale.management.order.form.quote.inherit.sf</field>
|
||||
<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 +241,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">
|
||||
@@ -245,6 +263,10 @@
|
||||
<separator/>
|
||||
<filter string="预警" name="filter_order_warning" domain="[('delivery_warning', '=', 'warning')]"/>
|
||||
<filter string="逾期" name="filter_order_overdue" domain="[('delivery_warning', '=', 'overdue')]"/>
|
||||
<searchpanel>
|
||||
<field name="delivery_warning" string="交期状态" icon="fa-filter" enable_counters="1"/>
|
||||
<field name="state" icon="fa-filter" enable_counters="1"/>
|
||||
</searchpanel>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
@@ -267,7 +289,11 @@
|
||||
<field name="amount_total" position="after">
|
||||
<field name="delivery_warning" invisible="1"/>
|
||||
</field>
|
||||
<field name="date_order" position="attributes">
|
||||
<attribute name="string">下单日期</attribute>
|
||||
</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">
|
||||
@@ -276,6 +302,9 @@
|
||||
<xpath expr="//field[@name='invoice_status']" position="after">
|
||||
<field name="state"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='user_id']" position="after">
|
||||
<field name="delivery_warning" string="交期状态"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user