[9.0][REW] rma: workflow centralized on rma.order.line and the use of rma.order is optional.

This commit is contained in:
lreficent
2017-10-18 12:20:27 +02:00
committed by Mateu Griful
parent 82db65ef85
commit 837ca84a5d
8 changed files with 395 additions and 252 deletions

View File

@@ -5,20 +5,20 @@
<field name="name">rma.order.line.tree</field>
<field name="model">rma.order.line</field>
<field name="arch" type="xml">
<tree string="RMA Line" create="0"
decoration-muted="state in ('draft','to_approve')">
<field name="rma_id"/>
<field name="state" invisible="1"/>
<tree string="RMA Line"
decoration-info="state in ('draft','to_approve')">
<field name="name"/>
<field name="partner_id"/>
<field name="product_id"/>
<field name="lot_id" groups="stock.group_production_lot"/>
<field name="name"/>
<field name="rma_id"/>
<field name="origin"/>
<field name="operation_id"/>
<field name="supplier_address_id"/>
<field name="uom_id" groups="product.group_uom"/>
<field name="product_qty"/>
<field name="price_unit"/>
<field name="state"/>
</tree>
</field>
</record>
@@ -27,19 +27,19 @@
<field name="name">rma.order.line.supplier.tree</field>
<field name="model">rma.order.line</field>
<field name="arch" type="xml">
<tree string="RMA Line" create="0"
decoration-muted="state in ('draft','to_approve')">
<field name="rma_id"/>
<field name="state" invisible="1"/>
<tree string="RMA Line"
decoration-info="state in ('draft','to_approve')">
<field name="name"/>
<field name="partner_id"/>
<field name="product_id"/>
<field name="lot_id" groups="stock.group_production_lot"/>
<field name="name"/>
<field name="rma_id"/>
<field name="origin"/>
<field name="operation_id" domain="[('type','=','supplier')]"/>
<field name="uom_id" groups="product.group_uom"/>
<field name="product_qty"/>
<field name="price_unit"/>
<field name="state"/>
</tree>
</field>
</record>
@@ -48,8 +48,25 @@
<field name="name">rma.order.line.supplier.form</field>
<field name="model">rma.order.line</field>
<field name="arch" type="xml">
<form string="RMA Line" create="0">
<header/>
<form string="RMA Line">
<header>
<button name="action_rma_to_approve" type="object"
string="Request Approval"
attrs="{'invisible':[('state', '!=', 'draft')]}"
class="oe_highlight" groups="rma.group_rma_customer_user"/>
<button name="action_rma_draft" type="object"
string="Back to Draft"
attrs="{'invisible':[('state', '=', 'draft')]}" class="oe_highlight"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
<button name="action_rma_approve" type="object"
string="Approve"
attrs="{'invisible':[('state', '!=', 'to_approve')]}" class="oe_highlight" groups="rma.group_rma_customer_user"/>
<button name="action_rma_done" type="object"
string="Done"
attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
groups="rma.group_rma_customer_user"/>
<field name="state" widget="statusbar" nolabel="1"/>
</header>
<sheet>
<div name="button_box" class="oe_button_box">
<button type="object" name="action_view_in_shipments"
@@ -76,11 +93,22 @@
</div>
<div class="oe_title" name="title">
<h1>
<field name="rma_id" required="False"
readonly="True"
<field name="name"
invisible="context.get('hide_title',False)"/>
</h1>
</div>
<group name="partner">
<field name="partner_id"
domain="[('supplier','=',True)]"
string="Supplier"/>
</group>
<group name="main_info" string="Origin">
<field name="reference_move_id"
options="{'no_create': True}"
domain="[('picking_id.partner_id', '=', partner_id),
('location_id.usage', '=', 'supplier'),
('state', '=', 'done')]"/>
</group>
<group>
<group name="product" string="Product">
<field name="product_id"/>
@@ -96,12 +124,16 @@
<field name="uom_id" groups="product.group_uom"/>
</group>
<newline/>
<group name="operation" string="Operation" colspan="2">
<group name="operation" string="Operation">
<field name="operation_id"
domain="[('type','=','supplier')]"/>
<field name="receipt_policy"/>
<field name="delivery_policy"/>
</group>
<group name="contact" string="Contact">
<field name="requested_by" readonly="1"/>
<field name="assigned_to" readonly="1"/>
</group>
</group>
<notebook>
<page name="description" string="Description">
@@ -147,14 +179,9 @@
</page>
<page name="other" string="Other Info">
<group name="general" string="General">
<field name="name"/>
<field name="rma_id"/>
<field name="origin"/>
<field name="reference_move_id"/>
<field name="state" invisible="1"/>
</group>
<group name="contact" string="Contact">
<field name="requested_by" readonly="1"/>
<field name="assigned_to" readonly="1"/>
</group>
<group name="company" string="Company"
groups="base.group_multi_company">
@@ -163,6 +190,10 @@
</page>
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
</record>
@@ -172,7 +203,24 @@
<field name="model">rma.order.line</field>
<field name="arch" type="xml">
<form string="Rma Line" create="0">
<header/>
<header>
<button name="action_rma_to_approve" type="object"
string="Request Approval"
attrs="{'invisible':[('state', '!=', 'draft')]}"
class="oe_highlight" groups="rma.group_rma_customer_user"/>
<button name="action_rma_draft" type="object"
string="Back to Draft"
attrs="{'invisible':[('state', '=', 'draft')]}" class="oe_highlight"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
<button name="action_rma_approve" type="object"
string="Approve"
attrs="{'invisible':[('state', '!=', 'to_approve')]}" class="oe_highlight" groups="rma.group_rma_customer_user"/>
<button name="action_rma_done" type="object"
string="Done"
attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
groups="rma.group_rma_customer_user"/>
<field name="state" widget="statusbar" nolabel="1"/>
</header>
<sheet>
<div name="button_box" class="oe_button_box">
<button type="object" name="action_view_in_shipments"
@@ -204,11 +252,22 @@
</div>
<div class="oe_title" name="title">
<h1>
<field name="rma_id" required="False"
readonly="True"
<field name="name"
invisible="context.get('hide_title',False)"/>
</h1>
</div>
<group name="partner">
<field name="partner_id"
domain="[('customer','=',True)]"
string="Customer"/>
</group>
<group name="main_info" string="Origin">
<field name="reference_move_id"
options="{'no_create': True}"
domain="[('picking_id.partner_id', '=', partner_id),
('location_dest_id.usage', '=', 'customer'),
('state', '=', 'done')]"/>
</group>
<group>
<group name="product" string="Product">
<field name="product_id"/>
@@ -229,6 +288,10 @@
<field name="receipt_policy"/>
<field name="delivery_policy"/>
</group>
<group name="contact" string="Contact">
<field name="requested_by" readonly="1"/>
<field name="assigned_to" readonly="1"/>
</group>
</group>
<notebook>
<page name="route" string="Routes">
@@ -279,14 +342,8 @@
</page>
<page name="other" string="Other Info">
<group name="general" string="General">
<field name="name"/>
<field name="rma_id"/>
<field name="origin"/>
<field name="reference_move_id"/>
<field name="state" invisible="1"/>
</group>
<group name="contact" string="Contact">
<field name="requested_by" readonly="1"/>
<field name="assigned_to" readonly="1"/>
</group>
<group name="company" string="Company"
groups="base.group_multi_company">
@@ -295,6 +352,10 @@
</page>
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
</record>
@@ -304,6 +365,7 @@
<field name="model">rma.order.line</field>
<field name="arch" type="xml">
<search string="Search RMA line">
<field name="name"/>
<field name="rma_id"/>
<field name="partner_id"/>
<field name="requested_by"/>
@@ -313,6 +375,8 @@
<separator/>
<filter domain="[('assigned_to','=',uid)]" help="My RMAs"/>
<group expand="0" string="Group By">
<filter name="status" string="State" domain="[]"
context="{'group_by':'state'}"/>
<filter name="partner" string="Partner" domain="[]"
context="{'group_by':'partner_id'}"/>
<filter name="operation" string="Operation" domain="[]"
@@ -329,11 +393,9 @@
</record>
<record id="action_rma_customer_lines" model="ir.actions.act_window">
<field name="name">Customer RMA Lines</field>
<field name="name">Customer RMA</field>
<field name="res_model">rma.order.line</field>
<field name="domain">[('state','in', ['approved', 'done']),
('type','=', 'customer')
]</field>
<field name="domain">[('type','=', 'customer')]</field>
<field name="context">{"search_default_assigned_to":uid}</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@@ -341,10 +403,9 @@
</record>
<record id="action_rma_supplier_lines" model="ir.actions.act_window">
<field name="name">Supplier RMA Lines</field>
<field name="name">Supplier RMA</field>
<field name="res_model">rma.order.line</field>
<field name="domain">[('state','in', ['approved', 'done']),
('type','=', 'supplier')]</field>
<field name="domain">[('type','=', 'supplier')]</field>
<field name="context">{"search_default_assigned_to":uid, "supplier":1}</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>

View File

@@ -6,16 +6,11 @@
<field name="name">rma.order.tree</field>
<field name="model">rma.order</field>
<field name="arch" type="xml">
<tree decoration-info="state == 'draft'"
decoration-muted="state== 'done'" string="RMA">
<tree string="RMA">
<field name="name"/>
<field name="state" invisible="1"/>
<field name="reference"/>
<field name="partner_id" groups="base.group_user" string="Customer"/>
<field name="requested_by" groups="base.group_user"/>
<field name="assigned_to" groups="base.group_user"/>
<field name="date_rma"/>
<field name="state"/>
</tree>
</field>
</record>
@@ -24,17 +19,12 @@
<field name="name">rma.order.supplier.tree</field>
<field name="model">rma.order</field>
<field name="arch" type="xml">
<tree decoration-info="state == 'draft'"
decoration-muted="state== 'done'" string="RMA">
<tree string="RMA">
<field name="name"/>
<field name="state" invisible="1"/>
<field name="reference"/>
<field name="partner_id" groups="base.group_user"
string="Supplier"/>
<field name="requested_by" groups="base.group_user"/>
<field name="assigned_to" groups="base.group_user"/>
<field name="date_rma"/>
<field name="state"/>
</tree>
</field>
</record>
@@ -44,25 +34,7 @@
<field name="model">rma.order</field>
<field name="arch" type="xml">
<form string="RMA">
<field name="state" invisible="True"/>
<header>
<button name="action_rma_to_approve" type="object"
string="Request Approval"
attrs="{'invisible':[('state', '!=', 'draft')]}"
class="oe_highlight" groups="rma.group_rma_customer_user"/>
<button name="action_rma_draft" type="object"
string="Back to Draft"
attrs="{'invisible':[('state', '=', 'draft')]}" class="oe_highlight"
groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
<button name="action_rma_approve" type="object"
string="Approve"
attrs="{'invisible':[('state', '!=', 'to_approve')]}" class="oe_highlight" groups="rma.group_rma_customer_user"/>
<button name="action_rma_done" type="object"
string="Done"
attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
groups="rma.group_rma_customer_user"/>
<field name="state" widget="statusbar" nolabel="1"/>
</header>
<header/>
<sheet name='rma' string="RMA">
<div class="oe_button_box" name="button_box">
<button type="object" name="action_view_in_shipments"
@@ -109,15 +81,8 @@
</group>
<group>
<group col="4">
<field name="assigned_to"
groups="base.group_user"
context="{'default_groups_ref': ['rma.rma_user']}"/>
<field name="reference"/>
<field name="requested_by"
groups="base.group_user"
context="{'default_groups_ref': ['rma.rma_user']}"/>
<field name="date_rma"/>
<field name="type" invisible="1"/>
</group>
</group>
<notebook colspan="4">
@@ -145,6 +110,7 @@
</group>
<group name="comments">
<field name="comment"/>
<field name="type" readonly="1"/>
</group>
</page>
</notebook>
@@ -162,26 +128,7 @@
<field name="model">rma.order</field>
<field name="arch" type="xml">
<form string="RMA">
<field name="state" invisible="True"/>
<header>
<button name="action_rma_to_approve" type="object"
string="Request Approval"
attrs="{'invisible':[('state', '!=', 'draft')]}"
class="oe_highlight"
groups="rma.group_rma_supplier_user"/>
<button name="action_rma_draft" type="object"
string="Back to Draft"
attrs="{'invisible':[('state', '=', 'draft')]}" class="oe_highlight"
groups="rma.group_rma_supplier_user"/>
<button name="action_rma_approve" type="object"
string="Approve"
attrs="{'invisible':[('state', '!=', 'to_approve')]}" class="oe_highlight" groups="rma.group_rma_supplier_user"/>
<button name="action_rma_done" type="object"
string="Done"
attrs="{'invisible':[('state', 'in', ('done', 'draft'))]}"
groups="rma.group_rma_manager"/>
<field name="state" widget="statusbar" nolabel="1"/>
</header>
<header/>
<sheet string="RMA">
<div class="oe_button_box" name="button_box">
<button type="object" name="action_view_in_shipments"
@@ -218,15 +165,8 @@
</group>
<group>
<group col="4">
<field name="assigned_to"
groups="base.group_user"
context="{'default_groups_ref': ['rma.rma_user']}"/>
<field name="reference"/>
<field name="requested_by"
groups="base.group_user"
context="{'default_groups_ref': ['rma.rma_user']}"/>
<field name="date_rma"/>
<field name="type" invisible="1"/>
</group>
</group>
<notebook colspan="4">
@@ -258,6 +198,7 @@
</group>
<group name="comments">
<field name="comment"/>
<field name="type" readonly="1"/>
</group>
</page>
</notebook>
@@ -278,10 +219,7 @@
<field name="reference"/>
<field name="name"/>
<field name="partner_id"/>
<field name="requested_by"/>
<field name="assigned_to"/>
<separator/>
<filter domain="[('assigned_to','=',uid)]" help="My RMAs"/>
<group expand="0" string="Group By">
<filter name="partner" string="Partner" domain="[]"
context="{'group_by':'partner_id'}"/>
@@ -293,23 +231,21 @@
</record>
<record id="action_rma_customer" model="ir.actions.act_window">
<field name="name">Customer RMA</field>
<field name="name">Customer RMA Group</field>
<field name="res_model">rma.order</field>
<field name="view_type">form</field>
<field name="domain">[('type','=', 'customer')]</field>
<field name="context">{"search_default_assigned_to":uid,
'customer':1}</field>
<field name="context">{'customer':1}</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_rma_tree"/>
</record>
<record id="action_rma_supplier" model="ir.actions.act_window">
<field name="name">Supplier RMA</field>
<field name="name">Supplier RMA Group</field>
<field name="res_model">rma.order</field>
<field name="view_type">form</field>
<field name="domain">[('type','=', 'supplier')]</field>
<field name="context">{"search_default_assigned_to":uid,
'supplier':1}</field>
<field name="context">{'supplier':1}</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_rma_supplier_tree"/>
</record>
@@ -343,14 +279,14 @@
<menuitem
id="menu_rma_act_customer"
sequence="10"
sequence="50"
parent="menu_customer_rma"
groups="rma.group_rma_customer_user"
action="action_rma_customer"/>
<menuitem
id="menu_rma_act_supplier"
sequence="10"
sequence="50"
parent="menu_supplier_rma"
groups="rma.group_rma_supplier_user"
action="action_rma_supplier"/>