Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-search_views-purchase_search_view-kjo
into lp:~openerp-dev/openobject-addons/trunk-search_views.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-search_views-purchase_search_view-kjo/+merge/75997
Change the search_view of following
Purchases/Purchase Management/Purchase Requisitions : New (rename draft) In
Progress Done | Unassigned
Purchases/Purchase Management/Requests for Quotation : Quotations Approved |
Exception | Not invoices | Requisition
Purchases/Purchase Management/Purchase Orders : Quotations To Approve Approved
| Exception | Not invoices | Requisition
Purchases/Receive Products/Receive Products : To Do Done | Today
Purchases/Invoice Control/On Incoming Shipments : Avalailable (not checked)
Done (checked by default) | back Orders | To Invoice (check by default)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-search_views-purchase_search_view-kjo/+merge/75997
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-search_views.
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2011-09-17 11:03:17 +0000
+++ purchase/purchase_view.xml 2011-09-19 10:42:44 +0000
@@ -234,20 +234,53 @@
</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.for.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" string="Not invoices" 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>
- <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
- <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase order to be approved"/>
+ <filter icon="terp-gtk-jump-to-ltr" name="draft" string="Quotations To Approve" domain="[('state','=','confirmed')]" 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" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
+ <filter icon="terp-gtk-go-back-rtl" string="Not invoices" 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"/>
@@ -268,6 +301,7 @@
</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>
@@ -297,7 +331,7 @@
<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="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"
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2011-09-14 15:07:18 +0000
+++ purchase/stock_view.xml 2011-09-19 10:42:44 +0000
@@ -71,9 +71,9 @@
<filter icon="terp-dialog-close" name="done" string="Done"
domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
<separator orientation="vertical"/>
- <filter icon="terp-accessories-archiver-minus" string="Back Orders"
+ <filter icon="terp-accessories-archiver-minus" string="back Orders"
domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
- <filter string="To invoice" name="to_invoice" icon="terp-dolar"
+ <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
domain="[('invoice_state', '=', '2binvoiced')]"/>
<separator orientation="vertical"/>
<field name="name"/>
@@ -109,7 +109,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','in')]</field>
- <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
+ <field name="context">{'contact_display': 'partner_address',"search_default_done":1, "search_default_to_invoice":1}</field>
<field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
<field name="help">Create invoice from reception of products. If you selected this invoice control method in the purchase order, all receptions done are available here to be invoiced.</field>
</record>
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml 2011-09-17 11:03:17 +0000
+++ purchase_requisition/purchase_requisition_view.xml 2011-09-19 10:42:44 +0000
@@ -21,11 +21,26 @@
<field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
<field name="arch" type="xml">
- <xpath expr="/search/group/filter[@string='Not Invoiced']" position="after">
- <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" help="Purchase Orders with requisition"/>
- </xpath>
- </field>
- </record>
+ <xpath expr="/search/group/filter[@string='Not invoices']" position="after">
+ <separator orientation="vertical"/>
+ <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" help="Purchase Orders with requisition"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="request_for_quotation_inherit">
+ <field name="name">request.for.quotation.select.inherit</field>
+ <field name="type">form</field>
+ <field name="model">purchase.order</field>
+ <field name="inherit_id" ref="purchase.view_request_for_quotation_filter"/>
+ <field name="arch" type="xml">
+ <xpath expr="/search/group/filter[@string='Not invoices']" position="after">
+ <separator orientation="vertical"/>
+ <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" help="Purchase Orders with requisition"/>
+ </xpath>
+ </field>
+ </record>
+
<record model="ir.ui.view" id="view_purchase_requisition_form">
<field name="name">purchase.requisition.form</field>
<field name="type">form</field>
@@ -120,11 +135,12 @@
<field name="arch" type="xml">
<search string="Search Purchase Requisition">
<group>
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/>
+ <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/>
<filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
<separator orientation="vertical"/>
<filter icon="terp-personal-" string="Unassigned" domain="[('user_id','=', False)]" help="Unassigned Requisition"/>
+ <separator orientation="vertical"/>
<field name="name"/>
<field name="user_id" />
<field name="exclusive" />
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2011-09-17 12:03:40 +0000
+++ stock/stock_view.xml 2011-09-19 10:42:44 +0000
@@ -1675,11 +1675,11 @@
<field name="arch" type="xml">
<search string="Stock Moves">
<group>
+ <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received or done"/>
+ <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
+ <separator orientation="vertical"/>
<filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
<separator orientation="vertical"/>
- <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
- <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
- <separator orientation="vertical"/>
<field name="origin"/>
<field name="partner_id" string="Partner"/>
<field name="product_id"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
