pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] sale: remaining views cleanup

Browse Source 
* remove useless nodes/tags
* coherent attributes order (id before model)
* indentation

Part-of: odoo/odoo#82719
This commit is contained in:
Victor Feyens
2022-01-13 15:30:02 +00:00
parent d71eb19fb4
commit 0703ad235b
5 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/views/account_views.xml
+16 -18
View File
@@ -31,24 +31,22 @@
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='invoice_line_ids']//field[@name='discount']" position="attributes">
<attribute name="groups">product.group_discount_per_so_line</attribute>
</xpath>
<xpath expr="//group[@name='sale_info_group']/field[@name='invoice_user_id']" position="after">
<field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/>
</xpath>
<xpath expr="//group[@id='other_tab_group']" position="inside">
<group string="Marketing"
name="utm_link"
groups="base.group_no_one"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}">
<field name="campaign_id"/>
<field name="medium_id"/>
<field name="source_id"/>
</group>
</xpath>
</data>
<xpath expr="//field[@name='invoice_line_ids']//field[@name='discount']" position="attributes">
<attribute name="groups">product.group_discount_per_so_line</attribute>
</xpath>
<xpath expr="//group[@name='sale_info_group']/field[@name='invoice_user_id']" position="after">
<field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/>
</xpath>
<xpath expr="//group[@id='other_tab_group']" position="inside">
<group string="Marketing"
name="utm_link"
groups="base.group_no_one"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}">
<field name="campaign_id"/>
<field name="medium_id"/>
<field name="source_id"/>
</group>
</xpath>
</field>
</record>
addons/sale/views/crm_team_views.xml
-3
View File
@@ -102,7 +102,6 @@
<field name="model">crm.team</field>
<field name="inherit_id" ref="sales_team.crm_team_view_kanban_dashboard"/>
<field name="arch" type="xml">
<data>
<xpath expr="//templates" position="before">
<field name="use_quotations"/>
<field name="invoiced_target"/>
@@ -182,8 +181,6 @@
</a>
</div>
</div>
</data>
</field>
</record>
addons/sale/views/product_views.xml
+2 -2
View File
@@ -35,7 +35,7 @@
</record>
<!-- TODO VFE inherit product_template_form_view and factorize both views -->
<record model="ir.ui.view" id="product_form_view_sale_order_button">
<record id="product_form_view_sale_order_button" model="ir.ui.view">
<field name="name">product.product.sale.order</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
@@ -68,7 +68,7 @@
</field>
</record>
<record model="ir.ui.view" id="product_template_form_view_sale_order_button">
<record id="product_template_form_view_sale_order_button" model="ir.ui.view">
<field name="name">product.template.sale.order.button</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_only_form_view"/>
addons/sale/views/res_partner_views.xml
+1 -1
View File
@@ -16,7 +16,7 @@
</field>
</record>
<record model="ir.ui.view" id="crm_lead_partner_kanban_view">
<record id="crm_lead_partner_kanban_view" model="ir.ui.view">
<field name="name">res.partner.kanban.saleorder.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.res_partner_kanban_view"/>
addons/sale/views/utm_campaign_views.xml
+39 -38
View File
@@ -1,42 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record model="ir.ui.view" id="utm_campaign_view_kanban">
<field name="name">utm.campaign.view.kanban</field>
<field name="model">utm.campaign</field>
<field name="inherit_id" ref="utm.utm_campaign_view_kanban"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='utm_statistics']" position="inside">
<div class="mr-3" title="Revenues" groups="sales_team.group_sale_salesman">
<field name="currency_id" invisible="True"/>
<small class="font-weight-bold">
<field name="invoiced_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</small>
</div>
<div class="mr-3" title="Quotations" groups="sales_team.group_sale_salesman">
<i class="fa fa-money text-muted"></i>
<small class="font-weight-bold">
<field name="quotation_count"/>
</small>
</div>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="utm_campaign_view_form">
<field name="name">utm.campaign.view.form</field>
<field name="model">utm.campaign</field>
<field name="inherit_id" ref="utm.utm_campaign_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('oe_button_box')]" position="inside">
<button name="action_redirect_to_invoiced"
type="object" class="oe_stat_button order-1" icon="fa-usd" groups="sales_team.group_sale_salesman">
<field name="invoiced_amount" widget="statinfo" string="Revenues"/>
</button>
<button name="action_redirect_to_quotations"
type="object" class="oe_stat_button order-2" icon="fa-money" groups="sales_team.group_sale_salesman">
<field name="quotation_count" widget="statinfo" string="Quotations"/>
</button>
</xpath>
</field>
</record>
<record id="utm_campaign_view_kanban" model="ir.ui.view">
<field name="name">utm.campaign.view.kanban</field>
<field name="model">utm.campaign</field>
<field name="inherit_id" ref="utm.utm_campaign_view_kanban"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='utm_statistics']" position="inside">
<div class="mr-3" title="Revenues" groups="sales_team.group_sale_salesman">
<field name="currency_id" invisible="True"/>
<small class="font-weight-bold">
<field name="invoiced_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</small>
</div>
<div class="mr-3" title="Quotations" groups="sales_team.group_sale_salesman">
<i class="fa fa-money text-muted"></i>
<small class="font-weight-bold">
<field name="quotation_count"/>
</small>
</div>
</xpath>
</field>
</record>
<record id="utm_campaign_view_form" model="ir.ui.view">
<field name="name">utm.campaign.view.form</field>
<field name="model">utm.campaign</field>
<field name="inherit_id" ref="utm.utm_campaign_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('oe_button_box')]" position="inside">
<button name="action_redirect_to_invoiced"
type="object" class="oe_stat_button order-1" icon="fa-usd" groups="sales_team.group_sale_salesman">
<field name="invoiced_amount" widget="statinfo" string="Revenues"/>
</button>
<button name="action_redirect_to_quotations"
type="object" class="oe_stat_button order-2" icon="fa-money" groups="sales_team.group_sale_salesman">
<field name="quotation_count" widget="statinfo" string="Quotations"/>
</button>
</xpath>
</field>
</record>
</odoo>