Rajesh Prajapati (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-search-imp-sale-rpr into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-sale-rpr/+merge/110250
Hello
I have improve the code for search view of 'sale_*' module.
Thanks
Rajesh Prajapati
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-sale-rpr/+merge/110250
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-search-imp-sale-rpr into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-06-12 06:53:29 +0000
+++ sale/sale_view.xml 2012-06-14 07:21:21 +0000
@@ -274,17 +274,15 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Sales Order">
+ <field name="name" string="Sales Order" filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
<filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
- <separator orientation="vertical"/>
<filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+ <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
<separator orientation="vertical"/>
- <field name="name"
- filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
<field name="partner_id"/>
- <field name="user_id">
- <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
- </field>
+ <field name="user_id"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -440,13 +438,12 @@
<field name="arch" type="xml">
<search string="Search Sales Order">
<filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','<>', 1),('state','=','done')]" help="Sale Order Lines ready to be invoiced"/>
+ <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
<separator orientation="vertical"/>
<field name="order_id"/>
<field name="order_partner_id"/>
<field name="product_id"/>
- <field name="salesman_id">
- <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
- </field>
+ <field name="salesman_id"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -466,16 +463,14 @@
<search string="Search Uninvoiced Lines">
<filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
- <separator orientation="vertical"/>
<filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
<filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','<>', 1),('state','<>','draft'),('state','<>','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
+ <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
<separator orientation="vertical"/>
<field name="order_id"/>
<field name="order_partner_id"/>
<field name="product_id"/>
- <field name="salesman_id">
- <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
- </field>
+ <field name="salesman_id"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
=== modified file 'sale_crm/sale_crm_view.xml'
--- sale_crm/sale_crm_view.xml 2012-06-05 12:28:30 +0000
+++ sale_crm/sale_crm_view.xml 2012-06-14 07:21:21 +0000
@@ -36,12 +36,12 @@
<field name="inherit_id" ref="sale.view_sales_order_filter"/>
<field name="arch" type="xml">
<field name="user_id" position="after">
- <field name="section_id" widget="selection" string="Sales Team">
- <filter string="My Sales Team(s)"
+ <field name="section_id" widget="selection" string="Sales Team"/>
+ <filter string="My Sales Team(s)"
icon="terp-personal+"
domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)"/>
- </field>
+
</field>
</field>
</record>
_______________________________________________
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
