[9.0] rma: remove rma.rule and add that setting to product.category

This commit is contained in:
lreficent
2017-08-02 14:04:18 +02:00
committed by AaronHForgeFlow
parent 58da75554a
commit b0c14c7b0a
13 changed files with 59 additions and 140 deletions

View File

@@ -8,6 +8,7 @@
<field name="inherit_id" ref="product.product_category_form_view" />
<field name="arch" type="xml">
<field name="type" position="after">
<field name="rma_approval_policy"/>
<field name="rma_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
</field>
</field>
@@ -20,6 +21,7 @@
<field name="arch" type="xml">
<group name="inventory" position="inside">
<group name="rma" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user">
<field name="rma_approval_policy"/>
<field name="rma_operation_id"/>
</group>
</group>

View File

@@ -1,17 +0,0 @@
<?xml version="1.0"?>
<odoo>
<data>
<record id="view_company_form" model="ir.ui.view">
<field name="name">base_phone.company.form</field>
<field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form" />
<field name="arch" type="xml">
<group name="account_grp" position="after">
<group name="rma" string="RMA">
<field name="rma_rule_id"/>
</group>
</group>
</field>
</record>
</data>
</odoo>

View File

@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="rma_rule_tree" model="ir.ui.view">
<field name="name">rma.rule.tree</field>
<field name="model">rma.rule</field>
<field name="arch" type="xml">
<tree string="RMA rules">
<field name="code"/>
<field name="name"/>
</tree>
</field>
</record>
<record id="rma_rule_form" model="ir.ui.view">
<field name="name">rma.rule.form</field>
<field name="model">rma.rule</field>
<field name="arch" type="xml">
<form string="RMA Rules">
<group colspan="4" col="2">
<group name="description"
string="Description">
<field name="code"/>
<field name="name"/>
</group>
<group name="policies"
string="Policies">
<field name="approval_policy"/>
</group>
</group>
</form>
</field>
</record>
<record id="action_rma_rule" model="ir.actions.act_window">
<field name="name">Rules</field>
<field name="res_model">rma.rule</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="rma_rule_tree"/>
</record>
<menuitem id="menu_rma_rule"
name="Rules"
groups="rma.group_rma_manager"
sequence="36"
parent="rma.menu_rma_config"
action="action_rma_rule"/>
</data>
</odoo>