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

1.修复采购权限和销售权限2.销售新增审核向导

Browse Source
This commit is contained in:
jinling.yang
2023-12-15 17:38:40 +08:00
parent 85ac3d7a3e
commit df2ba048f4
14 changed files with 110 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sf_sale/views/sale_order_view.xml
View File

@@ -2,33 +2,24 @@
<odoo>
<data>
<!-- <record id="sale_order_view_search_inherit_quotation_inherit_quotation" model="ir.ui.view">-->
<!-- <field name="name">sale.order.search.quotation.inherit.sf</field>-->
<!-- <field name="model">sale.order</field>-->
<!-- <field name="inherit_id" ref="sale.view_sales_order_filter"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <filter name="my_sale_orders_filter" position="replace">-->
<!-- <field name="campaign_id"/>-->
<!-- <separator/>-->
<!-- &lt;!&ndash; <filter string="My Quotations" name="my_quotation" domain="[('user_id', '=', uid)]"/>&ndash;&gt;-->
<!-- &lt;!&ndash; <separator/>&ndash;&gt;-->
<!-- <filter string="Quotations" name="draft" domain="[('state','in',('draft', 'sent'))]"/>-->
<!-- <filter string="Sales Orders" name="sales" domain="[('state','in',('sale','done'))]"/>-->
<!-- <separator/>-->
<!-- <filter string="Create Date" name="filter_create_date" date="create_date"/>-->
<!-- </filter>-->
<!-- </field>-->
<!-- </record>-->
<!-- <record model="ir.ui.view" id="view_sales_order_filter_inherit_sf">-->
<!-- <field name="name">sale.order.search.quotation.inherit.sf</field>-->
<!-- <field name="model">sale.order</field>-->
<!-- <field name="inherit_id" ref="sale.view_sales_order_filter"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <filter name="my_sale_orders_filter" position="replace">-->
<!--&lt;!&ndash; <filter string="我的报价1" name="my_sale_orders_filter" domain="[]"/>&ndash;&gt;-->
<!-- </filter>-->
<!-- </field>-->
<!-- </record>-->
<!-- <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>
@@ -37,13 +28,11 @@
<field name="arch" type="xml">
<xpath expr="//form/header/button[@name='action_confirm']" position="after">
<field name="check_status" invisible="1"/>
<button name="action_check" string="审核" type="object"
<button name="sf_sale.action_sale_order_check_wizard" string="审核" type="action"
context="{'default_order_id':active_id}"
attrs="{'invisible': [('check_status','=', 'checked')]}"
class="oe_highlight"/>
</xpath>
<xpath expr="//form/header/button[@name='action_check']" position="attributes">
<attribute name="groups">sf_base.group_sale_director</attribute>
</xpath>
<xpath expr="//form/header/button[@name='action_confirm'][1]" position="attributes">
<attribute name="attrs">{'invisible': [('check_status', '=', 'unchecked'),('state', 'not in',
['sent'])]}