[IMP] black, isort, prettier

This commit is contained in:
AaronHForgeFlow
2020-12-23 13:49:11 +01:00
parent a4074af516
commit 19d321b89d
30 changed files with 159 additions and 346 deletions

View File

@@ -46,10 +46,7 @@
<field name="sequence_id" ref="seq_picking_type_rma_cust_out" /> <field name="sequence_id" ref="seq_picking_type_rma_cust_out" />
<field name="sequence_code">RMA → Customer</field> <field name="sequence_code">RMA → Customer</field>
<field name="default_location_src_id" ref="rma.location_rma" /> <field name="default_location_src_id" ref="rma.location_rma" />
<field <field name="default_location_dest_id" ref="stock.stock_location_customers" />
name="default_location_dest_id"
ref="stock.stock_location_customers"
/>
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">outgoing</field> <field name="code">outgoing</field>
</record> </record>
@@ -58,10 +55,7 @@
<field name="name">Customer → RMA</field> <field name="name">Customer → RMA</field>
<field name="sequence_id" ref="seq_picking_type_rma_cust_in" /> <field name="sequence_id" ref="seq_picking_type_rma_cust_in" />
<field name="sequence_code">Customer → RMA</field> <field name="sequence_code">Customer → RMA</field>
<field <field name="default_location_src_id" ref="stock.stock_location_customers" />
name="default_location_src_id"
ref="stock.stock_location_customers"
/>
<field name="default_location_dest_id" ref="rma.location_rma" /> <field name="default_location_dest_id" ref="rma.location_rma" />
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">incoming</field> <field name="code">incoming</field>
@@ -72,10 +66,7 @@
<field name="sequence_id" ref="seq_picking_type_rma_sup_out" /> <field name="sequence_id" ref="seq_picking_type_rma_sup_out" />
<field name="sequence_code">RMA -> Supplier</field> <field name="sequence_code">RMA -> Supplier</field>
<field name="default_location_src_id" ref="rma.location_rma" /> <field name="default_location_src_id" ref="rma.location_rma" />
<field <field name="default_location_dest_id" ref="stock.stock_location_suppliers" />
name="default_location_dest_id"
ref="stock.stock_location_suppliers"
/>
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">outgoing</field> <field name="code">outgoing</field>
</record> </record>
@@ -84,10 +75,7 @@
<field name="name">Supplier -> RMA</field> <field name="name">Supplier -> RMA</field>
<field name="sequence_id" ref="seq_picking_type_rma_sup_in" /> <field name="sequence_id" ref="seq_picking_type_rma_sup_in" />
<field name="sequence_code">Supplier -> RMA</field> <field name="sequence_code">Supplier -> RMA</field>
<field <field name="default_location_src_id" ref="stock.stock_location_suppliers" />
name="default_location_src_id"
ref="stock.stock_location_suppliers"
/>
<field name="default_location_dest_id" ref="rma.location_rma" /> <field name="default_location_dest_id" ref="rma.location_rma" />
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">incoming</field> <field name="code">incoming</field>
@@ -97,14 +85,8 @@
<field name="name">Customer -> Supplier</field> <field name="name">Customer -> Supplier</field>
<field name="sequence_id" ref="seq_picking_type_rma_dropship" /> <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
<field name="sequence_code">Customer -> Supplier</field> <field name="sequence_code">Customer -> Supplier</field>
<field <field name="default_location_src_id" ref="stock.stock_location_customers" />
name="default_location_src_id" <field name="default_location_dest_id" ref="stock.stock_location_suppliers" />
ref="stock.stock_location_customers"
/>
<field
name="default_location_dest_id"
ref="stock.stock_location_suppliers"
/>
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">incoming</field> <field name="code">incoming</field>
</record> </record>
@@ -113,14 +95,8 @@
<field name="name">Supplier -> Customer</field> <field name="name">Supplier -> Customer</field>
<field name="sequence_id" ref="seq_picking_type_rma_dropship" /> <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
<field name="sequence_code">Supplier -> Customer</field> <field name="sequence_code">Supplier -> Customer</field>
<field <field name="default_location_src_id" ref="stock.stock_location_suppliers" />
name="default_location_src_id" <field name="default_location_dest_id" ref="stock.stock_location_customers" />
ref="stock.stock_location_suppliers"
/>
<field
name="default_location_dest_id"
ref="stock.stock_location_customers"
/>
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">incoming</field> <field name="code">incoming</field>
</record> </record>
@@ -214,10 +190,7 @@
<field name="location_src_id" ref="stock.stock_location_customers" /> <field name="location_src_id" ref="stock.stock_location_customers" />
<field name="procure_method">make_to_stock</field> <field name="procure_method">make_to_stock</field>
<field name="route_id" ref="rma.route_rma_dropship" /> <field name="route_id" ref="rma.route_rma_dropship" />
<field <field name="picking_type_id" ref="rma.picking_type_rma_dropship_return" />
name="picking_type_id"
ref="rma.picking_type_rma_dropship_return"
/>
</record> </record>
<record id="rule_rma_dropship" model="stock.rule"> <record id="rule_rma_dropship" model="stock.rule">

View File

@@ -41,14 +41,8 @@
<record id="picking_type_rma_dropship_return" model="stock.picking.type"> <record id="picking_type_rma_dropship_return" model="stock.picking.type">
<field name="name">Customer -> Supplier</field> <field name="name">Customer -> Supplier</field>
<field name="sequence_id" ref="seq_picking_type_rma_dropship" /> <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
<field <field name="default_location_src_id" ref="stock.stock_location_customers" />
name="default_location_src_id" <field name="default_location_dest_id" ref="stock.stock_location_suppliers" />
ref="stock.stock_location_customers"
/>
<field
name="default_location_dest_id"
ref="stock.stock_location_suppliers"
/>
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">incoming</field> <field name="code">incoming</field>
</record> </record>
@@ -56,14 +50,8 @@
<record id="picking_type_rma_dropship" model="stock.picking.type"> <record id="picking_type_rma_dropship" model="stock.picking.type">
<field name="name">Supplier -> Customer</field> <field name="name">Supplier -> Customer</field>
<field name="sequence_id" ref="seq_picking_type_rma_dropship" /> <field name="sequence_id" ref="seq_picking_type_rma_dropship" />
<field <field name="default_location_src_id" ref="stock.stock_location_suppliers" />
name="default_location_src_id" <field name="default_location_dest_id" ref="stock.stock_location_customers" />
ref="stock.stock_location_suppliers"
/>
<field
name="default_location_dest_id"
ref="stock.stock_location_customers"
/>
<field name="warehouse_id" eval="False" /> <field name="warehouse_id" eval="False" />
<field name="code">incoming</field> <field name="code">incoming</field>
</record> </record>
@@ -105,10 +93,7 @@
<field name="location_src_id" ref="stock.stock_location_customers" /> <field name="location_src_id" ref="stock.stock_location_customers" />
<field name="procure_method">make_to_stock</field> <field name="procure_method">make_to_stock</field>
<field name="route_id" ref="rma.route_rma_dropship" /> <field name="route_id" ref="rma.route_rma_dropship" />
<field <field name="picking_type_id" ref="rma.picking_type_rma_dropship_return" />
name="picking_type_id"
ref="rma.picking_type_rma_dropship_return"
/>
</record> </record>
<record id="rule_rma_dropship" model="stock.rule"> <record id="rule_rma_dropship" model="stock.rule">

View File

@@ -2,10 +2,7 @@
<odoo> <odoo>
<template id="report_rma_order_line_document"> <template id="report_rma_order_line_document">
<t t-call="web.external_layout"> <t t-call="web.external_layout">
<t <t t-set="doc" t-value="doc.with_context({'lang':doc.partner_id.lang})" />
t-set="doc"
t-value="doc.with_context({'lang':doc.partner_id.lang})"
/>
<div class="page"> <div class="page">
<div class="oe_structure" /> <div class="oe_structure" />
<div class="row"> <div class="row">
@@ -19,9 +16,7 @@
t-field="doc.in_warehouse_id.partner_id" t-field="doc.in_warehouse_id.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}' t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
/> />
<p <p t-if="doc.in_warehouse_id.partner_id.vat">VAT: <span
t-if="doc.in_warehouse_id.partner_id.vat"
>VAT: <span
t-field="doc.in_warehouse_id.partner_id.vat" t-field="doc.in_warehouse_id.partner_id.vat"
/></p> /></p>
</div> </div>
@@ -80,11 +75,7 @@
<strong>Contact Person:</strong> <strong>Contact Person:</strong>
<p t-field="doc.requested_by.name" /> <p t-field="doc.requested_by.name" />
</div> </div>
<div <div name="operation_id" t-if="doc.operation_id" class="col-3">
name="operation_id"
t-if="doc.operation_id"
class="col-3"
>
<strong>Operation:</strong> <strong>Operation:</strong>
<p t-field="doc.operation_id.name" /> <p t-field="doc.operation_id.name" />
</div> </div>
@@ -103,10 +94,7 @@
<td><span t-field="doc.product_id" /></td> <td><span t-field="doc.product_id" /></td>
<td class="text-right"> <td class="text-right">
<span t-field="doc.product_qty" /> <span t-field="doc.product_qty" />
<span <span t-field="doc.uom_id" groups="uom.group_uom" />
t-field="doc.uom_id"
groups="uom.group_uom"
/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span <span
@@ -144,10 +132,7 @@
<template id="report_rma_order_document"> <template id="report_rma_order_document">
<t t-call="web.external_layout"> <t t-call="web.external_layout">
<t <t t-set="doc" t-value="doc.with_context({'lang':doc.partner_id.lang})" />
t-set="doc"
t-value="doc.with_context({'lang':doc.partner_id.lang})"
/>
<div class="page"> <div class="page">
<div class="oe_structure" /> <div class="oe_structure" />
<div class="row"> <div class="row">
@@ -161,9 +146,7 @@
t-field="doc.in_warehouse_id.partner_id" t-field="doc.in_warehouse_id.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}' t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
/> />
<p <p t-if="doc.in_warehouse_id.partner_id.vat">VAT: <span
t-if="doc.in_warehouse_id.partner_id.vat"
>VAT: <span
t-field="doc.in_warehouse_id.partner_id.vat" t-field="doc.in_warehouse_id.partner_id.vat"
/></p> /></p>
</div> </div>
@@ -241,10 +224,7 @@
<td><span t-field="l.product_id" /></td> <td><span t-field="l.product_id" /></td>
<td class="text-right"> <td class="text-right">
<span t-field="l.product_qty" /> <span t-field="l.product_qty" />
<span <span t-field="l.uom_id" groups="uom.group_uom" />
t-field="l.uom_id"
groups="uom.group_uom"
/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-field="l.price_unit" /> <span t-field="l.price_unit" />

View File

@@ -10,19 +10,13 @@
<record id="group_rma_customer_user" model="res.groups"> <record id="group_rma_customer_user" model="res.groups">
<field name="name">RMA Customer User</field> <field name="name">RMA Customer User</field>
<field <field name="implied_ids" eval="[(4, ref('stock.group_stock_user'))]" />
name="implied_ids"
eval="[(4, ref('stock.group_stock_user'))]"
/>
<field name="category_id" ref="module_category_rma" /> <field name="category_id" ref="module_category_rma" />
</record> </record>
<record id="group_rma_supplier_user" model="res.groups"> <record id="group_rma_supplier_user" model="res.groups">
<field name="name">RMA Supplier User</field> <field name="name">RMA Supplier User</field>
<field <field name="implied_ids" eval="[(4, ref('stock.group_stock_user'))]" />
name="implied_ids"
eval="[(4, ref('stock.group_stock_user'))]"
/>
<field name="category_id" ref="module_category_rma" /> <field name="category_id" ref="module_category_rma" />
</record> </record>

View File

@@ -3,10 +3,7 @@
<record id="product_category_form_view" model="ir.ui.view"> <record id="product_category_form_view" model="ir.ui.view">
<field name="name">product.category.form</field> <field name="name">product.category.form</field>
<field name="model">product.category</field> <field name="model">product.category</field>
<field <field name="inherit_id" ref="stock.product_category_form_view_inherit" />
name="inherit_id"
ref="stock.product_category_form_view_inherit"
/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="removal_strategy_id" position="after"> <field name="removal_strategy_id" position="after">
<group name="rma"> <group name="rma">

View File

@@ -39,10 +39,7 @@
<field name="lot_id" groups="stock.group_production_lot" /> <field name="lot_id" groups="stock.group_production_lot" />
<field name="rma_id" groups="rma.group_rma_groups" /> <field name="rma_id" groups="rma.group_rma_groups" />
<field name="origin" /> <field name="origin" />
<field <field name="operation_id" domain="[('type','=','supplier')]" />
name="operation_id"
domain="[('type','=','supplier')]"
/>
<field name="uom_id" groups="uom.group_uom" /> <field name="uom_id" groups="uom.group_uom" />
<field name="product_qty" /> <field name="product_qty" />
<field name="price_unit" /> <field name="price_unit" />
@@ -233,11 +230,7 @@
</group> </group>
</page> </page>
<page name="stock" string="Stock Moves"> <page name="stock" string="Stock Moves">
<field <field name="move_ids" nolabel="1" readonly="1" />
name="move_ids"
nolabel="1"
readonly="1"
/>
</page> </page>
<page name="quantities" string="Quantities"> <page name="quantities" string="Quantities">
<group> <group>
@@ -480,18 +473,10 @@
</group> </group>
</page> </page>
<page name="stock" string="Stock Moves"> <page name="stock" string="Stock Moves">
<field <field name="move_ids" nolabel="1" readonly="1" />
name="move_ids"
nolabel="1"
readonly="1"
/>
</page> </page>
<page name="quantities" string="Quantities"> <page name="quantities" string="Quantities">
<group <group name="quantities" col="4" string="Quantities">
name="quantities"
col="4"
string="Quantities"
>
<group name="receive"> <group name="receive">
<field name="qty_to_receive" /> <field name="qty_to_receive" />
<field name="qty_incoming" /> <field name="qty_incoming" />
@@ -561,10 +546,7 @@
help="My RMAs" help="My RMAs"
/> />
<separator /> <separator />
<group <group name="stock_quantities" groups="stock.group_stock_user">
name="stock_quantities"
groups="stock.group_stock_user"
>
<filter <filter
name="to_receive" name="to_receive"
domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]" domain="[('state','!=', 'done'),('qty_to_receive','>',0.0)]"
@@ -645,19 +627,13 @@
<field name="view_id" ref="view_rma_line_supplier_tree" /> <field name="view_id" ref="view_rma_line_supplier_tree" />
</record> </record>
<record <record id="action_rma_line_supplier_tree" model="ir.actions.act_window.view">
id="action_rma_line_supplier_tree"
model="ir.actions.act_window.view"
>
<field eval="3" name="sequence" /> <field eval="3" name="sequence" />
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="act_window_id" ref="action_rma_supplier_lines" /> <field name="act_window_id" ref="action_rma_supplier_lines" />
</record> </record>
<record <record id="action_rma_line_supplier_form" model="ir.actions.act_window.view">
id="action_rma_line_supplier_form"
model="ir.actions.act_window.view"
>
<field eval="4" name="sequence" /> <field eval="4" name="sequence" />
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="view_rma_line_supplier_form" /> <field name="view_id" ref="view_rma_line_supplier_form" />

View File

@@ -7,11 +7,7 @@
<tree string="RMA"> <tree string="RMA">
<field name="name" /> <field name="name" />
<field name="reference" /> <field name="reference" />
<field <field name="partner_id" groups="base.group_user" string="Customer" />
name="partner_id"
groups="base.group_user"
string="Customer"
/>
<field name="date_rma" /> <field name="date_rma" />
</tree> </tree>
</field> </field>
@@ -24,11 +20,7 @@
<tree string="RMA"> <tree string="RMA">
<field name="name" /> <field name="name" />
<field name="reference" /> <field name="reference" />
<field <field name="partner_id" groups="base.group_user" string="Supplier" />
name="partner_id"
groups="base.group_user"
string="Supplier"
/>
<field name="date_rma" /> <field name="date_rma" />
</tree> </tree>
</field> </field>
@@ -75,11 +67,7 @@
icon="fa-list" icon="fa-list"
groups="rma.group_rma_customer_user" groups="rma.group_rma_customer_user"
> >
<field <field name="line_count" widget="statinfo" string="RMA Lines" />
name="line_count"
widget="statinfo"
string="RMA Lines"
/>
</button> </button>
<button <button
type="object" type="object"
@@ -147,10 +135,7 @@
name="assigned_to" name="assigned_to"
attrs="{'readonly':[('state', '!=', 'draft')]}" attrs="{'readonly':[('state', '!=', 'draft')]}"
/> />
<field <field name="company_id" groups="base.group_multi_company" />
name="company_id"
groups="base.group_multi_company"
/>
</group> </group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
@@ -232,11 +217,7 @@
icon="fa-list" icon="fa-list"
groups="rma.group_rma_supplier_user" groups="rma.group_rma_supplier_user"
> >
<field <field name="line_count" widget="statinfo" string="RMA Lines" />
name="line_count"
widget="statinfo"
string="RMA Lines"
/>
</button> </button>
</div> </div>
<div class="oe_title" name="title"> <div class="oe_title" name="title">
@@ -293,10 +274,7 @@
name="assigned_to" name="assigned_to"
attrs="{'readonly':[('state', '!=', 'draft')]}" attrs="{'readonly':[('state', '!=', 'draft')]}"
/> />
<field <field name="company_id" groups="base.group_multi_company" />
name="company_id"
groups="base.group_multi_company"
/>
</group> </group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">

View File

@@ -13,10 +13,7 @@
</field> </field>
</record> </record>
<record <record id="stock_location_route_form_view_inherit_rma_stock" model="ir.ui.view">
id="stock_location_route_form_view_inherit_rma_stock"
model="ir.ui.view"
>
<field name="name">stock.location.route.form</field> <field name="name">stock.location.route.form</field>
<field name="inherit_id" ref="stock.stock_location_route_form_view" /> <field name="inherit_id" ref="stock.stock_location_route_form_view" />
<field name="model">stock.location.route</field> <field name="model">stock.location.route</field>

View File

@@ -5,10 +5,7 @@
<field name="model">stock.warehouse</field> <field name="model">stock.warehouse</field>
<field name="inherit_id" ref="stock.view_warehouse" /> <field name="inherit_id" ref="stock.view_warehouse" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath <xpath expr="//field[@name='wh_output_stock_loc_id']" position="after">
expr="//field[@name='wh_output_stock_loc_id']"
position="after"
>
<field name="lot_rma_id" /> <field name="lot_rma_id" />
</xpath> </xpath>
<field name="resupply_wh_ids" position="after"> <field name="resupply_wh_ids" position="after">

View File

@@ -35,11 +35,7 @@
groups="stock.group_stock_multi_locations" groups="stock.group_stock_multi_locations"
/> />
<field name="create_date" groups="base.group_no_one" /> <field name="create_date" groups="base.group_no_one" />
<field <field name="date" string="Date" groups="base.group_no_one" />
name="date"
string="Date"
groups="base.group_no_one"
/>
<field name="date_expected" string="Date Expected" /> <field name="date_expected" string="Date Expected" />
<field name="state" /> <field name="state" />
</tree> </tree>
@@ -63,20 +59,14 @@
</field> </field>
</record> </record>
<record <record id="action_rma_add_stock_move_customer" model="ir.actions.act_window">
id="action_rma_add_stock_move_customer"
model="ir.actions.act_window"
>
<field name="name">Add from Stock Move</field> <field name="name">Add from Stock Move</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">rma_add_stock_move</field> <field name="res_model">rma_add_stock_move</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="view_id" ref="view_rma_add_stock_move_customer" /> <field name="view_id" ref="view_rma_add_stock_move_customer" />
<field <field name="groups_id" eval="[(4, ref('rma.group_rma_customer_user'))]" />
name="groups_id"
eval="[(4, ref('rma.group_rma_customer_user'))]"
/>
</record> </record>
@@ -131,26 +121,17 @@
</field> </field>
</record> </record>
<record <record id="action_rma_add_stock_move_supplier" model="ir.actions.act_window">
id="action_rma_add_stock_move_supplier"
model="ir.actions.act_window"
>
<field name="name">Add from Stock Move</field> <field name="name">Add from Stock Move</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">rma_add_stock_move</field> <field name="res_model">rma_add_stock_move</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="view_id" ref="view_rma_add_stock_move_supplier" /> <field name="view_id" ref="view_rma_add_stock_move_supplier" />
<field <field name="groups_id" eval="[(4, ref('rma.group_rma_supplier_user'))]" />
name="groups_id"
eval="[(4, ref('rma.group_rma_supplier_user'))]"
/>
</record> </record>
<record <record id="view_rma_add_stock_move_button_supplier_form" model="ir.ui.view">
id="view_rma_add_stock_move_button_supplier_form"
model="ir.ui.view"
>
<field name="name">rma.order.supplier.form - stock.move wizard</field> <field name="name">rma.order.supplier.form - stock.move wizard</field>
<field name="model">rma.order</field> <field name="model">rma.order</field>
<field name="inherit_id" ref="rma.view_rma_supplier_form" /> <field name="inherit_id" ref="rma.view_rma_supplier_form" />

View File

@@ -25,15 +25,8 @@
<newline /> <newline />
<group> <group>
<field name="item_ids" nolabel="1" colspan="2"> <field name="item_ids" nolabel="1" colspan="2">
<tree <tree string="Details" editable="bottom" create="false">
string="Details" <field name="line_id" options="{'no_open': true}" />
editable="bottom"
create="false"
>
<field
name="line_id"
options="{'no_open': true}"
/>
<field name="product_id" /> <field name="product_id" />
<field name="name" /> <field name="name" />
<field name="operation_id" /> <field name="operation_id" />
@@ -56,10 +49,7 @@
</field> </field>
</record> </record>
<record <record id="action_rma_order_line_make_supplier_rma" model="ir.actions.act_window">
id="action_rma_order_line_make_supplier_rma"
model="ir.actions.act_window"
>
<field name="name">Create Supplier RMA</field> <field name="name">Create Supplier RMA</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">rma.order.line.make.supplier.rma</field> <field name="res_model">rma.order.line.make.supplier.rma</field>

View File

@@ -17,11 +17,7 @@
icon="fa-eject" icon="fa-eject"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"
> >
<field <field name="rma_count" widget="statinfo" string="RMA" />
name="rma_count"
widget="statinfo"
string="RMA"
/>
</button> </button>
</div> </div>
</field> </field>
@@ -39,9 +35,7 @@
<field name="name" position="after"> <field name="name" position="after">
<field name="rma_line_count" invisible="1" /> <field name="rma_line_count" invisible="1" />
<field name="rma_line_id" string="RMA line originated" /> <field name="rma_line_id" string="RMA line originated" />
<notebook <notebook attrs="{'invisible': [('rma_line_count', '=', 0)]}">
attrs="{'invisible': [('rma_line_count', '=', 0)]}"
>
<page string="RMA Lines"> <page string="RMA Lines">
<field name="rma_line_ids" /> <field name="rma_line_ids" />
</page> </page>

View File

@@ -3,10 +3,7 @@
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) --> License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
<odoo> <odoo>
<record <record id="action_rma_account_customer_lines" model="ir.actions.act_window">
id="action_rma_account_customer_lines"
model="ir.actions.act_window"
>
<field name="name">Customer RMA</field> <field name="name">Customer RMA</field>
<field name="res_model">rma.order.line</field> <field name="res_model">rma.order.line</field>
<field name="domain">[('type','=', 'customer')]</field> <field name="domain">[('type','=', 'customer')]</field>
@@ -18,9 +15,7 @@
<field name="name">Supplier RMA</field> <field name="name">Supplier RMA</field>
<field name="res_model">rma.order.line</field> <field name="res_model">rma.order.line</field>
<field name="domain">[('type','=', 'supplier')]</field> <field name="domain">[('type','=', 'supplier')]</field>
<field <field name="context">{"search_default_to_refund":1, "supplier":1}</field>
name="context"
>{"search_default_to_refund":1, "supplier":1}</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="rma.view_rma_line_supplier_tree" /> <field name="view_id" ref="rma.view_rma_line_supplier_tree" />
</record> </record>

View File

@@ -21,11 +21,7 @@
icon="fa-pencil-square-o" icon="fa-pencil-square-o"
groups="account.group_account_user" groups="account.group_account_user"
> >
<field <field name="refund_count" widget="statinfo" string="Refunds" />
name="refund_count"
widget="statinfo"
string="Refunds"
/>
</button> </button>
</button> </button>
<group name="main_info" position="inside"> <group name="main_info" position="inside">
@@ -82,11 +78,7 @@
icon="fa-pencil-square-o" icon="fa-pencil-square-o"
groups="account.group_account_user" groups="account.group_account_user"
> >
<field <field name="refund_count" widget="statinfo" string="Refunds" />
name="refund_count"
widget="statinfo"
string="Refunds"
/>
</button> </button>
</button> </button>
<group name="main_info" position="inside"> <group name="main_info" position="inside">

View File

@@ -26,11 +26,7 @@
icon="fa-pencil-square-o" icon="fa-pencil-square-o"
groups="account.group_account_user" groups="account.group_account_user"
> >
<field <field name="invoice_count" widget="statinfo" string="Origin Inv" />
name="invoice_count"
widget="statinfo"
string="Origin Inv"
/>
</button> </button>
</button> </button>
<!-- <!--

View File

@@ -22,10 +22,7 @@
<tree string="Invoice Lines"> <tree string="Invoice Lines">
<field name="move_id" /> <field name="move_id" />
<field name="name" /> <field name="name" />
<field <field name="account_id" groups="account.group_account_user" />
name="account_id"
groups="account.group_account_user"
/>
<field name="quantity" /> <field name="quantity" />
<field name="product_id" /> <field name="product_id" />
<field name="product_uom_id" /> <field name="product_uom_id" />
@@ -75,10 +72,7 @@
<tree string="Invoice Lines"> <tree string="Invoice Lines">
<field name="move_id" /> <field name="move_id" />
<field name="name" /> <field name="name" />
<field <field name="account_id" groups="account.group_account_user" />
name="account_id"
groups="account.group_account_user"
/>
<field name="quantity" /> <field name="quantity" />
<field name="product_id" /> <field name="product_id" />
<field name="product_uom_id" /> <field name="product_uom_id" />
@@ -114,16 +108,10 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="view_id" ref="view_rma_add_account_move" /> <field name="view_id" ref="view_rma_add_account_move" />
<field <field name="groups_id" eval="[(4, ref('rma.group_rma_customer_user'))]" />
name="groups_id"
eval="[(4, ref('rma.group_rma_customer_user'))]"
/>
</record> </record>
<record <record id="action_rma_add_account_move_supplier" model="ir.actions.act_window">
id="action_rma_add_account_move_supplier"
model="ir.actions.act_window"
>
<field name="name">Add Invoice</field> <field name="name">Add Invoice</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">rma_add_account_move</field> <field name="res_model">rma_add_account_move</field>
@@ -131,10 +119,7 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="view_id" ref="view_rma_add_account_move_supplier" /> <field name="view_id" ref="view_rma_add_account_move_supplier" />
<field <field name="groups_id" eval="[(4, ref('rma.group_rma_supplier_user'))]" />
name="groups_id"
eval="[(4, ref('rma.group_rma_supplier_user'))]"
/>
</record> </record>
<record id="view_rma_add_account_move_form" model="ir.ui.view"> <record id="view_rma_add_account_move_form" model="ir.ui.view">

View File

@@ -32,11 +32,7 @@
type="object" type="object"
class="btn-primary" class="btn-primary"
/> />
<button <button string="Cancel" class="btn-default" special="cancel" />
string="Cancel"
class="btn-default"
special="cancel"
/>
</footer> </footer>
</form> </form>
</field> </field>
@@ -48,10 +44,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_rma_refund" /> <field name="view_id" ref="view_rma_refund" />
<field name="binding_model_id" ref="rma.model_rma_order_line" /> <field name="binding_model_id" ref="rma.model_rma_order_line" />
<field <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]" />
name="groups_id"
eval="[(4, ref('account.group_account_invoice'))]"
/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>

View File

@@ -7,12 +7,18 @@
<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"> <field name="arch" type="xml">
<div name='button_box' position="inside"> <div name='button_box' position="inside">
<button type="object" name="action_view_repair_order" <button
type="object"
name="action_view_repair_order"
class="oe_stat_button" class="oe_stat_button"
icon="fa-wrench" icon="fa-wrench"
groups="stock.group_stock_user"> groups="stock.group_stock_user"
<field name="repair_count" widget="statinfo" >
string="Repair Orders"/> <field
name="repair_count"
widget="statinfo"
string="Repair Orders"
/>
</button> </button>
</div> </div>
<group name="quantities" position="inside"> <group name="quantities" position="inside">
@@ -40,11 +46,13 @@
<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"> <field name="arch" type="xml">
<header position="inside"> <header position="inside">
<button name="%(action_rma_order_line_make_repair)d" <button
name="%(action_rma_order_line_make_repair)d"
states="approved" states="approved"
string="Create Repair Order" string="Create Repair Order"
class="oe_highlight" class="oe_highlight"
type="action"/> type="action"
/>
</header> </header>
</field> </field>
</record> </record>

View File

@@ -7,12 +7,18 @@
<field name="inherit_id" ref="rma.view_rma_form" /> <field name="inherit_id" ref="rma.view_rma_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<div name="button_box" position="inside"> <div name="button_box" position="inside">
<button type="object" name="action_view_repair_order" <button
type="object"
name="action_view_repair_order"
class="oe_stat_button" class="oe_stat_button"
icon="fa-wrench" icon="fa-wrench"
groups="stock.group_stock_user"> groups="stock.group_stock_user"
<field name="repair_count" widget="statinfo" >
string="Repair Orders"/> <field
name="repair_count"
widget="statinfo"
string="Repair Orders"
/>
</button> </button>
</div> </div>
</field> </field>

View File

@@ -18,26 +18,37 @@
<field name="product_uom_id" groups="uom.group_uom" /> <field name="product_uom_id" groups="uom.group_uom" />
<field name="partner_id" /> <field name="partner_id" />
<field name="to_refurbish" /> <field name="to_refurbish" />
<field name="refurbish_product_id" attrs="{'required': [('to_refurbish', '=', True)]}"/> <field
<field name="location_id" groups="stock.group_stock_multi_locations"/> name="refurbish_product_id"
<field name="location_dest_id" groups="stock.group_stock_multi_locations"/> attrs="{'required': [('to_refurbish', '=', True)]}"
/>
<field
name="location_id"
groups="stock.group_stock_multi_locations"
/>
<field
name="location_dest_id"
groups="stock.group_stock_multi_locations"
/>
<field name="invoice_method" /> <field name="invoice_method" />
</tree> </tree>
</field> </field>
</group> </group>
<newline /> <newline />
<footer> <footer>
<button name="make_repair_order" <button
string="Create Repair Orders" type="object" name="make_repair_order"
class="oe_highlight"/> string="Create Repair Orders"
type="object"
class="oe_highlight"
/>
<button special="cancel" string="Cancel" class="oe_link" /> <button special="cancel" string="Cancel" class="oe_link" />
</footer> </footer>
</form> </form>
</field> </field>
</record> </record>
<record id="action_rma_order_line_make_repair" <record id="action_rma_order_line_make_repair" model="ir.actions.act_window">
model="ir.actions.act_window">
<field name="name">Create Repair</field> <field name="name">Create Repair</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">rma.order.line.make.repair</field> <field name="res_model">rma.order.line.make.repair</field>

View File

@@ -127,10 +127,7 @@
<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"> <field name="arch" type="xml">
<group name="stock_quantities" position="after"> <group name="stock_quantities" position="after">
<group <group name="sale_quantities" groups="sales_team.group_sale_salesman">
name="sale_quantities"
groups="sales_team.group_sale_salesman"
>
<filter <filter
domain="[('state','!=', 'done'),('qty_to_sell','>',0.0)]" domain="[('state','!=', 'done'),('qty_to_sell','>',0.0)]"
help="To Sell" help="To Sell"

View File

@@ -13,11 +13,7 @@
icon="fa-pencil-square-o" icon="fa-pencil-square-o"
groups="sales_team.group_sale_salesman" groups="sales_team.group_sale_salesman"
> >
<field <field name="sale_count" widget="statinfo" string="Origin SO" />
name="sale_count"
widget="statinfo"
string="Origin SO"
/>
</button> </button>
</div> </div>
</field> </field>

View File

@@ -38,11 +38,7 @@
attrs="{'invisible': [('rma_count', '=', 0)]}" attrs="{'invisible': [('rma_count', '=', 0)]}"
groups="rma.group_rma_customer_user" groups="rma.group_rma_customer_user"
> >
<field <field name="rma_count" widget="statinfo" string="RMA" />
name="rma_count"
widget="statinfo"
string="RMA"
/>
</button> </button>
</xpath> </xpath>
</data> </data>

View File

@@ -42,11 +42,7 @@
string="Unit of Measure" string="Unit of Measure"
groups="uom.group_uom" groups="uom.group_uom"
/> />
<field <field name="price_subtotal" sum="Total" widget="monetary" />
name="price_subtotal"
sum="Total"
widget="monetary"
/>
</tree> </tree>
</field> </field>

View File

@@ -33,10 +33,7 @@
<field name="product_id" /> <field name="product_id" />
<field name="name" /> <field name="name" />
<field name="product_qty" /> <field name="product_qty" />
<field <field name="product_uom_id" groups="uom.group_uom" />
name="product_uom_id"
groups="uom.group_uom"
/>
<field name="free_of_charge" /> <field name="free_of_charge" />
</tree> </tree>
</field> </field>
@@ -48,11 +45,7 @@
type="object" type="object"
class="oe_highlight" class="oe_highlight"
/> />
<button <button special="cancel" string="Cancel" class="oe_link" />
special="cancel"
string="Cancel"
class="oe_link"
/>
</footer> </footer>
</form> </form>
</field> </field>

View File

@@ -0,0 +1 @@
../../../../rma_repair

View File

@@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)