parent="base.menu_purchase_root" sequence="1" />
<menuitem id="menu_purchase_config_purchase" name="Configuration"
+ groups="group_purchase_manager"
parent="base.menu_purchase_root" sequence="100"/>
- <menuitem
+ <menuitem
id="menu_purchase_config_pricelist" name="Pricelists"
- parent="menu_purchase_config_purchase" sequence="50"/>
-
+ parent="menu_purchase_config_purchase" sequence="50" groups="base.group_extended"/>
+
<menuitem
action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
parent="menu_purchase_config_pricelist" sequence="20"/>
<menuitem
- action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
+ action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
parent="menu_purchase_config_pricelist" sequence="10"/>
- <menuitem
+ <!--<menuitem
action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type"
parent="menu_purchase_config_pricelist" sequence="2"
- groups="base.group_extended"/>
+ groups="base.group_extended"/>-->
- <menuitem
+ <menuitem
id="menu_product_in_config_purchase" name="Product"
parent="menu_purchase_config_purchase" sequence="30"/>
-
+
<menuitem
action="product.product_category_action_form" id="menu_product_category_config_purchase"
parent="purchase.menu_product_in_config_purchase" sequence="10"/>
-
- <menuitem
+
+ <menuitem
id="menu_purchase_unit_measure_purchase" name="Units of Measure"
parent="purchase.menu_product_in_config_purchase" sequence="20"/>
-
+
<menuitem
action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
parent="menu_purchase_unit_measure_purchase" sequence="30"/>
-
+
<menuitem
action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
parent="menu_purchase_unit_measure_purchase" sequence="30"/>
+ <menuitem
+ id="menu_purchase_partner_cat" name="Address Book"
+ parent="menu_purchase_config_purchase"/>
+
+ <menuitem
+ action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories"
+ parent="purchase.menu_purchase_partner_cat"/>
+
<!--supplier addresses action-->
<record id="action_supplier_address_form" model="ir.actions.act_window">
<!--Inventory control-->
<menuitem id="menu_procurement_management_inventory" name="Receive Products"
- parent="base.menu_purchase_root" sequence="4"/>
- <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
- name="Incoming Shipments" sequence="9"
+ parent="base.menu_purchase_root" sequence="4"
groups="base.group_extended"/>
+ <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
+ name="Incoming Shipments" sequence="9"/>
<menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
- parent="menu_procurement_management_inventory" sequence="11"/>
+ parent="menu_procurement_management_inventory" sequence="11"
+ groups="base.group_extended"/>
<!--Invoice control-->
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
<field name="view_mode">tree,form,calendar,graph</field>
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','in_invoice')]</field>
- <field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
+ <field name="context">{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
<field name="search_view_id" ref="account.view_account_invoice_filter"/>
<field name="help">Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it.</field>
</record>
- <menuitem name="Supplier Invoices to Receive"
+ <menuitem name="Based on draft invoices"
id="menu_procurement_management_pending_invoice"
action="action_invoice_pending"
parent="menu_procurement_management_invoice"
<!--product menu-->
<menuitem id="menu_procurement_management_product" name="Products"
parent="base.menu_purchase_root" sequence="8"/>
-
+
<menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
parent="menu_procurement_management_product" sequence="10"/>
-
+
<menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
parent="menu_procurement_management_product"/>
</calendar>
</field>
</record>
- <record model="ir.ui.view" id="view_purchase_order_graph">
+ <record model="ir.ui.view" id="purchase_order_graph">
<field name="name">purchase.order.graph</field>
<field name="model">purchase.order</field>
<field name="type">graph</field>
</group>
<notebook colspan="4">
<page string="Purchase Order">
- <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}" />
+ <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" />
<field name="partner_address_id"/>
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
<field name="origin" groups="base.group_extended"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
</group>
<group col="11" colspan="4">
- <field name="state" readonly="1"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
<button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
<button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
- <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
+ <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
</group>
</page>
<separator string="Purchase Control" colspan="4"/>
<field name="validator"/>
<field name="date_approve"/>
- <separator string="Invoices" colspan="4"/>
- <newline/>
- <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4"/>
+ <separator string="Invoices" colspan="4"/>
+ <newline/>
+ <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
</field>
</record>
- <record id="view_purchase_order_filter" model="ir.ui.view">
+ <record id="view_request_for_quotation_filter" model="ir.ui.view">
+ <field name="name">request.quotation.select</field>
+ <field name="model">purchase.order</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Purchase Order">
+ <group>
+ <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
+ <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
+ <separator orientation="vertical"/>
+ <field name="name" string="Reference"/>
+ <field name="partner_id"/>
+ <field name="product_id"/>
+ <field name="create_uid"/>
+ </group>
+ <newline/>
+ <group expand="0" string="Group By..." groups="base.group_extended">
+ <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+ <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <record id="view_purchase_order_filter" model="ir.ui.view">
<field name="name">purchase.order.list.select</field>
<field name="model">purchase.order</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Purchase Order">
- <group col='10' colspan='4'>
- <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1" help="Purchase order which are in draft state"/>
- <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1" help="Purchase order to be approved"/>
- <filter icon="terp-check" name="approved" string="Approved" domain="[('state','=','approved')]" separator="1" help="Approved purchase order"/>
+ <group>
+ <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+ <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('draft','wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
+ <filter icon="terp-check" name="approved" string="Approved" domain="[('state','=','approved')]" help="Approved purchase orders"/>
+ <filter icon="terp-accessories-archiver+" string="Done" domain="[('state','=','done')]" help="Purchase orders which are in done state."/>
<separator orientation="vertical"/>
- <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
+ <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
<separator orientation="vertical"/>
- <filter icon="terp-gtk-go-back-rtl" string="No Invoice" domain="[('invoice_ids','=', False)]" separator="1" help="Purchase order with No Invoice" groups="base.group_extended"/>
+ <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
<separator orientation="vertical"/>
- <field name="name" select="1" string="Reference"/>
- <field name="partner_id" select="1"/>
- <field name="product_id" select="1"/>
- <field name="create_uid" select="1"/>
+ <field name="name" string="Reference"/>
+ <field name="partner_id"/>
+ <field name="product_id"/>
+ <field name="create_uid"/>
</group>
<newline/>
- <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+ <group expand="0" string="Group By..." groups="base.group_extended">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
</search>
</field>
</record>
+
<record id="purchase_order_tree" model="ir.ui.view">
<field name="name">purchase.order.tree</field>
<field name="model">purchase.order</field>
<field name="arch" type="xml">
<tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
<field name="name" string="Reference"/>
- <field name="date_order" string="Order Date"/>
+ <field name="date_order" />
<field name="partner_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <field name="location_id"/>
- <field name="minimum_planned_date"/>
+ <field name="minimum_planned_date" invisible="context.get('quotation_only', False)"/>
<field name="origin"/>
- <field name="invoiced_rate" widget="progressbar"/>
- <field name="shipped_rate" widget="progressbar"/>
+ <field name="invoiced_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
+ <field name="shipped_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
<field name="amount_untaxed" sum="Total Untaxed amount"/>
<field name="amount_total" sum="Total amount"/>
<field name="state"/>
<field name="name">Requests for Quotation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
- <field name="view_type">form</field>
<field name="context">{'search_default_draft': 1}</field>
<field name="view_mode">tree,form,graph,calendar</field>
- <field name="search_view_id" ref="view_purchase_order_filter"/>
- <field name="help">With the Requests for Quotation menu you can create new requests for quotations, review existing ones or turn them into a purchase order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, draft invoice to control.</field>
+ <field name="search_view_id" ref="view_request_for_quotation_filter"/>
+ <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
</record>
- <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
- sequence="6" groups="group_purchase_manager,group_purchase_user"/>
+ <menuitem action="purchase_rfq" id="menu_purchase_rfq"
+ parent="menu_procurement_management"
+ sequence="6"/>
<record id="purchase_form_action" model="ir.actions.act_window">
<field name="name">Purchase Orders</field>
<field name="view_mode">tree,form,graph,calendar</field>
<field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
- <field name="help">From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.
-</field>
+ <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
<form string="Purchase Order Line">
<notebook colspan="4">
<page string="Order Line">
- <field name="product_id" colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
- <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
- <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position)"/>
+ <field name="product_id" colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
+ <field name="product_qty" context="{'partner_id':parent.partner_id, 'quantity':product_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'warehouse':parent.warehouse_id}" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
+ <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
<field colspan="4" name="name"/>
<field name="date_planned" widget="date"/>
<field name="price_unit"/>
<field name="product_uom"/>
<field name="price_subtotal"/>
<field name="date_planned" widget="date" width="135"/>
-
-
-
<field name="state" invisible="1"/>
<field name="invoiced" invisible="1"/>
</tree>
</record>
<act_window
- context="{'search_default_partner_id': [active_id]}"
+ context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
id="act_res_partner_2_purchase_order"
name="Purchase Orders"
+ groups="purchase.group_purchase_user"
res_model="purchase.order"
src_model="res.partner"/>
<act_window
- context="{'search_default_product_id': [active_id]}"
+ context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
id="action_purchase_line_product_tree"
name="Purchases"
res_model="purchase.order.line"
src_model="product.product"
- groups="base.group_extended"/>
+ groups="purchase.group_purchase_user"/>
<record id="purchase_line_form_action2" model="ir.actions.act_window">
- <field name="name">Purchase Lines Not Invoiced</field>
+ <field name="name">Based on Purchase Order lines</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order.line</field>
- <field name="domain">[('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
+ <field name="domain">[('order_id.invoice_method','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="purchase_order_line_search"/>
- <field name="help">If you set the invoicing control on a purchase order as "Manual", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
+ <field name="help">If you set the Invoicing Control on a purchase order as "Based on Purchase Order lines", you can track here all the purchase order lines for which you have not yet received the supplier invoice. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
</record>
<record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
projects / odoo / odoo.git / blobdiff