Skip to content

Commit

Permalink
[FIX] all: fix pre-commit new checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@aleuffre @henrybackman
aleuffre authored and henrybackman committed Oct 10, 2024
1 parent a63d883 commit 091d352
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 10 deletions.
3 changes: 0 additions & 3 deletions sale_blanket_order/views/sale_blanket_order_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,6 @@
</p>
</field>
</record>

<!-- MENU'S -->

<menuitem
id="menu_blanket_order_config"
parent="sale.sale_order_menu"
Expand Down
1 change: 1 addition & 0 deletions sale_delivery_state/demo/sale_demo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<field name="partner_invoice_id" ref="base.res_partner_2" />
<field name="partner_shipping_id" ref="base.res_partner_2" />
<field name="user_id" ref="base.user_demo" />
<field name="pricelist_id" ref="product.list0" />
<field name="team_id" ref="sales_team.team_sales_department" />
<field
name="date_order"
Expand Down
2 changes: 1 addition & 1 deletion sale_exception/wizard/sale_exception_confirm_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<field name="arch" type="xml">
<form string="Blocked in draft due to exceptions">
<group>
<field name="exception_ids" nolabel="1" colspan="2">
<field name="exception_ids" nolabel="1" colspan="4">
<tree>
<field name="name" />
<field name="description" />
Expand Down
1 change: 1 addition & 0 deletions sale_fixed_discount/views/sale_portal_templates.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<template
id="sale_order_portal_content"
inherit_id="sale.sale_order_portal_content"
priority="999"
>
<xpath
expr="//section[@id='details']//t[@t-set='display_discount']"
Expand Down
78 changes: 75 additions & 3 deletions sale_product_set/views/product_set.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,86 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="view_product_set_tree" model="ir.ui.view">
<field name="name">product.set.tree</field>
<field name="model">product.set</field>
<field name="type">tree</field>
<field name="priority" eval="8" />
<field name="arch" type="xml">
<tree>
<field name="ref" />
<field name="name" />
<field name="partner_id" />
<field name="company_id" groups="base.group_multi_company" />
</tree>
</field>
</record>
<record id="view_product_set_form" model="ir.ui.view">
<field name="name">product.set.form</field>
<field name="model">product.set</field>
<field name="type">form</field>
<field name="inherit_id" ref="product_set.view_product_set_form" />
<field name="arch" type="xml">
<field name="quantity" position="after">
<field name="discount" groups="product.group_discount_per_so_line" />
</field>
<form string="Product set">
<sheet>
<widget
name="web_ribbon"
title="Archived"
bg_color="bg-danger"
attrs="{'invisible': [('active', '=', True)]}"
/>
<div class="oe_button_box" name="button_box" />
<group name="main">
<group name="name">
<field name="active" invisible="1" />
<field name="name" select="1" />
<field name="ref" />
</group>
<group name="partner">
<field name="partner_id" />
<field
name="company_id"
groups="base.group_multi_company"
/>
</group>
<label for="set_line_ids" />
<field name="set_line_ids" nolabel="1">
<tree editable="top">
<field name="sequence" widget="handle" />
<field name="product_id" />
<field name="quantity" />
<field
name="discount"
groups="product.group_discount_per_so_line"
/>
</tree>
</field>
</group>
</sheet>
</form>
</field>
</record>
<record id="view_product_set_search" model="ir.ui.view">
<field name="name">product.set.search</field>
<field name="model">product.set</field>
<field name="type">search</field>
<field name="priority" eval="8" />
<field name="arch" type="xml">
<search string="Product set">
<field name="name" select="True" />
<filter
name="active"
string="Archived"
domain="[('active', '=', False)]"
/>
<field name="ref" select="True" />
<field name="partner_id" />
<filter
name="group_by_partner_id"
string="Partner"
domain="[]"
context="{'group_by':'partner_id'}"
/>
</search>
</field>
</record>
<menuitem
Expand Down
32 changes: 29 additions & 3 deletions sale_product_set/views/product_set_line.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,35 @@
<field name="type">tree</field>
<field name="inherit_id" ref="product_set.view_product_set_line_tree" />
<field name="arch" type="xml">
<field name="quantity" position="after">
<field name="discount" groups="product.group_discount_per_so_line" />
</field>
<tree editable="top">
<field name="product_set_id" />
<field name="product_id" />
<field name="quantity" />
<field name="discount" groups="product.group_discount_per_so_line" />
</tree>
</field>
</record>
<record id="view_product_set_line_search" model="ir.ui.view">
<field name="name">product.set.line.search</field>
<field name="model">product.set.line</field>
<field name="type">search</field>
<field name="priority" eval="8" />
<field name="arch" type="xml">
<search string="Product set line">
<field name="product_set_id" />
<field name="product_id" />
<filter
name="group_by_product_set_id"
domain="[]"
context="{'group_by':'product_set_id'}"
/>
<filter
name="group_by_product_id"
string="Product"
domain="[]"
context="{'group_by':'product_id'}"
/>
</search>
</field>
</record>
<menuitem
Expand Down

0 comments on commit 091d352

Please sign in to comment.