Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-purchase-tpa into
lp:~openerp-dev/openobject-addons/trunk-clean-search.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-purchase-tpa/+merge/116209
[IMP] Improved search views of purchase module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-purchase-tpa/+merge/116209
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-07-18 13:14:03 +0000
+++ purchase/purchase_view.xml 2012-07-23 07:28:50 +0000
@@ -268,29 +268,23 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Purchase Order">
- <group>
<field name="name" string="Reference"/>
- <separator orientation="vertical"/>
+ <field name="partner_id"/>
+ <field name="product_id"/>
+ <field name="create_uid"/>
<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="partner_id"/>
- <field name="product_id"/>
- <field name="create_uid"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
- <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"/>
- <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>
+ <separator/>
+ <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."/>
+ <group expand="0" string="Group By...">
+ <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+ <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'}"/>
+ <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>
@@ -300,34 +294,25 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Purchase Order">
- <group>
<field name="name" string="Reference"/>
- <separator orientation="vertical"/>
- <filter icon="terp-mail-message-new"
- string="Inbox" help="Unread messages"
- name="needaction_pending"
- domain="[('needaction_pending','=',True)]"/>
- <separator orientation="vertical"/>
+ <field name="partner_id"/>
+ <field name="product_id"/>
+ <field name="create_uid"/>
+ <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+ <separator/>
<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="partner_id"/>
- <field name="product_id"/>
- <field name="create_uid"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
- <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"/>
- <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>
+ <separator/>
+ <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."/>
+ <group expand="0" string="Group By...">
+ <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+ <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'}"/>
+ <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>
@@ -492,21 +477,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Purchase Order">
- <group>
- <field name="order_id"/>
- <field name="product_id"/>
- <field name="partner_id" string="Supplier"/>
- </group>
- <newline/>
+ <field name="order_id"/>
+ <field name="product_id"/>
+ <field name="partner_id" string="Supplier"/>
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
- <separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
<filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
- <separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
</group>
- </search>
+ </search>
</field>
</record>
=== modified file 'purchase/report/purchase_report_view.xml'
--- purchase/report/purchase_report_view.xml 2012-06-14 06:10:42 +0000
+++ purchase/report/purchase_report_view.xml 2012-07-23 07:28:50 +0000
@@ -53,29 +53,16 @@
<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','<>','draft'),('state','<>','cancel')]"/>
- <separator orientation="vertical"/>
- <field name="partner_id"/>
- <field name="product_id"/>
- </group>
- <newline/>
+ <field name="partner_id"/>
+ <field name="product_id"/>
+ <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','<>','draft'),('state','<>','cancel')]"/>
<group expand="0" string="Extended Filters...">
<field name="user_id"/>
<field name="validator"/>
- <separator orientation="vertical"/>
<field name="location_id"/>
- <field name="warehouse_id" widget="selection"/>
- <separator orientation="vertical"/>
+ <field name="warehouse_id"/>
<field name="company_id" groups="base.group_multi_company"/>
- <newline/>
<field name="date"/>
<field name="date_approve"/>
<field name="expected_date"/>
@@ -85,7 +72,6 @@
<filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
- <separator orientation="vertical"/>
<filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
<filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
@@ -93,11 +79,8 @@
<filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
<filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
<filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
- <separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Order of Day"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Order of Month"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'name'}" help="Order of Year"/>
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2012-07-18 10:37:36 +0000
+++ purchase/stock_view.xml 2012-07-23 07:28:50 +0000
@@ -46,35 +46,21 @@
<field name="type">search</field>
<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"/>
- <filter icon="terp-accessories-archiver-minus" string="Back Orders"
- domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
- <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
- domain="[('invoice_state', '=', '2binvoiced')]"/>
- <separator orientation="vertical"/>
- <field name="stock_journal_id" widget="selection"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <field name="purchase_id" />
- </group>
- <newline/>
+ <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+ <field name="stock_journal_id"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="purchase_id" />
+ <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/>
+ <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
+ <separator/>
+ <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
<group expand="0" string="Group By..." colspan="4" col="8">
- <separator orientation="vertical"/>
- <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status"
- domain="[]" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
- <filter string="Order Date" icon="terp-go-month"
- domain="[]" context="{'group_by':'date'}"/>
- <filter string="Scheduled Date" icon="terp-go-month"
- domain="[]" context="{'group_by':'min_date'}"/>
- <separator orientation="vertical"/>
- <filter string="Journal" icon="terp-folder-orange"
- domain="[]" context="{'group_by':'stock_journal_id'}"/>
+ <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+ <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
+ <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
</group>
</search>
</field>
_______________________________________________
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
