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

1.修复销售总监看不到销售订单2.优化销售审核向导3.优化销售

Browse Source
This commit is contained in:
jinling.yang
2023-12-20 17:45:29 +08:00
parent ef47597cf9
commit bbb5ddb177
5 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
sf_sale/views/sale_order_view.xml
View File

@@ -1,46 +1,42 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<data>
<!-- <record id="sale_order_view_search_inherit_quotation_inherit_sf" model="ir.ui.view">-->
<!-- <field name="name">sale.order.search.quotation.inherit.sf</field>-->
<!-- <field name="model">sale.order</field>-->
<!-- &lt;!&ndash; <field name="inherit_id" ref="sale.view_sales_order_filter"/>&ndash;&gt;-->
<!-- <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <xpath expr="//filter[@name='my_sale_orders_filter']" position="replace">-->
<!-- &lt;!&ndash; <field name="campaign_id"/>&ndash;&gt;-->
<!-- &lt;!&ndash; <separator/>&ndash;&gt;-->
<!-- &lt;!&ndash; <filter string="Quotations" name="draft" domain="[('state','in',('draft', 'sent'))]"/>&ndash;&gt;-->
<!-- &lt;!&ndash; <filter string="Sales Orders" name="sales" domain="[('state','in',('sale','done'))]"/>&ndash;&gt;-->
<!-- &lt;!&ndash; <separator/>&ndash;&gt;-->
<!-- <filter string="Create Date" name="filter_create_date" date="create_date"/>-->
<!-- </xpath>-->
<!-- </field>-->
<!-- </record>-->
<record model="ir.ui.view" id="view_sale_order_form_inherit_sf">
<field name="name">sale.order.form.inherit.sf</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//form/header/button[@name='action_quotation_send'][1]" position="replace">
<button name="action_quotation_send" string="通过EMAIL发送" type="object"
class="btn-primary" data-hotkey="g" context="{'validate_analytic': True}"
attrs="{'invisible': [('check_status', 'not in', ['approved',False]),('state', 'in', ['draft'])]}"/>
</xpath>
<xpath expr="//form/header/button[@name='action_confirm']" position="after">
<field name="check_status" invisible="1"/>
<button name="sf_sale.action_sale_order_check_wizard" string="审核" type="action"
<button name="submit" string="提交" type="object"
context="{'default_order_id':active_id}"
attrs="{'invisible': [('check_status','=', 'checked')]}"
attrs="{'invisible': [('check_status','!=', False)]}"
class="oe_highlight"/>
</xpath>
<xpath expr="//form/header/button[@name='action_confirm'][1]" position="attributes">
<attribute name="attrs">{'invisible': [('check_status', '=', 'unchecked'),('state', 'not in',
['sent'])]}
</attribute>
<xpath expr="//form/header/button[@name='action_confirm']" position="after">
<field name="check_status"/>
<field name="state"/>
<button name="sf_sale.action_sale_order_check_wizard" string="审核" type="action"
context="{'default_order_id':active_id}" groups="sf_base.group_sale_director"
attrs="{'invisible': [('check_status','in', ['approved',False])]}"
class="oe_highlight"/>
</xpath>
<xpath expr="//form/header/button[@name='action_confirm'][2]" position="attributes">
<attribute name="attrs">{'invisible': [('check_status', '=', 'unchecked'),('state', 'in',
['draft'])]}
<!-- <xpath expr="//form/header/button[@name='action_confirm'][1]" position="attributes">-->
<!-- <attribute name="attrs">{'invisible': [('check_status', '!=', 'approved'),('state', 'not in',-->
<!-- ['sent'])]}-->
<!-- </attribute>-->
<!-- </xpath>-->
<xpath expr="//form/header/button[@name='action_confirm'][2]" position="replace">
<button name="action_confirm" data-hotkey="v"
string="确认" type="object" context="{'validate_analytic': True}"
attrs="{'invisible': [('check_status', 'not in', ['approved']),('state', 'in',['draft','sale'])]}"/>
</xpath>
<xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
<attribute name="attrs">{'invisible': [('check_status', '!=', 'approved')]}
</attribute>
</xpath>
<field name="partner_id" position="replace">
@@ -73,16 +69,10 @@
<attribute name="string">下单日期</attribute>
</field>
<field name="sale_order_template_id" position="after">
<!-- <label for="person_of_delivery" string="交货信息"/>-->
<!-- <div>-->
<field name="person_of_delivery" string="交货人"/>
<!-- <span>&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;-->
<!-- </span>-->
<field name="telephone_of_delivery" string="交货人联系方式"/>
<!-- <span>&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;-->
<!-- </span>-->
<field name="address_of_delivery" string="交货人地址"/>
<!-- </div>-->
<field name="remark"/>
</field>
</field>
</record>