odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] purchase: removed obsolete menu entries since we now have filters in advanced search 

bzr revid: olt@tinyerp.com-20091124100823-7gxzw9hndf7acmap
This commit is contained in:
olt@tinyerp.com 2009-11-24 11:08:23 +01:00
parent b455a247e8
commit 5e6e84fc3e
4 changed files with 102 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mrp/process/stockable_product_process.xml
View File

@ -39,7 +39,7 @@
</record>
<record id="process_node_rfq0" model="process.node">
<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
<field name="model_id" ref="purchase.model_purchase_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Request for Quotation.&quot;&quot;&quot;" name="note"/>
@ -84,4 +84,4 @@
</record>
</data>
</openerp>
</openerp>

68
addons/product/product_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem icon="terp-product" id="menu_main_product" name="Products"/>
<menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />
<menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />
<menuitem
id="menu_config_product"
name="Configuration"
@ -16,21 +16,21 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Product">
<group col='8' colspan='4'>
<filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
<filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
<field name="name" select="1"/>
<field name="default_code" select="1"/>
<field name="categ_id" select="1" widget="selection"/>
</group>
<newline/>
<group col='8' colspan='4'>
<filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
<filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
<field name="name" select="1"/>
<field name="default_code" select="1"/>
<field name="categ_id" select="1" widget="selection"/>
</group>
<newline/>
<group col='8' colspan='4'>
<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
</group>
<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
</group>
</search>
</field>
</record>
<record id="product_product_tree_view" model="ir.ui.view">
<field name="name">product.product.tree</field>
<field name="model">product.product</field>
@ -76,7 +76,7 @@
<field groups="base.group_extended" name="rental" select="2"/>
</group>
</group>
<notebook colspan="4">
<page string="Information">
<group colspan="2" col="2">
@ -185,11 +185,11 @@
<field name="res_model">product.product</field>
<field name="view_type">form</field>
<field name="view_id" ref="product_product_tree_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
</record>
<menuitem action="product_normal_action" id="menu_products" parent="product.menu_products_products" sequence="1"/>
<record id="product_category_form_view" model="ir.ui.view">
<field name="name">product.category.form</field>
<field name="model">product.category</field>
@ -234,7 +234,7 @@
<field name="view_id" ref="product_category_tree_view"/>
</record>
<menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>
<record id="product_category_action_form" model="ir.actions.act_window">
<field name="name">Products Categories</field>
<field name="type">ir.actions.act_window</field>
@ -243,8 +243,8 @@
<field name="view_id" ref="product_category_list_view"/>
</record>
<menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>
<record id="product_normal_action_tree" model="ir.actions.act_window">
<field name="name">Products</field>
<field name="type">ir.actions.act_window</field>
@ -261,10 +261,10 @@
<field eval="'ir.actions.act_window,%d'%product_normal_action_tree" name="value"/>
<field eval="True" name="object"/>
</record>
<!-- Unit of Measure -->
<record id="product_uom_tree_view" model="ir.ui.view">
<field name="name">product.uom.tree</field>
<field name="model">product.uom</field>
@ -279,7 +279,7 @@
</tree>
</field>
</record>
<record id="product_uom_form_view" model="ir.ui.view">
<field name="name">product.uom.form</field>
<field name="model">product.uom</field>
@ -303,7 +303,7 @@
<field name="view_id" ref="product_uom_tree_view"/>
</record>
<menuitem id="next_id_16" name="Units of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
<record id="product_uom_categ_form_view" model="ir.ui.view">
<field name="name">product.uom.categ.form</field>
<field name="model">product.uom.categ</field>
@ -322,7 +322,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>
<record id="product_ul_form_view" model="ir.ui.view">
<field name="name">product.ul.form.view</field>
<field name="model">product.ul</field>
@ -353,7 +353,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>
<record id="product_packaging_tree_view" model="ir.ui.view">
<field name="name">product.packaging.tree.view</field>
<field name="model">product.packaging</field>
@ -367,7 +367,7 @@
</tree>
</field>
</record>
<record id="product_packaging_form_view" model="ir.ui.view">
<field name="name">product.packaging.form.view</field>
<field name="model">product.packaging</field>
@ -395,7 +395,7 @@
</form>
</field>
</record>
<record id="product_supplierinfo_form_view" model="ir.ui.view">
<field name="name">product.supplierinfo.form.view</field>
<field name="model">product.supplierinfo</field>
@ -435,7 +435,7 @@
</tree>
</field>
</record>
<record id="product_variant_form_view" model="ir.ui.view">
<field name="name">product.variant.form</field>
<field name="model">product.product</field>
@ -452,7 +452,7 @@
</form>
</field>
</record>
<record id="product_variant_tree_view" model="ir.ui.view">
<field name="name">product.variant.tree</field>
<field name="model">product.product</field>
@ -482,7 +482,7 @@
</tree>
</field>
</record>
<record id="product_template_form_view" model="ir.ui.view">
<field name="name">product.template.product.form</field>
<field name="model">product.template</field>
@ -575,7 +575,7 @@
</form>
</field>
</record>
<record id="product_template_action_tree" model="ir.actions.act_window">
<field name="name">Product Templates</field>
<field name="type">ir.actions.act_window</field>
@ -583,8 +583,8 @@
<field name="view_type">form</field>
<field name="view_id" ref="product_template_tree_view"/>
</record>
<menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
</data>
</openerp>

92
addons/purchase/process/purchase_process.xml
View File

@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
<!--
Process
-->
<record id="process_process_purchaseprocess0" model="process.process">
<field eval="1" name="active"/>
<field name="model_id" ref="purchase.model_purchase_order"/>
<field eval="&quot;&quot;&quot;Purchase&quot;&quot;&quot;" name="name"/>
</record>
<!--
<!--
Process Node
-->
<record id="process_node_packinginvoice0" model="process.node">
<field name="menu_id" ref="stock.menu_picking_waiting"/>
<field name="model_id" ref="stock.model_stock_picking"/>
@ -26,7 +26,7 @@
<field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_purchaseorder0" model="process.node">
<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
<field name="model_id" ref="purchase.model_purchase_order"/>
@ -38,9 +38,9 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_draftpurchaseorder0" model="process.node">
<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
<field name="model_id" ref="purchase.model_purchase_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
@ -49,9 +49,9 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_draftpurchaseorder1" model="process.node">
<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
<field name="model_id" ref="purchase.model_purchase_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
@ -60,9 +60,9 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_confirmpurchaseorder0" model="process.node">
<field name="menu_id" ref="purchase.menu_purchase_form_action3"/>
<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
<field name="model_id" ref="purchase.model_purchase_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Confirmed&quot;&quot;&quot;" name="name"/>
@ -71,9 +71,9 @@
<field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_approvepurchaseorder0" model="process.node">
<field name="menu_id" ref="purchase.menu_purchase_form_action4"/>
<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
<field name="model_id" ref="purchase.model_purchase_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Approved&quot;&quot;&quot;" name="name"/>
@ -82,7 +82,7 @@
<field eval="&quot;&quot;&quot;object.state=='approved'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_invoicecontrol0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree8"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -94,7 +94,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_packinglist0" model="process.node">
<field name="menu_id" ref="stock.menu_action_picking_tree4"/>
<field name="model_id" ref="stock.model_stock_picking"/>
@ -105,7 +105,7 @@
<field eval="&quot;&quot;&quot;object.state=='assigned'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_invoiceafterpacking0" model="process.node">
<field name="menu_id" ref="account.menu_finance_invoice"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -117,7 +117,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_productrecept0" model="process.node">
<field name="menu_id" ref="stock.menu_picking_waiting"/>
<field name="model_id" ref="stock.model_stock_picking"/>
@ -129,9 +129,9 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<!--
Process Condition
<!--
Process Condition
-->
<record id="process_condition_conditionorigin" model="process.condition">
@ -140,30 +140,30 @@
<field eval="&quot;&quot;&quot;object.origin==''&quot;&quot;&quot;" name="model_states"/>
<field eval="&quot;&quot;&quot;condition_origin&quot;&quot;&quot;" name="name"/>
</record>
<record id="process_condition_conditioninvoicemanual" model="process.condition">
<field name="model_id" ref="purchase.model_purchase_order"/>
<field name="node_id" ref="process_node_invoicecontrol0"/>
<field eval="&quot;&quot;&quot;object.invoice_method=='manual'&quot;&quot;&quot;" name="model_states"/>
<field eval="&quot;&quot;&quot;condition_invoice_manual&quot;&quot;&quot;" name="name"/>
</record>
<!--
<!--
Process Transition
-->
<record id="res_roles_purchase0" model="res.roles">
<field eval="&quot;&quot;&quot;Purchase&quot;&quot;&quot;" name="name"/>
</record>
<record id="purchase.trans_draft_confirmed" model="workflow.transition">
<field name="role_id" ref="res_roles_purchase0"/>
</record>
<record id="purchase.trans_router_invoice" model="workflow.transition">
<field name="role_id" ref="res_roles_purchase0"/>
</record>
<record id="process_transition_productrecept0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -172,7 +172,7 @@
<field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
<field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
</record>
<record id="process_transition_confirmingpurchaseorder0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -182,7 +182,7 @@
<field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/>
<field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
</record>
<record id="process_transition_confirmingpurchaseorder1" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -191,7 +191,7 @@
<field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
<field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/>
</record>
<record id="process_transition_approvingpurchaseorder0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -200,7 +200,7 @@
<field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/>
<field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" />
</record>
<record id="process_transition_invoicefrompurchase0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -210,7 +210,7 @@
<field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
<field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/>
</record>
<record id="process_transition_createpackinglist0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -219,7 +219,7 @@
<field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
<field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
</record>
<record id="process_transition_invoicefrompackinglist0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -228,7 +228,7 @@
<field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/>
<field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
</record>
<record id="process_transition_purchaseinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -237,7 +237,7 @@
<field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
<field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/>
</record>
<record id="process_transition_packinginvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -246,45 +246,45 @@
<field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
<field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
</record>
<!--
<!--
Process Action
-->
<record id="process_transition_action_confirmpurchaseorder0" model="process.transition.action">
<field eval="&quot;&quot;&quot;wkf_confirm_order&quot;&quot;&quot;" name="action"/>
<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
<field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
<field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/>
</record>
<record id="process_transition_action_cancelpurchaseorder0" model="process.transition.action">
<field eval="&quot;&quot;&quot;write({'state':'cancel'})&quot;&quot;&quot;" name="action"/>
<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
<field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
<field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/>
</record>
<record id="process_transition_action_approvingpurchaseorder0" model="process.transition.action">
<field eval="&quot;&quot;&quot;wkf_approve_order&quot;&quot;&quot;" name="action"/>
<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
<field eval="&quot;&quot;&quot;Approve&quot;&quot;&quot;" name="name"/>
<field name="transition_id" ref="process_transition_approvingpurchaseorder0"/>
</record>
<record id="process_transition_action_approvingcancelpurchaseorder0" model="process.transition.action">
<field eval="&quot;&quot;&quot;write({'state':'cancel'})&quot;&quot;&quot;" name="action"/>
<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
<field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
<field name="transition_id" ref="process_transition_approvingpurchaseorder0"/>
</record>.
<record id="process_transition_action_invoicefrompurchaseorder0" model="process.transition.action">
<field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
<field eval="&quot;&quot;&quot;Create invoice&quot;&quot;&quot;" name="name"/>
<field name="transition_id" ref="process_transition_invoicefrompurchase0"/>
</record>
</data>
</openerp>
</openerp>

38
addons/purchase/purchase_view.xml
View File

@ -116,31 +116,32 @@
<search string="Search Purchase Order">
<group col='10' colspan='4'>
<filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
<filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
<separator orientation="vertical"/>
<filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="partner_id" select="1"/>
<field name="product_id" select="1"/>
<field name="create_uid" select="1" widget="selection">
<filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>
<filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
<separator orientation="vertical"/>
<filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="partner_id" select="1"/>
<field name="product_id" select="1"/>
<field name="create_uid" select="1" widget="selection">
<filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>
<filter icon="terp-purchase" domain="[('create_uid','child_of',[uid])]" help="My Departments Purchase Orders"/>
</field>
</group>
</search>
</field>
</record>
<record id="purchase_form_action" model="ir.actions.act_window">
<field name="name">Purchase Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
<!--
<record id="purchase_form_action2" model="ir.actions.act_window">
<field name="name">Request For Quotations</field>
<field name="type">ir.actions.act_window</field>
@ -149,7 +150,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
@ -161,7 +162,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','confirmed')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
@ -173,9 +174,10 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','approved')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
-->
<record id="purchase_form_action_new" model="ir.actions.act_window">
<field name="name">New Purchase Order</field>
@ -266,11 +268,11 @@
src_model="res.partner"/>
<act_window
domain="[('product_id','=',active_id)]"
domain="[('product_id','=',active_id)]"
id="action_purchase_line_product_tree"
name="Product purchases"
res_model="purchase.order.line"
src_model="product.product"/>
res_model="purchase.order.line"
src_model="product.product"/>
</data>
</openerp>