[IMP] Update pre-commit lints according with OCA ones

This commit is contained in:
HviorForgeFlow
2020-05-29 12:27:01 +02:00
committed by Mateu Griful
parent bda82fece6
commit 2c98d044ac
7 changed files with 220 additions and 136 deletions

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1">
<record id="rma_operation_customer_sale" model="rma.operation">
@@ -9,8 +9,8 @@
<field name="delivery_policy">no</field>
<field name="refund_policy">no</field>
<field name="type">customer</field>
<field name="in_route_id" ref="rma.route_rma_customer"/>
<field name="out_route_id" ref="rma.route_rma_customer"/>
<field name="in_route_id" ref="rma.route_rma_customer" />
<field name="out_route_id" ref="rma.route_rma_customer" />
</record>
<record id="rma_operation_customer_sale_advanced" model="rma.operation">
@@ -21,8 +21,8 @@
<field name="delivery_policy">no</field>
<field name="refund_policy">received</field>
<field name="type">customer</field>
<field name="in_route_id" ref="rma.route_rma_customer"/>
<field name="out_route_id" ref="rma.route_rma_customer"/>
<field name="in_route_id" ref="rma.route_rma_customer" />
<field name="out_route_id" ref="rma.route_rma_customer" />
</record>
</odoo>

View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="rma_operation_tree" model="ir.ui.view">
<field name="name">rma.operation.tree</field>
<field name="model">rma.operation</field>
<field name="inherit_id" ref="rma.rma_operation_tree"/>
<field name="inherit_id" ref="rma.rma_operation_tree" />
<field name="arch" type="xml">
<field name="delivery_policy" position="after">
<field name="sale_policy"/>
<field name="sale_policy" />
</field>
</field>
</record>
@@ -15,10 +15,10 @@
<record id="rma_operation_form" model="ir.ui.view">
<field name="name">rma.operation.form</field>
<field name="model">rma.operation</field>
<field name="inherit_id" ref="rma.rma_operation_form"/>
<field name="inherit_id" ref="rma.rma_operation_form" />
<field name="arch" type="xml">
<field name="delivery_policy" position="after">
<field name="sale_policy"/>
<field name="sale_policy" />
</field>
</field>
</record>

View File

@@ -1,41 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="view_rma_line_form" model="ir.ui.view">
<field name="name">rma.order.line.form</field>
<field name="model">rma.order.line</field>
<field name="inherit_id" ref="rma.view_rma_line_form"/>
<field name="inherit_id" ref="rma.view_rma_line_form" />
<field name="arch" type="xml">
<div name='button_box' position="inside">
<button type="object" name="action_view_sale_order"
class="oe_stat_button"
icon="fa-strikethrough"
groups="sales_team.group_sale_salesman_all_leads">
<field name="sales_count" widget="statinfo"
string="Sales Orders"/>
<button
type="object"
name="action_view_sale_order"
class="oe_stat_button"
icon="fa-strikethrough"
groups="sales_team.group_sale_salesman_all_leads"
>
<field
name="sales_count"
widget="statinfo"
string="Sales Orders"
/>
</button>
</div>
<group name="main_info" position="inside">
<field name="sale_line_id"
context="{'rma': True}"
options="{'no_create': True}"/>
<field
name="sale_line_id"
context="{'rma': True}"
options="{'no_create': True}"
/>
</group>
<group name="quantities" position="inside">
<group>
<field name="qty_to_sell"/>
<field name="qty_sold"/>
<field name="qty_to_sell" />
<field name="qty_sold" />
</group>
</group>
<field name="delivery_policy" position="after">
<field name="sale_policy"/>
<field name="sale_policy" />
</field>
<field name="origin" position="after">
<field name="sale_id"
attrs="{'invisible': [('sale_line_id', '=', False)]}"/>
<field
name="sale_id"
attrs="{'invisible': [('sale_line_id', '=', False)]}"
/>
</field>
<notebook position="inside">
<page name="sale" string="Sale Lines">
<field name="sale_line_ids" nolabel="1"/>
<field name="sale_line_ids" nolabel="1" />
</page>
</notebook>
</field>
@@ -44,29 +54,35 @@
<record id="view_rma_line_supplier_form" model="ir.ui.view">
<field name="name">rma.order.line.supplier.form</field>
<field name="model">rma.order.line</field>
<field name="inherit_id" ref="rma.view_rma_line_supplier_form"/>
<field name="inherit_id" ref="rma.view_rma_line_supplier_form" />
<field name="arch" type="xml">
<div name='button_box' position="inside">
<button type="object" name="action_view_sale_order"
class="oe_stat_button"
icon="fa-strikethrough"
groups="sales_team.group_sale_salesman_all_leads">
<field name="sales_count" widget="statinfo"
string="Sales Orders"/>
<button
type="object"
name="action_view_sale_order"
class="oe_stat_button"
icon="fa-strikethrough"
groups="sales_team.group_sale_salesman_all_leads"
>
<field
name="sales_count"
widget="statinfo"
string="Sales Orders"
/>
</button>
</div>
<group name="quantities" position="inside">
<group>
<field name="qty_to_sell"/>
<field name="qty_sold"/>
<field name="qty_to_sell" />
<field name="qty_sold" />
</group>
</group>
<field name="delivery_policy" position="after">
<field name="sale_policy"/>
<field name="sale_policy" />
</field>
<notebook position="inside">
<page name="sale" string="Sale Lines">
<field name="sale_line_ids" nolabel="1"/>
<field name="sale_line_ids" nolabel="1" />
</page>
</notebook>
</field>
@@ -75,24 +91,32 @@
<record id="view_rma_line_button_sale_form" model="ir.ui.view">
<field name="name">rma.order.line.form</field>
<field name="model">rma.order.line</field>
<field name="inherit_id" ref="rma.view_rma_line_button_form"/>
<field name="inherit_id" ref="rma.view_rma_line_button_form" />
<field name="arch" type="xml">
<header position="inside">
<button name="%(action_rma_order_line_make_sale_order)d" states="approved"
string="Create Sales Quotation" class="oe_highlight"
type="action"/>
<button
name="%(action_rma_order_line_make_sale_order)d"
states="approved"
string="Create Sales Quotation"
class="oe_highlight"
type="action"
/>
</header>
</field>
</record>
<record id="view_rma_line_supplier_button_sale_form" model="ir.ui.view">
<field name="name">rma.order.line.supplier.form</field>
<field name="model">rma.order.line</field>
<field name="inherit_id" ref="rma.view_rma_line_supplier_button_form"/>
<field name="inherit_id" ref="rma.view_rma_line_supplier_button_form" />
<field name="arch" type="xml">
<header position="inside">
<button name="%(action_rma_order_line_make_sale_order)d" states="approved"
string="Create Sales Quotation" class="oe_highlight"
type="action"/>
<button
name="%(action_rma_order_line_make_sale_order)d"
states="approved"
string="Create Sales Quotation"
class="oe_highlight"
type="action"
/>
</header>
</field>
</record>
@@ -100,11 +124,18 @@
<record id="view_rma_rma_line_filter" model="ir.ui.view">
<field name="name">rma.order.line.select - rma_sale</field>
<field name="model">rma.order.line</field>
<field name="inherit_id" ref="rma.view_rma_rma_line_filter"/>
<field name="inherit_id" ref="rma.view_rma_rma_line_filter" />
<field name="arch" type="xml">
<group name="stock_quantities" position="after">
<group name="sale_quantities" groups="sales_team.group_sale_salesman">
<filter domain="[('state','!=', 'done'),('qty_to_sell','>',0.0)]" help="To Sell" name="to_sell"/>
<group
name="sale_quantities"
groups="sales_team.group_sale_salesman"
>
<filter
domain="[('state','!=', 'done'),('qty_to_sell','>',0.0)]"
help="To Sell"
name="to_sell"
/>
</group>
</group>
</field>

View File

@@ -1,17 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="view_rma_form" model="ir.ui.view">
<field name="name">rma.order.form</field>
<field name="model">rma.order</field>
<field name="inherit_id" ref="rma.view_rma_form"/>
<field name="inherit_id" ref="rma.view_rma_form" />
<field name="arch" type="xml">
<div name="button_box" position="inside">
<button type="object" name="action_view_sale_order"
class="oe_stat_button"
icon="fa-pencil-square-o"
groups="sales_team.group_sale_salesman">
<field name="sale_count" widget="statinfo"
string="Origin SO"/>
<button
type="object"
name="action_view_sale_order"
class="oe_stat_button"
icon="fa-pencil-square-o"
groups="sales_team.group_sale_salesman"
>
<field
name="sale_count"
widget="statinfo"
string="Origin SO"
/>
</button>
</div>
</field>

View File

@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="view_order_form" model="ir.ui.view">
<field name="name">sale.order.form</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<xpath
expr="//notebook/page/field[@name='order_line']/form/group/group/field[@name='price_unit']"
position="after">
<field name="rma_line_id"
options="{'no_create': True}"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
expr="//notebook/page/field[@name='order_line']/form/group/group/field[@name='price_unit']"
position="after"
>
<field
name="rma_line_id"
options="{'no_create': True}"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
/>
</xpath>
</field>
</record>
@@ -20,17 +23,26 @@
<record id="view_order_form_inherit_sale_rma" model="ir.ui.view">
<field name="name">sale.order.form.sale.rma</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<data>
<xpath expr="//button[@name='action_view_invoice']" position="before">
<button type="object"
name="action_view_rma"
class="oe_stat_button"
icon="fa-dropbox"
attrs="{'invisible': [('rma_count', '=', 0)]}"
groups="rma.group_rma_customer_user">
<field name="rma_count" widget="statinfo" string="RMA"/>
<xpath
expr="//button[@name='action_view_invoice']"
position="before"
>
<button
type="object"
name="action_view_rma"
class="oe_stat_button"
icon="fa-dropbox"
attrs="{'invisible': [('rma_count', '=', 0)]}"
groups="rma.group_rma_customer_user"
>
<field
name="rma_count"
widget="statinfo"
string="RMA"
/>
</button>
</xpath>
</data>

View File

@@ -1,50 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="view_rma_add_sale" model="ir.ui.view">
<field name="name">rma.add.sale</field>
<field name="model">rma_add_sale</field>
<field name="arch" type="xml">
<form string="Select Sale Order from customer">
<separator string="Select Sale Order from customer"/>
<separator string="Select Sale Order from customer" />
<group>
<field name="partner_id"
domain="[('customer','=',True)]"
string="Customer"/>
<field
name="partner_id"
domain="[('customer','=',True)]"
string="Customer"
/>
</group>
<separator string="Select Sale Order Lines to Add"/>
<separator string="Select Sale Order Lines to Add" />
<group>
<field name="sale_id"
domain="[
<field
name="sale_id"
domain="[
('partner_id','=',partner_id), (('state','not in',['draft','cancel']))]"
context="{'partner_id': partner_id}"/>
context="{'partner_id': partner_id}"
/>
</group>
<field name="sale_line_ids"
domain="[('order_id', '=', sale_id)]"
string="Sale Order Lines">
<field
name="sale_line_ids"
domain="[('order_id', '=', sale_id)]"
string="Sale Order Lines"
>
<tree>
<field name="product_id" invisible="1"/>
<field name="order_id"/>
<field name="order_partner_id"/>
<field name="name"/>
<field name="salesman_id"/>
<field name="product_uom_qty" string="Qty"/>
<field name="qty_delivered"/>
<field name="qty_invoiced"/>
<field name="qty_to_invoice"/>
<field name="product_uom" string="Unit of Measure" groups="uom.group_uom"/>
<field name="price_subtotal" sum="Total" widget="monetary"/>
<field name="product_id" invisible="1" />
<field name="order_id" />
<field name="order_partner_id" />
<field name="name" />
<field name="salesman_id" />
<field name="product_uom_qty" string="Qty" />
<field name="qty_delivered" />
<field name="qty_invoiced" />
<field name="qty_to_invoice" />
<field
name="product_uom"
string="Unit of Measure"
groups="uom.group_uom"
/>
<field
name="price_subtotal"
sum="Total"
widget="monetary"
/>
</tree>
</field>
<footer>
<button
string="Confirm"
name="add_lines" type="object"
class="oe_highlight"/>
string="Confirm"
name="add_lines"
type="object"
class="oe_highlight"
/>
or
<button name="action_cancel"
string="Cancel" class="oe_link" special="cancel"/>
<button
name="action_cancel"
string="Cancel"
class="oe_link"
special="cancel"
/>
</footer>
</form>
</field>
@@ -56,20 +75,25 @@
<field name="res_model">rma_add_sale</field>
<field name="view_mode">form</field>
<field name="target">new</field>
<field name="view_id" ref="view_rma_add_sale"/>
<field name="groups_id" eval="[(4, ref('rma.group_rma_customer_user')), (4, ref('rma.group_rma_customer_user'))]"/>
<field name="view_id" ref="view_rma_add_sale" />
<field
name="groups_id"
eval="[(4, ref('rma.group_rma_customer_user')), (4, ref('rma.group_rma_customer_user'))]"
/>
</record>
<record id="view_rma_add_sale_form" model="ir.ui.view">
<field name="name">rma.order.form - sale wizard</field>
<field name="model">rma.order</field>
<field name="inherit_id" ref="rma.view_rma_form"/>
<field name="inherit_id" ref="rma.view_rma_form" />
<field name="arch" type="xml">
<xpath expr="//header" position="inside">
<button name="%(action_rma_add_sale)d"
string="Add From Sale Order"
type="action"/>
<button
name="%(action_rma_add_sale)d"
string="Add From Sale Order"
type="action"
/>
</xpath>
</field>
</record>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2016 Eficent Business and IT Consulting Services S.L.
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
<odoo>
@@ -9,53 +9,64 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Quotation">
<separator string="Existing Quotation to update:"/>
<newline/>
<separator string="Existing Quotation to update:" />
<newline />
<group>
<field name="sale_order_id"
domain="[('partner_id','=', partner_id)]"
context="{'partner_id': partner_id}"/>
<field
name="sale_order_id"
domain="[('partner_id','=', partner_id)]"
context="{'partner_id': partner_id}"
/>
</group>
<newline/>
<separator
string="New Sales Order details:"/>
<newline/>
<newline />
<separator string="New Sales Order details:" />
<newline />
<group>
<field name="partner_id"/>
<field name="partner_id" />
</group>
<newline/>
<newline />
<group>
<field name="item_ids" nolabel="1" colspan="2">
<tree string="Details" editable="bottom">
<field name="wiz_id" invisible="True"/>
<field name="line_id"
invisible="True"/>
<field name="product_id"/>
<field name="name"/>
<field name="product_qty"/>
<field name="product_uom_id"
groups="uom.group_uom"/>
<field name="free_of_charge"/>
<field name="wiz_id" invisible="True" />
<field name="line_id" invisible="True" />
<field name="product_id" />
<field name="name" />
<field name="product_qty" />
<field
name="product_uom_id"
groups="uom.group_uom"
/>
<field name="free_of_charge" />
</tree>
</field>
</group>
<footer colspan="2">
<button name="make_sale_order"
string="Create Sales Quotation" type="object"
class="oe_highlight"/>
<button special="cancel" string="Cancel" class="oe_link"/>
<button
name="make_sale_order"
string="Create Sales Quotation"
type="object"
class="oe_highlight"
/>
<button
special="cancel"
string="Cancel"
class="oe_link"
/>
</footer>
</form>
</field>
</record>
<record id="action_rma_order_line_make_sale_order"
model="ir.actions.act_window">
<record
id="action_rma_order_line_make_sale_order"
model="ir.actions.act_window"
>
<field name="name">Create Sales Quotation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">rma.order.line.make.sale.order</field>
<field name="view_mode">form</field>
<field name="view_id" ref="view_rma_order_line_make_sale_order"/>
<field name="view_id" ref="view_rma_order_line_make_sale_order" />
<field name="target">new</field>
</record>