Tiffany Chang (tic)
4e32d1fe37
Previous commit 0501bbd62e made it so
the `product_uom_id` for the `line_ids` of a purchase.requsition (i.e. a
blanket order) were no longer being saved when the UoM setting is not
active. This would cause an error to occur when the "New Quotation"
button is pushed because the missing uom is expected by purchase
_onchange_requisition_id.
Steps to reproduce:
- Have UoM setting NOT active
- Create a blanket order for any product/vendor
- Confirm the blanket order
- Click on "New Quotation"
Expected Behavior:
New RFQ created
Actual Behavior:
Stacktrace
We also properly restrict the product_uom_id in the form view of the
line_ids to when the uom setting is active.
closes odoo/odoo#104900
X-original-commit: e90200a7b927ecccb8d4d6f31e3ddecba24d0b6d
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
313 lines
18 KiB
XML
313 lines
18 KiB
XML
<?xml version="1.0"?>
|
|
<odoo>
|
|
<data>
|
|
|
|
<!-- Purchase Requisition Type -->
|
|
|
|
<record model="ir.ui.view" id="view_purchase_requisition_type_tree">
|
|
<field name="name">purchase.requisition.type.tree</field>
|
|
<field name="model">purchase.requisition.type</field>
|
|
<field name="arch" type="xml">
|
|
<tree string="Purchase Agreement Types">
|
|
<field name="sequence" widget="handle"/>
|
|
<field name="name"/>
|
|
<field name="exclusive"/>
|
|
</tree>
|
|
</field>
|
|
</record>
|
|
|
|
<record id="view_purchase_requisition_type_kanban" model="ir.ui.view">
|
|
<field name="name">purchase.requisition.type.kanban</field>
|
|
<field name="model">purchase.requisition.type</field>
|
|
<field name="arch" type="xml">
|
|
<kanban class="o_kanban_mobile">
|
|
<field name="name"/>
|
|
<field name="exclusive"/>
|
|
<templates>
|
|
<t t-name="kanban-box">
|
|
<div t-attf-class="oe_kanban_global_click">
|
|
<div class="o_kanban_record_top ">
|
|
<div class="o_kanban_record_headings mt4">
|
|
<strong class="o_kanban_record_title"><field name="name"/></strong>
|
|
</div>
|
|
<field name="exclusive" widget="label_selection"/>
|
|
</div>
|
|
</div>
|
|
</t>
|
|
</templates>
|
|
</kanban>
|
|
</field>
|
|
</record>
|
|
<record model="ir.ui.view" id="view_purchase_requisition_type_form">
|
|
<field name="name">purchase.requisition.type.form</field>
|
|
<field name="model">purchase.requisition.type</field>
|
|
<field name="arch" type="xml">
|
|
<form string="Purchase Agreement Types">
|
|
<sheet>
|
|
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
|
|
<group>
|
|
<group string="Agreement Type">
|
|
<field name="name"/>
|
|
<field name="exclusive" widget="radio"/>
|
|
<field name="active" invisible="1"/>
|
|
</group>
|
|
<group string="Data for new quotations">
|
|
<field name="line_copy" widget="radio"/>
|
|
<field name="quantity_copy" widget="radio"/>
|
|
</group>
|
|
</group>
|
|
</sheet>
|
|
</form>
|
|
</field>
|
|
</record>
|
|
<record model="ir.ui.view" id="view_purchase_requisition_type_search">
|
|
<field name="name">purchase.requisition.type.search</field>
|
|
<field name="model">purchase.requisition.type</field>
|
|
<field name="arch" type="xml">
|
|
<search>
|
|
<field name="name"/>
|
|
<separator/>
|
|
<filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
|
|
</search>
|
|
</field>
|
|
</record>
|
|
|
|
<!-- Purchase Orders -->
|
|
|
|
<record model="ir.actions.act_window" id="action_purchase_requisition_to_so">
|
|
<field name="name">Request for Quotation</field>
|
|
<field name="type">ir.actions.act_window</field>
|
|
<field name="res_model">purchase.order</field>
|
|
<field name="view_mode">form,tree</field>
|
|
<field name="domain">[('requisition_id','=',active_id)]</field>
|
|
<field name="context">{
|
|
"default_requisition_id":active_id,
|
|
"default_user_id": False,
|
|
}
|
|
</field>
|
|
</record>
|
|
<record model="ir.actions.act_window" id="action_purchase_requisition_list">
|
|
<field name="name">Request for Quotations</field>
|
|
<field name="type">ir.actions.act_window</field>
|
|
<field name="res_model">purchase.order</field>
|
|
<field name="view_mode">tree,form</field>
|
|
<field name="domain">[('requisition_id','=',active_id)]</field>
|
|
<field name="context">{
|
|
"default_requisition_id":active_id,
|
|
"default_user_id": False,
|
|
}
|
|
</field>
|
|
</record>
|
|
|
|
<record model="ir.ui.view" id="view_purchase_requisition_form">
|
|
<field name="name">purchase.requisition.form</field>
|
|
<field name="model">purchase.requisition</field>
|
|
<field name="arch" type="xml">
|
|
<form string="Purchase Agreements">
|
|
<field name="company_id" invisible="1"/>
|
|
<header>
|
|
<button name="%(action_purchase_requisition_to_so)d" type="action"
|
|
string="New Quotation"
|
|
attrs="{'invisible': [('state', '!=', 'open')]}"/>
|
|
<button name="%(action_purchase_requisition_to_so)d" type="action"
|
|
string="New Quotation" class="btn-primary"
|
|
attrs="{'invisible': [('state', 'not in', ('in_progress', 'ongoing'))]}"/>
|
|
<button name="action_in_progress" states="draft" string="Confirm" type="object" class="btn-primary"/>
|
|
<button name="action_open" states="in_progress" string="Validate" type="object" class="btn-primary"/>
|
|
<button name="action_done" states="open,ongoing" string="Close" type="object" class="btn-primary"/>
|
|
<button name="action_draft" states="cancel" string="Reset to Draft" type="object"/>
|
|
<button name="action_cancel" states="draft,in_progress,ongoing" string="Cancel" type="object"/>
|
|
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,open,done" attrs="{'invisible': [('is_quantity_copy', '=', 'none')]}"/>
|
|
<field name="state_blanket_order" widget="statusbar" statusbar_visible="draft,ongoing,done" attrs="{'invisible': [('is_quantity_copy', '!=', 'none')]}"/>
|
|
</header>
|
|
<sheet>
|
|
<div class="oe_button_box" name="button_box">
|
|
<button name="%(action_purchase_requisition_list)d" type="action" class="oe_stat_button" icon="fa-list-alt"
|
|
attrs="{'invisible': [('state', '=', 'draft')]}">
|
|
<field name="order_count" widget="statinfo" string="RFQs/Orders"/>
|
|
</button>
|
|
</div>
|
|
<div class="oe_title">
|
|
<label for="name" class="oe_inline"/>
|
|
<h1>
|
|
<field name="name"/>
|
|
</h1>
|
|
</div>
|
|
<group>
|
|
<group>
|
|
<field name="is_quantity_copy" invisible='1'/>
|
|
<field name="user_id" attrs="{'readonly': [('state','not in',('draft','in_progress','open'))]}" domain="[('share', '=', False)]"/>
|
|
<field name="type_id" attrs="{'readonly': [('state','!=','draft')]}"/>
|
|
<field name="vendor_id" context="{'res_partner_search_mode': 'supplier'}" attrs="{'required': [('is_quantity_copy', '=', 'none')], 'readonly': [('state', 'in', ['ongoing','done'])]}"/>
|
|
<field name="currency_id" groups="base.group_multi_currency"/>
|
|
</group>
|
|
<group>
|
|
<field name="date_end" attrs="{'readonly': [('state','not in',('draft','in_progress','open','ongoing'))]}"/>
|
|
<field name="ordering_date" attrs="{'readonly': [('state','not in',('draft','in_progress','open','ongoing'))]}"/>
|
|
<field name="schedule_date" attrs="{'readonly': [('state','not in',('draft','in_progress','open','ongoing'))]}"/>
|
|
<field name="origin" placeholder="e.g. PO0025" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
|
|
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" attrs="{'readonly': [('state','not in',('draft'))]}"/>
|
|
</group>
|
|
</group>
|
|
<notebook>
|
|
<page string="Products" name="products">
|
|
<field name="line_ids">
|
|
<tree string="Products" editable="bottom">
|
|
<field name="product_id"
|
|
domain="[('purchase_ok', '=', True), '|', ('company_id', '=', False), ('company_id', '=', parent.company_id)]"/>
|
|
<field name="product_description_variants" attrs="{'invisible': [('product_description_variants', '=', '')], 'readonly': [('parent.state', '!=', 'draft')]}"/>
|
|
<field name="product_qty"/>
|
|
<field name="qty_ordered" optional="show"/>
|
|
<field name="product_uom_category_id" invisible="1"/>
|
|
<field name="product_uom_id" string="UoM" groups="uom.group_uom" optional="show" attrs="{'required': [('product_id', '!=', False)]}"/>
|
|
<field name="schedule_date" optional="hide"/>
|
|
<field name="analytic_distribution" widget="analytic_distribution"
|
|
optional="hide"
|
|
groups="analytic.group_analytic_accounting"
|
|
options="{'product_field': 'product_id', 'business_domain': 'purchase_order'}"/>
|
|
<field name="price_unit"/>
|
|
</tree>
|
|
<form string="Products">
|
|
<group>
|
|
<field name="product_id"
|
|
domain="[('purchase_ok', '=', True), '|', ('company_id', '=', False), ('company_id', '=', parent.company_id)]" />
|
|
<field name="product_qty"/>
|
|
<field name="qty_ordered"/>
|
|
<field name="product_uom_category_id" invisible="1"/>
|
|
<field name="product_uom_id" groups="uom.group_uom"/>
|
|
<field name="schedule_date"/>
|
|
<field name="analytic_distribution" widget="analytic_distribution"
|
|
groups="analytic.group_analytic_accounting"
|
|
options="{'product_field': 'product_id', 'business_domain': 'purchase_order'}"/>
|
|
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
|
|
</group>
|
|
</form>
|
|
</field>
|
|
<separator string="Terms and Conditions"/>
|
|
<field name="description" class="oe-bordered-editor" attrs="{'readonly': [('state','not in',('draft','in_progress','open'))]}"/>
|
|
</page>
|
|
</notebook>
|
|
</sheet>
|
|
<div class="oe_chatter">
|
|
<field name="message_follower_ids"/>
|
|
<field name="activity_ids"/>
|
|
<field name="message_ids"/>
|
|
</div>
|
|
</form>
|
|
</field>
|
|
</record>
|
|
<record model="ir.ui.view" id="view_purchase_requisition_tree">
|
|
<field name="name">purchase.requisition.tree</field>
|
|
<field name="model">purchase.requisition</field>
|
|
<field name="arch" type="xml">
|
|
<tree string="Purchase Agreements" sample="1">
|
|
<field name="message_needaction" invisible="1"/>
|
|
<field name="name" decoration-bf="1"/>
|
|
<field name="user_id" optional="show" widget='many2one_avatar_user'/>
|
|
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" optional="show"/>
|
|
<field name="ordering_date" optional="show"/>
|
|
<field name="schedule_date" optional="hide"/>
|
|
<field name="date_end" optional="show" widget='remaining_days' decoration-danger="date_end and date_end<current_date" attrs="{'invisible': [('state','in', ('done', 'cancel'))]}"/>
|
|
<field name="origin" optional="show"/>
|
|
<field name="state" optional="show" widget='badge' decoration-success="state == 'done'" decoration-info="state not in ('done', 'cancel')"/>
|
|
<field name="activity_exception_decoration" widget="activity_exception"/>
|
|
</tree>
|
|
</field>
|
|
</record>
|
|
|
|
<record id="view_purchase_requisition_kanban" model="ir.ui.view">
|
|
<field name="name">purchase.requisition.kanban</field>
|
|
<field name="model">purchase.requisition</field>
|
|
<field name="arch" type="xml">
|
|
<kanban class="o_kanban_mobile" sample="1">
|
|
<field name="name"/>
|
|
<field name="state"/>
|
|
<field name="user_id"/>
|
|
<field name="type_id"/>
|
|
<templates>
|
|
<t t-name="kanban-box">
|
|
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
|
|
<div class="o_kanban_record_top">
|
|
<div class="o_kanban_record_headings mt4">
|
|
<strong class="o_kanban_record_title"><span><field name="name"/></span></strong>
|
|
</div>
|
|
<field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'in_progress': 'default', 'open': 'success', 'done': 'success', 'close': 'danger'}}" readonly="1"/>
|
|
</div>
|
|
<div class="o_kanban_record_body">
|
|
<span class="text-muted"><field name="type_id"/></span>
|
|
</div>
|
|
<div class="o_kanban_record_bottom">
|
|
<div class="oe_kanban_bottom_left">
|
|
<field name="vendor_id"/>
|
|
</div>
|
|
<div class="oe_kanban_bottom_right">
|
|
<field name="user_id" widget="many2one_avatar_user"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</t>
|
|
</templates>
|
|
</kanban>
|
|
</field>
|
|
</record>
|
|
|
|
<record id="view_purchase_requisition_filter" model="ir.ui.view">
|
|
<field name="name">purchase.requisition.list.select</field>
|
|
<field name="model">purchase.requisition</field>
|
|
<field name="arch" type="xml">
|
|
<search string="Search Purchase Agreements">
|
|
<field name="name" string="Reference" filter_domain="['|', ('name', 'ilike', self), ('origin', 'ilike', self)]"/>
|
|
<field name="user_id"/>
|
|
<field name="product_id"/>
|
|
<filter string="My Agreements" name="my_agreements" domain="[('user_id', '=', uid)]"/>
|
|
<separator/>
|
|
<filter string="Draft" name="draft" domain="[('state', '=', 'draft')]" help="New Agreements"/>
|
|
<filter string="Confirmed" name="confirmed" domain="[('state', 'in', ('in_progress', 'open'))]" help="In negotiation"/>
|
|
<filter string="Done" name="done" domain="[('state', '=', 'done')]"/>
|
|
<separator/>
|
|
<filter invisible="1" string="Late Activities" name="activities_overdue"
|
|
domain="[('my_activity_date_deadline', '<', context_today().strftime('%Y-%m-%d'))]"
|
|
help="Show all records which has next action date is before today"/>
|
|
<filter invisible="1" string="Today Activities" name="activities_today"
|
|
domain="[('my_activity_date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
|
|
<filter invisible="1" string="Future Activities" name="activities_upcoming_all"
|
|
domain="[('my_activity_date_deadline', '>', context_today().strftime('%Y-%m-%d'))]"/>
|
|
<group expand="0" string="Group By">
|
|
<filter string="Purchase Representative" name="representative" domain="[]" context="{'group_by': 'user_id'}"/>
|
|
<filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
|
|
<filter string="Ordering Date" name="ordering_date" domain="[]" context="{'group_by': 'ordering_date'}"/>
|
|
</group>
|
|
</search>
|
|
</field>
|
|
</record>
|
|
|
|
|
|
<record model="ir.actions.act_window" id="action_purchase_requisition">
|
|
<field name="name">Blanket Orders</field>
|
|
<field name="type">ir.actions.act_window</field>
|
|
<field name="res_model">purchase.requisition</field>
|
|
<field name="view_mode">tree,kanban,form</field>
|
|
<field name="context">{}</field>
|
|
<field name="search_view_id" ref="view_purchase_requisition_filter"/>
|
|
<field name="help" type="html">
|
|
<p class="o_view_nocontent_smiling_face">
|
|
Start a new purchase agreement
|
|
</p><p>
|
|
An example of a purchase agreement is a blanket order.
|
|
</p><p>
|
|
For a blanket order, you can record an agreement for a specific period
|
|
(e.g. a year) and you order products within this agreement to benefit
|
|
from the negotiated prices.
|
|
</p>
|
|
</field>
|
|
</record>
|
|
|
|
<menuitem
|
|
id="menu_purchase_requisition_pro_mgt"
|
|
sequence="10"
|
|
parent="purchase.menu_procurement_management"
|
|
action="action_purchase_requisition"/>
|
|
|
|
</data>
|
|
</odoo>
|