1.销售新增审核状态，选项为已审核和待审核，销售模型新增权限规则：销售总监查看所有的订单，销售经理只能查看自己的订单
2.报价单Form视图新增审核按钮，该按钮只有销售总监可以看到，且确认按钮只有在销售经理审核完才可显示，报价Tree视图新增审核状态
This commit is contained in:
jinling.yang
@@ -7,6 +7,25 @@
|
||||
<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_confirm']" position="after">
|
||||
<field name="check_status" invisible="1"/>
|
||||
<button name="action_check" string="审核" type="object"
|
||||
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'])]}
|
||||
</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//form/header/button[@name='action_confirm'][2]" position="attributes">
|
||||
<attribute name="attrs">{'invisible': [('check_status', '=', 'unchecked'),('state', 'in',
|
||||
['draft'])]}
|
||||
</attribute>
|
||||
</xpath>
|
||||
<field name="payment_term_id" position="after">
|
||||
<field name="deadline_of_delivery"/>
|
||||
<field name="payments_way"/>
|
||||
@@ -28,6 +47,7 @@
|
||||
<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>
|
||||
@@ -57,6 +77,10 @@
|
||||
<field name="create_date" position="attributes">
|
||||
<attribute name="string">下单时间</attribute>
|
||||
</field>
|
||||
<field name="state" position="after">
|
||||
<field name="check_status" widget="label_selection"
|
||||
options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -1,142 +1,145 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<odoo>
|
||||
|
||||
<menuitem id="sale.sale_menu_root"
|
||||
name="Sales"
|
||||
web_icon="sale_management,static/description/icon.svg"
|
||||
active="False"
|
||||
sequence="30">
|
||||
|
||||
<menuitem id="sale_order_menu"
|
||||
name="Orders"
|
||||
sequence="10">
|
||||
|
||||
<menuitem id="menu_sale_quotations"
|
||||
action="action_quotations_with_onboarding"
|
||||
groups="sales_team.group_sale_salesman"
|
||||
sequence="10"/>
|
||||
|
||||
<menuitem id="menu_sale_order"
|
||||
name="Orders"
|
||||
action="action_orders"
|
||||
groups="sales_team.group_sale_salesman"
|
||||
sequence="20"/>
|
||||
|
||||
|
||||
<menuitem id="report_sales_team"
|
||||
name="Sales Teams"
|
||||
action="sales_team.crm_team_action_sales"
|
||||
groups="sales_team.group_sale_manager"
|
||||
sequence="30"/>
|
||||
|
||||
<menuitem id="res_partner_menu"
|
||||
action="account.res_partner_action_customer"
|
||||
groups="sales_team.group_sale_salesman"
|
||||
sequence="40"/>
|
||||
|
||||
</menuitem>
|
||||
|
||||
<menuitem id="menu_sale_invoicing"
|
||||
name="To Invoice"
|
||||
groups="sales_team.group_sale_salesman"
|
||||
sequence="20">
|
||||
|
||||
<menuitem id="menu_sale_order_invoice"
|
||||
action="action_orders_to_invoice"
|
||||
sequence="10"/>
|
||||
|
||||
<menuitem id="menu_sale_order_upselling"
|
||||
action="action_orders_upselling"
|
||||
sequence="20"/>
|
||||
|
||||
</menuitem>
|
||||
|
||||
<menuitem id="product_menu_catalog"
|
||||
name="Products"
|
||||
groups="sales_team.group_sale_salesman"
|
||||
sequence="30">
|
||||
|
||||
<menuitem id="menu_product_template_action"
|
||||
action="product_template_action"
|
||||
sequence="10"/>
|
||||
<menuitem id="menu_products"
|
||||
action="product.product_normal_action_sell"
|
||||
groups="product.group_product_variant"
|
||||
sequence="20"/>
|
||||
<menuitem id="menu_product_pricelist_main"
|
||||
name="Pricelists"
|
||||
action="product.product_pricelist_action2"
|
||||
groups="product.group_product_pricelist"
|
||||
sequence="30"/>
|
||||
|
||||
</menuitem>
|
||||
|
||||
<menuitem id="menu_sale_report"
|
||||
name="Reporting"
|
||||
action="action_order_report_all"
|
||||
groups="sales_team.group_sale_manager"
|
||||
sequence="40"/>
|
||||
|
||||
<menuitem id="menu_sale_config"
|
||||
<menuitem id="menu_sale_config"
|
||||
name="Configuration"
|
||||
groups="sales_team.group_sale_manager"
|
||||
sequence="50">
|
||||
groups="sales_team.group_sale_manager,sf_base.group_sale_salemanager,sf_base.group_sale_director"
|
||||
sequence="50"/>
|
||||
|
||||
<menuitem id="menu_sale_general_settings"
|
||||
name="Settings"
|
||||
sequence="10"
|
||||
action="action_sale_config_settings"
|
||||
groups="base.group_system"/>
|
||||
<!-- <record id="sale.sale_menu_root" model="ir.ui.menu">-->
|
||||
<!-- <field name="active" eval="True"/>-->
|
||||
<!-- </record>-->
|
||||
|
||||
<menuitem id="sales_team_config"
|
||||
name="Sales Teams"
|
||||
action="sales_team.crm_team_action_config"
|
||||
sequence="20"/>
|
||||
<!-- <menuitem id="sale_order_menu"-->
|
||||
<!-- name="Orders"-->
|
||||
<!-- sequence="10">-->
|
||||
|
||||
<menuitem id="menu_sales_config"
|
||||
sequence="30"
|
||||
name="Sales Orders">
|
||||
<!-- <menuitem id="menu_sale_quotations"-->
|
||||
<!-- action="action_quotations_with_onboarding"-->
|
||||
<!-- groups="sales_team.group_sale_salesman"-->
|
||||
<!-- sequence="10"/>-->
|
||||
|
||||
<menuitem id="menu_tag_config"
|
||||
name="Tags"
|
||||
action="sales_team.sales_team_crm_tag_action"
|
||||
sequence="10"/>
|
||||
<!-- <menuitem id="menu_sale_order"-->
|
||||
<!-- name="Orders"-->
|
||||
<!-- action="action_orders"-->
|
||||
<!-- groups="sales_team.group_sale_salesman"-->
|
||||
<!-- sequence="20"/>-->
|
||||
|
||||
</menuitem>
|
||||
|
||||
<menuitem id="prod_config_main"
|
||||
name="Products"
|
||||
sequence="40">
|
||||
<!-- <menuitem id="report_sales_team"-->
|
||||
<!-- name="Sales Teams"-->
|
||||
<!-- action="sales_team.crm_team_action_sales"-->
|
||||
<!-- groups="sales_team.group_sale_manager"-->
|
||||
<!-- sequence="30"/>-->
|
||||
|
||||
<menuitem id="menu_product_attribute_action"
|
||||
action="product.attribute_action"
|
||||
groups="product.group_product_variant"
|
||||
sequence="10"/>
|
||||
<!-- <menuitem id="res_partner_menu"-->
|
||||
<!-- action="account.res_partner_action_customer"-->
|
||||
<!-- groups="sales_team.group_sale_salesman"-->
|
||||
<!-- sequence="40"/>-->
|
||||
|
||||
</menuitem>
|
||||
<!-- </menuitem>-->
|
||||
|
||||
<menuitem id="next_id_16"
|
||||
name="Units of Measure"
|
||||
groups="uom.group_uom"
|
||||
sequence="50">
|
||||
<!-- <menuitem id="menu_sale_invoicing"-->
|
||||
<!-- name="To Invoice"-->
|
||||
<!-- groups="sales_team.group_sale_salesman"-->
|
||||
<!-- sequence="20">-->
|
||||
|
||||
<menuitem id="menu_product_uom_form_action"
|
||||
action="uom.product_uom_form_action"
|
||||
groups="base.group_no_one"
|
||||
sequence="10"/>
|
||||
<!-- <menuitem id="menu_sale_order_invoice"-->
|
||||
<!-- action="action_orders_to_invoice"-->
|
||||
<!-- sequence="10"/>-->
|
||||
|
||||
<menuitem id="menu_product_uom_categ_form_action"
|
||||
action="uom.product_uom_categ_form_action"
|
||||
sequence="20"/>
|
||||
<!-- <menuitem id="menu_sale_order_upselling"-->
|
||||
<!-- action="action_orders_upselling"-->
|
||||
<!-- sequence="20"/>-->
|
||||
|
||||
</menuitem>
|
||||
<!-- </menuitem>-->
|
||||
|
||||
<menuitem id="sale_menu_config_activity_type"
|
||||
action="mail_activity_type_action_config_sale"
|
||||
groups="base.group_no_one"
|
||||
sequence="60"
|
||||
/>
|
||||
</menuitem>
|
||||
</menuitem>
|
||||
<!-- <menuitem id="product_menu_catalog"-->
|
||||
<!-- name="Products"-->
|
||||
<!-- groups="sales_team.group_sale_salesman"-->
|
||||
<!-- sequence="30">-->
|
||||
|
||||
<!-- <menuitem id="menu_product_template_action"-->
|
||||
<!-- action="product_template_action"-->
|
||||
<!-- sequence="10"/>-->
|
||||
<!-- <menuitem id="menu_products"-->
|
||||
<!-- action="product.product_normal_action_sell"-->
|
||||
<!-- groups="product.group_product_variant"-->
|
||||
<!-- sequence="20"/>-->
|
||||
<!-- <menuitem id="menu_product_pricelist_main"-->
|
||||
<!-- name="Pricelists"-->
|
||||
<!-- action="product.product_pricelist_action2"-->
|
||||
<!-- groups="product.group_product_pricelist"-->
|
||||
<!-- sequence="30"/>-->
|
||||
|
||||
<!-- </menuitem>-->
|
||||
|
||||
<!-- <menuitem id="menu_sale_report"-->
|
||||
<!-- name="Reporting"-->
|
||||
<!-- action="action_order_report_all"-->
|
||||
<!-- groups="sales_team.group_sale_manager"-->
|
||||
<!-- sequence="40"/>-->
|
||||
|
||||
<!-- <menuitem id="menu_sale_config"-->
|
||||
<!-- name="Configuration"-->
|
||||
<!-- groups="sales_team.group_sale_manager"-->
|
||||
<!-- sequence="50">-->
|
||||
|
||||
<!-- <menuitem id="menu_sale_general_settings"-->
|
||||
<!-- name="Settings"-->
|
||||
<!-- sequence="10"-->
|
||||
<!-- action="action_sale_config_settings"-->
|
||||
<!-- groups="base.group_system"/>-->
|
||||
|
||||
<!-- <menuitem id="sales_team_config"-->
|
||||
<!-- name="Sales Teams"-->
|
||||
<!-- action="sales_team.crm_team_action_config"-->
|
||||
<!-- sequence="20"/>-->
|
||||
|
||||
<!-- <menuitem id="menu_sales_config"-->
|
||||
<!-- sequence="30"-->
|
||||
<!-- name="Sales Orders">-->
|
||||
|
||||
<!-- <menuitem id="menu_tag_config"-->
|
||||
<!-- name="Tags"-->
|
||||
<!-- action="sales_team.sales_team_crm_tag_action"-->
|
||||
<!-- sequence="10"/>-->
|
||||
|
||||
<!-- </menuitem>-->
|
||||
|
||||
<!-- <menuitem id="prod_config_main"-->
|
||||
<!-- name="Products"-->
|
||||
<!-- sequence="40">-->
|
||||
|
||||
<!-- <menuitem id="menu_product_attribute_action"-->
|
||||
<!-- action="product.attribute_action"-->
|
||||
<!-- groups="product.group_product_variant"-->
|
||||
<!-- sequence="10"/>-->
|
||||
|
||||
<!-- </menuitem>-->
|
||||
|
||||
<!-- <menuitem id="next_id_16"-->
|
||||
<!-- name="Units of Measure"-->
|
||||
<!-- groups="uom.group_uom"-->
|
||||
<!-- sequence="50">-->
|
||||
|
||||
<!-- <menuitem id="menu_product_uom_form_action"-->
|
||||
<!-- action="uom.product_uom_form_action"-->
|
||||
<!-- groups="base.group_no_one"-->
|
||||
<!-- sequence="10"/>-->
|
||||
|
||||
<!-- <menuitem id="menu_product_uom_categ_form_action"-->
|
||||
<!-- action="uom.product_uom_categ_form_action"-->
|
||||
<!-- sequence="20"/>-->
|
||||
|
||||
<!-- </menuitem>-->
|
||||
|
||||
<!-- <menuitem id="sale_menu_config_activity_type"-->
|
||||
<!-- action="mail_activity_type_action_config_sale"-->
|
||||
<!-- groups="base.group_no_one"-->
|
||||
<!-- sequence="60"-->
|
||||
<!-- />-->
|
||||
<!-- </menuitem>-->
|
||||
<!-- </menuitem>-->
|
||||
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user