<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
- <!--
+ <data>
+ <!--
Procurement
-->
<field name="model">procurement.order</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Procurement Lines" colors="red:date_planned<current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+ <tree string="Procurement Lines" colors="red:date_planned<current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
<field name="date_planned" widget="date"/>
<field name="origin"/>
<field name="product_id"/>
<field name="name">procurement.order.tree.board</field>
<field name="model">procurement.order</field>
<field name="type">tree</field>
+ <field eval="20" name="priority"/>
<field name="arch" type="xml">
- <tree string="Procurement Lines" colors="red:date_planned<current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+ <tree string="Procurement Lines" colors="red:date_planned<current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
<field name="date_planned" widget="date"/>
<field name="origin"/>
<field name="product_id"/>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Procurement">
- <group col='10' colspan='4'>
- <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
- <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
- domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed'))]"
- help="Procurement started late" />
- <separator orientation="vertical"/>
+ <group>
<filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
<filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
<filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
<separator orientation="vertical"/>
+ <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+ domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed'))]"
+ help="Procurement started late" />
+ <separator orientation="vertical"/>
<field name="origin"/>
<field name="product_id" />
- <field name="date_planned" widget="date"/>
+ <field name="date_planned"/>
<field name="state" />
</group>
<newline/>
- <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
+ <group expand="0" string="Group By" groups="base.group_extended">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
<filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Minimum Stock Rules Search">
- <group col="10" colspan="4">
+ <group>
<field name="name"/>
<field name="warehouse_id" widget="selection"/>
<field name="location_id"/>
<field name="product_id"/>
</group>
<newline/>
- <group expand="0" string="Group By..." colspan="4" col="10">
+ <group expand="0" string="Group By...">
<filter string="Warehouse" icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
<filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/>
</group>
</record>
<act_window
- context="{'search_default_warehouse_id': active_id}"
+ context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
id="act_stock_warehouse_2_stock_warehouse_orderpoint"
- name="Minimum Stock Rules"
- res_model="stock.warehouse.orderpoint"
+ name="Minimum Stock Rules"
+ res_model="stock.warehouse.orderpoint"
src_model="stock.warehouse"
groups="stock.group_stock_user"/>
<!-- add product_uom to context to be the default value when adding new orderpoints -->
<act_window
- context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id]}"
+ context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id], 'default_product_id': active_id}"
id="act_product_product_2_stock_warehouse_orderpoint"
name="Minimum Stock Rules"
res_model="stock.warehouse.orderpoint"
groups="stock.group_stock_user"/>
<act_window
- context="{'product_uom': locals().has_key('uom_id') and uom_id}"
- domain="[('procurement_id', '=', active_id)]"
+ context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
id="act_procurement_2_stock_warehouse_orderpoint"
name="Minimum Stock Rules"
res_model="stock.warehouse.orderpoint"
<menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
<menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="menu_stock_procurement" sequence="10"/>
+
+ <record id="product_normal_form_view" model="ir.ui.view">
+ <field name="name">product.normal.form.orderpoint.inherit</field>
+ <field name="model">product.product</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="product.product_normal_form_view"/>
+ <field name="arch" type="xml">
+ <group name="misc" position="after">
+ <group col="2" colspan="2" attrs="{'invisible':[('type', '=', 'service')]}">
+ <separator string="Minimum Stock Rules" colspan="2"/>
+ <field name="orderpoint_ids" context="{'default_product_uom': uom_id}" nolabel="1">
+ <tree string="Minimum Stock Rule" editable="bottom">
+ <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+ <field name="location_id" groups="base.group_extended"/>
+ <field name="product_min_qty"/>
+ <field name="product_max_qty"/>
+ <field name="product_uom" groups="base.group_extended"/>
+ </tree>
+ </field>
+ </group>
+ </group>
+ </field>
+ </record>
+
+
</data>
</openerp>
projects / odoo / odoo.git / blobdiff