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

[MERGE]purchase_*: search view update 

bzr revid: psi@tinyerp.com-20120618115859-t98hzdesb7q08jjk
This commit is contained in:
Purnendu Singh (OpenERP) 2012-06-18 17:28:59 +05:30
parent 98790815ea c30cc74bcf
commit 3977b03463
4 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
addons/purchase/purchase_view.xml
View File

@ -220,27 +220,26 @@
<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"/>
<field name="name" string="Reference" filter_domain="[('name','ilike',self)]"/>
<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."/>
<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"/>
<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"/>
<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."/>
<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"/>
<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...">
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<separator orientation="vertical"/>
<filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<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>
@ -253,27 +252,26 @@
<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 orders which are in draft state"/>
<filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
<field name="name" string="Reference" filter_domain="[('name','ilike',self)]"/>
<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."/>
<filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
<filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
<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."/>
<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"/>
<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...">
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<separator orientation="vertical"/>
<filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<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>
@ -441,9 +439,9 @@
<group>
<field name="order_id"/>
<field name="product_id"/>
<field name="partner_id" string="Supplier"/>
<field name="partner_id" string="Supplier"/>
</group>
<newline/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
<separator orientation="vertical"/>

24
addons/purchase/report/purchase_report_view.xml
View File

@ -53,18 +53,18 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Purchase Orders">
<group>
<filter icon="terp-document-new"
string="Quotations"
name="quotes"
domain="[('state','=','draft')]"/>
<filter icon="terp-gtk-jump-to-rtl"
string="Orders"
name="orders"
domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="product_id"/>
<group>
<filter icon="terp-document-new"
string="Quotations"
name="quotes"
domain="[('state','=','draft')]"/>
<filter icon="terp-gtk-jump-to-rtl"
string="Orders"
name="orders"
domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="product_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">

8
addons/purchase/stock_view.xml
View File

@ -65,22 +65,20 @@
<field name="arch" type="xml">
<search string="Picking to Invoice">
<group col="8" colspan="4">
<field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
<separator orientation="vertical"/>
<filter icon="terp-check" name="available" string="Available"
domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
<filter icon="terp-dialog-close" name="done" string="Received"
domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver-minus" string="Back Orders"
domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
<separator orientation="vertical"/>
<filter string="To Invoice" name="to_invoice" icon="terp-dolar"
domain="[('invoice_state', '=', '2binvoiced')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="origin"/>
<field name="stock_journal_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8">
<separator orientation="vertical"/>

4
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -124,13 +124,13 @@
<field name="arch" type="xml">
<search string="Search Purchase Requisition">
<group>
<field name="name" string="Purchase Requisition" filter_domain="[('name','ilike',self)]"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New 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" />
</group>