Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-mrp-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-mrp-tpa/+merge/115968
[IMP] Improved search views of mrp module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-mrp-tpa/+merge/115968
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-07-19 16:42:08 +0000
+++ mrp/mrp_view.xml 2012-07-20 12:23:22 +0000
@@ -87,14 +87,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search">
- <group>
- <field name="name" string="Name"/>
- <separator orientation="vertical"/>
- <field name="group_id" widget="selection"/>
- <field name="composition"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
+ <field name="name" string="Name"/>
+ <field name="group_id" />
+ <field name="composition"/>
+ <group expand="0" string="Group By...">
<filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
</group>
</search>
@@ -206,20 +202,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search for mrp workcenter">
- <group>
- <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
- <separator orientation="vertical"/>
- <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
- <separator orientation="vertical"/>
- <field name="resource_type"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
+ <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+ <field name="resource_type"/>
+ <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+ <group expand="0" string="Group By...">
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
- <separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- </group>
- </search>
+ </group>
+ </search>
</field>
</record>
@@ -311,11 +301,9 @@
<field name="arch" type="xml">
<search string="Routing">
<field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
- <separator orientation="vertical"/>
- <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
- <separator orientation="vertical"/>
<field name="location_id"/>
<field name="company_id" groups="base.group_multi_company"/>
+ <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
<group expand="0" string="Group By...">
<filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
</group>
@@ -419,20 +407,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Bill Of Material">
- <group>
- <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
- <separator orientation="vertical"/>
- <field name="product_id"/>
- <field name="company_id" groups="base.group_multi_company"/>
- </group>
- <newline/>
+ <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+ <field name="product_id"/>
+ <field name="company_id" groups="base.group_multi_company"/>
<group expand="0" string="Group By...">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/>
- <separator orientation="vertical"/>
<filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
<filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
- <separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Starting Date"/>
</group>
</search>
@@ -837,32 +819,22 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Production">
- <group>
- <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
- domain="[('state','=','confirmed')]"
- help="Manufacturing Orders which are waiting for raw materials."/>
- <filter icon="terp-camera_test" string="Ready" name="ready"
- domain="[('state','=','ready')]"
- help="Manufacturing Orders which are ready to start production."/>
- <filter icon="terp-check" string="In Production" name="inprogress"
- domain="[('state','=','in_production')]"
- help="Manufacturing Orders which are currently in production."/>
- <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
- domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
- help="Production started late"/>
- <separator orientation="vertical"/>
- <field name="product_id"/>
- <field name="routing_id" groups="mrp.group_mrp_routings"/>
- </group>
- <newline/>
+ <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+ <field name="product_id"/>
+ <field name="routing_id" groups="mrp.group_mrp_routings"/>
+ <filter icon="terp-gtk-media-pause" string="Pending" name="pending" domain="[('state','=','confirmed')]"
+ help="Manufacturing Orders which are waiting for raw materials."/>
+ <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','ready')]"
+ help="Manufacturing Orders which are ready to start production."/>
+ <filter icon="terp-check" string="In Production" name="inprogress" domain="[('state','=','in_production')]"
+ help="Manufacturing Orders which are currently in production."/>
+ <separator/>
+ <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+ help="Production started late"/>
<group expand="0" string="Group By...">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
- <separator orientation="vertical"/>
<filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date"/>
</group>
</search>
=== modified file 'mrp/report/mrp_report_view.xml'
--- mrp/report/mrp_report_view.xml 2012-06-22 11:12:51 +0000
+++ mrp/report/mrp_report_view.xml 2012-07-20 12:23:22 +0000
@@ -37,8 +37,7 @@
<field name="arch" type="xml">
<search string="Work Center load">
<field name="name" string="Week"/>
- <separator orientation="vertical"/>
- <field name="workcenter_id" widget="selection"/>
+ <field name="workcenter_id""/>
</search>
</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
