diff options
| author | lbs-odoo <lbs@odoo.com> | 2019-07-17 10:31:16 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-08-16 13:35:21 +0000 |
| commit | 9a0fedfc657a71cd79aad03b562d6bc1b762422d (patch) | |
| tree | 27440e67b7dba9e7e31d4468652d6abfeebc2f39 /addons/mrp/views | |
| parent | bf347e7727b477575c4a2230ac01e25f9d08270e (diff) | |
[IMP] various: improve searchviews UX
Improve searchviews UX in all the modules
TaskID: 2029731
closes odoo/odoo#35700
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/mrp/views')
| -rw-r--r-- | addons/mrp/views/mrp_bom_views.xml | 21 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_production_views.xml | 98 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_routing_views.xml | 10 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_unbuild_views.xml | 6 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_workcenter_views.xml | 6 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_workorder_views.xml | 30 |
6 files changed, 89 insertions, 82 deletions
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml index 2af174b2f67..d95920abd24 100644 --- a/addons/mrp/views/mrp_bom_views.xml +++ b/addons/mrp/views/mrp_bom_views.xml @@ -106,7 +106,8 @@ </form> </field> </record> - <record id="mrp_bom_tree_view" model="ir.ui.view"> + + <record id="mrp_bom_tree_view" model="ir.ui.view"> <field name="name">mrp.bom.tree</field> <field name="model">mrp.bom</field> <field name="arch" type="xml"> @@ -154,22 +155,23 @@ <field name="model">mrp.bom</field> <field name="arch" type="xml"> <search string="Search Bill Of Material"> - <field name="code" filter_domain="['|',('code','ilike',self),('product_tmpl_id','ilike',self)]"/> - <field name="bom_line_ids" string="Components"/> + <field name="code" string="Bill of Materials" filter_domain="['|', ('code', 'ilike', self), ('product_tmpl_id', 'ilike', self)]"/> <field name="product_tmpl_id" string="Product"/> - <field name="company_id" groups="base.group_multi_company"/> - <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> - <separator/> + <field name="bom_line_ids" string="Component"/> + <filter string="Manufacturing" name="normal" domain="[('type', '=', 'normal')]"/> <filter string="Kit" name="phantom" domain="[('type', '=', 'phantom')]"/> - <filter string="Normal" name="normal" domain="[('type', '=', 'normal')]"/> + <separator/> + <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/> <group expand="0" string="Group By..."> - <filter string="Product" name="product" domain="[]" context="{'group_by':'product_tmpl_id'}"/> + <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_tmpl_id'}"/> <filter string='BoM Type' name="group_by_type" domain="[]" context="{'group_by' : 'type'}"/> - <filter string="Routings" name="routings" domain="[]" context="{'group_by':'routing_id'}"/> + <filter string='Unit of Measure' name="default_unit_of_measure" domain="[]" context="{'group_by' : 'product_uom_id'}"/> + <filter string="Routing" name="routings" domain="[]" context="{'group_by': 'routing_id'}"/> </group> </search> </field> </record> + <record id="mrp_bom_form_action" model="ir.actions.act_window"> <field name="name">Bills of Materials</field> <field name="type">ir.actions.act_window</field> @@ -188,6 +190,7 @@ </p> </field> </record> + <menuitem id="menu_mrp_bom_form_action" action="mrp_bom_form_action" parent="menu_mrp_bom" diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index b373e7f5043..09a9c79bf3d 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -274,6 +274,7 @@ </kanban> </field> </record> + <record id="view_production_calendar" model="ir.ui.view"> <field name="name">mrp.production.calendar</field> <field name="model">mrp.production</field> @@ -288,6 +289,7 @@ </calendar> </field> </record> + <record id="view_production_gantt" model="ir.ui.view"> <field name="name">mrp.production.gantt</field> <field name="model">mrp.production</field> @@ -296,6 +298,7 @@ </gantt> </field> </record> + <record id="view_production_pivot" model="ir.ui.view"> <field name="name">mrp.production.pivot</field> <field name="model">mrp.production</field> @@ -305,6 +308,7 @@ </pivot> </field> </record> + <record id="view_production_graph" model="ir.ui.view"> <field name="name">mrp.production.graph</field> <field name="model">mrp.production</field> @@ -314,19 +318,25 @@ </graph> </field> </record> + <record id="view_mrp_production_filter" model="ir.ui.view"> <field name="name">mrp.production.select</field> <field name="model">mrp.production</field> <field name="arch" type="xml"> <search string="Search Production"> - <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/> - <filter string="To Do" name="todo" domain="[('state','in',('draft', 'confirmed', 'planned','progress', 'to_close'))]" + <field name="name" string="Manufacturing Order" filter_domain="['|', ('name', 'ilike', self), ('origin', 'ilike', self)]"/> + <field name="product_id"/> + <field name="move_raw_ids" string="Component" filter_domain="[('move_raw_ids.product_id', 'ilike', self)]"/> + <field name="name" string="Work Center" filter_domain="[('routing_id.operation_ids.workcenter_id', 'ilike', self)]"/> + <field name="routing_id" groups="mrp.group_mrp_routings"/> + <field name="origin"/> + <filter string="To Do" name="todo" domain="[('state', 'in', ('draft', 'confirmed', 'planned','progress', 'to_close'))]" help="Manufacturing Orders which are in confirmed state."/> <separator/> - <filter string="Draft" name="filter_draft" domain="[('state','=','draft')]"/> - <filter string="Confirmed" name="filter_confirmed" domain="[('state','=','confirmed')]"/> - <filter string="Planned" name="filter_planned" domain="[('state','=','planned')]" groups="mrp.group_mrp_routings"/> - <filter string="In Progress" name="filter_in_progress" domain="[('state','=','progress')]"/> + <filter string="Draft" name="filter_draft" domain="[('state', '=', 'draft')]"/> + <filter string="Confirmed" name="filter_confirmed" domain="[('state', '=', 'confirmed')]"/> + <filter string="Planned" name="filter_planned" domain="[('state', '=', 'planned')]" groups="mrp.group_mrp_routings"/> + <filter string="In Progress" name="filter_in_progress" domain="[('state', '=', 'progress')]"/> <filter string="To Close" name="filter_to_close" domain="[('state', '=', 'to_close')]"/> <filter string="Done" name="filter_done" domain="[('state', '=', 'done')]"/> <filter string="Cancelled" name="filter_cancel" domain="[('state', '=', 'cancel')]"/> @@ -334,29 +344,25 @@ <filter string="Waiting for Material" name="waiting" domain="[('reservation_state', 'in', ('waiting', 'confirmed'))]"/> <filter string="Material Available" name="filter_ready" domain="[('reservation_state', '=', 'assigned')]"/> <separator/> - <filter string="Late" domain="['&', ('date_deadline', '<', current_date), ('state', '=', 'confirmed')]" - name="late" help="Production started late"/> + <filter string="Late" name="late" help="Production started late" + domain="['&', ('date_deadline', '<', current_date), ('state', '=', 'confirmed')]"/> + <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/> <separator/> - <field name="product_id"/> - <field name="move_raw_ids" string="Components" filter_domain="[('move_raw_ids.product_id','ilike',self)]"/> - <field name="name" string="Work Center" filter_domain="[('routing_id.operation_ids.workcenter_id','ilike',self)]"/> - <field name="routing_id" groups="mrp.group_mrp_routings"/> <filter invisible="1" string="Late Activities" name="activities_overdue" domain="[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" help="Show all records which has next action date is before today"/> <filter invisible="1" string="Today Activities" name="activities_today" domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> <filter invisible="1" string="Future Activities" name="activities_upcoming_all" - domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) - ]"/> + domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d'))]"/> <filter string="Exception Activities" name="activities_exception" domain="[('activity_exception_decoration', '!=', False)]"/> <group expand="0" string="Group By..."> - <filter string="Product" name="product" domain="[]" context="{'group_by':'product_id'}"/> - <filter string="Routing" name="routing" domain="[]" context="{'group_by':'routing_id'}" groups="mrp.group_mrp_routings"/> - <filter string="Scheduled Date" name="scheduled_date" domain="[]" context="{'group_by':'date_deadline'}" help="Scheduled Date by Month"/> + <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_id'}"/> + <filter string="Routing" name="routing" domain="[]" context="{'group_by': 'routing_id'}" groups="mrp.group_mrp_routings"/> <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/> <filter string="Material Availability" name="groupby_reservation_state" domain="[]" context="{'group_by': 'reservation_state'}"/> + <filter string="Scheduled Date" name="scheduled_date" domain="[]" context="{'group_by': 'date_planned_start'}" help="Scheduled Date by Month"/> </group> </search> </field> @@ -396,32 +402,32 @@ parent="menu_mrp_manufacturing" sequence="1"/> - <record id="mrp_production_report" model="ir.actions.act_window"> - <field name="name">Manufacturing Orders</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp.production</field> - <field name="view_mode">graph,pivot,form</field> - <field name="target">current</field> - </record> + <record id="mrp_production_report" model="ir.actions.act_window"> + <field name="name">Manufacturing Orders</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp.production</field> + <field name="view_mode">graph,pivot,form</field> + <field name="target">current</field> + </record> - <menuitem id="menu_mrp_workorder_todo" - name="Work Orders" - action="mrp_workorder_todo" - parent="menu_mrp_manufacturing" - groups="group_mrp_routings"/> + <menuitem id="menu_mrp_workorder_todo" + name="Work Orders" + action="mrp_workorder_todo" + parent="menu_mrp_manufacturing" + groups="group_mrp_routings"/> - <menuitem id="menu_mrp_production_report" - name="Manufacturing Orders" - parent="menu_mrp_reporting" - action="mrp_production_report" - sequence="11"/> + <menuitem id="menu_mrp_production_report" + name="Manufacturing Orders" + parent="menu_mrp_reporting" + action="mrp_production_report" + sequence="11"/> - <menuitem id="menu_mrp_work_order_report" - name="Work Orders" - parent="menu_mrp_reporting" - action="mrp_workorder_report" - groups="group_mrp_routings" - sequence="11"/> + <menuitem id="menu_mrp_work_order_report" + name="Work Orders" + parent="menu_mrp_reporting" + action="mrp_workorder_report" + groups="group_mrp_routings" + sequence="11"/> <record id="act_product_mrp_production" model="ir.actions.act_window"> <field name="context">{'search_default_product_id': [active_id]}</field> @@ -430,11 +436,11 @@ <field name="view_id" ref="mrp_production_tree_view"/> </record> - <record id="action_mrp_production_form" model="ir.actions.act_window"> - <field name="name">Manufacturing Orders</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">mrp.production</field> - <field name="view_mode">form</field> - </record> + <record id="action_mrp_production_form" model="ir.actions.act_window"> + <field name="name">Manufacturing Orders</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp.production</field> + <field name="view_mode">form</field> + </record> </data> </odoo> diff --git a/addons/mrp/views/mrp_routing_views.xml b/addons/mrp/views/mrp_routing_views.xml index b67865f424a..3513a152194 100644 --- a/addons/mrp/views/mrp_routing_views.xml +++ b/addons/mrp/views/mrp_routing_views.xml @@ -14,6 +14,7 @@ </tree> </field> </record> + <record id="mrp_routing_workcenter_form_view" model="ir.ui.view"> <field name="name">mrp.routing.workcenter.form</field> <field name="model">mrp.routing.workcenter</field> @@ -62,7 +63,6 @@ </field> </record> - <!-- Routings --> <record id="mrp_routing_form_view" model="ir.ui.view"> <field name="name">mrp.routing.form</field> @@ -104,6 +104,7 @@ </form> </field> </record> + <record id="mrp_routing_tree_view" model="ir.ui.view"> <field name="name">mrp.routing.tree</field> <field name="model">mrp.routing</field> @@ -145,12 +146,12 @@ <field name="model">mrp.routing</field> <field name="arch" type="xml"> <search string="Routing"> - <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> - <field name="company_id" groups="base.group_multi_company"/> + <field name="name" string="Routing" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/> + <filter name="inactive" string="Archived" domain="[('active', '=', False)]"/> </search> </field> </record> + <record id="mrp_routing_action" model="ir.actions.act_window"> <field name="name">Routings</field> <field name="type">ir.actions.act_window</field> @@ -168,6 +169,7 @@ </p> </field> </record> + <menuitem id="menu_mrp_routing_action" action="mrp_routing_action" parent="menu_mrp_bom" diff --git a/addons/mrp/views/mrp_unbuild_views.xml b/addons/mrp/views/mrp_unbuild_views.xml index 574455a30f0..b6ffddf674a 100644 --- a/addons/mrp/views/mrp_unbuild_views.xml +++ b/addons/mrp/views/mrp_unbuild_views.xml @@ -16,7 +16,6 @@ <field name="arch" type="xml"> <search string="Search"> <field name="product_id"/> - <field name="state"/> <field name="mo_id"/> <group expand="0" string="Filters"> <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/> @@ -27,10 +26,9 @@ <filter invisible="1" string="Today Activities" name="activities_today" domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> <filter invisible="1" string="Future Activitie" name="activities_upcoming_all" - domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d')) - ]"/> + domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d'))]"/> <filter string="Exception Activities" name="activities_exception" - domain="[('activity_exception_decoration', '!=', False)]"/> + domain="[('activity_exception_decoration', '!=', False)]"/> </group> <group expand='0' string='Group by...'> <filter string='Product' name="productgroup" context="{'group_by': 'product_id'}"/> diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index cc3004eed97..6a8535057ea 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -376,10 +376,10 @@ <field name="model">mrp.workcenter</field> <field name="arch" type="xml"> <search string="Search for mrp workcenter"> - <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - <filter string="Archived" name="archived" domain="[('active','=',False)]"/> + <field name="name" string="Work Center" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/> + <filter name="archived" string="Archived" domain="[('active', '=', False)]"/> <group expand="0" string="Group By..."> - <filter string="Company" name="company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/> </group> </search> </field> diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml index d5d22fbfd5f..bf80f6f0d8f 100644 --- a/addons/mrp/views/mrp_workorder_views.xml +++ b/addons/mrp/views/mrp_workorder_views.xml @@ -265,16 +265,16 @@ <field name="model">mrp.workorder</field> <field name="arch" type="xml"> <search string="Search Work Orders"> - <field name="name" string="Work Orders"/> - <field name="date_planned_start"/> - <field name="state"/> - <filter string="In Progress" name="progress" domain="[('state','=','progress')]"/> - <filter string="Ready" name="ready" domain="[('state','=','ready')]"/> - <filter string="Pending" name="pending" domain="[('state','=','pending')]"/> - <filter string="Finished" name="finish" domain="[('state','=','done')]"/> - <filter string="Available" name="available" domain="[('production_availability','=', 'assigned')]"/> + <field name="name" string="Work Order"/> + <field name="workcenter_id"/> + <field name="production_id"/> + <filter string="In Progress" name="progress" domain="[('state', '=', 'progress')]"/> + <filter string="Ready" name="ready" domain="[('state', '=', 'ready')]"/> + <filter string="Pending" name="pending" domain="[('state', '=', 'pending')]"/> + <filter string="Finished" name="finish" domain="[('state', '=', 'done')]"/> + <filter string="Available" name="available" domain="[('production_availability', '=', 'assigned')]"/> <separator/> - <filter string="Late" name="late" domain="['&', ('date_planned_start','<', current_date), ('state', '=', 'ready')]" + <filter string="Late" name="late" domain="['&', ('date_planned_start', '<', current_date), ('state', '=', 'ready')]" help="Production started late"/> <filter invisible="1" string="Late Activities" name="activities_overdue" domain="[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" @@ -284,14 +284,12 @@ <filter invisible="1" string="Future Activities" name="activities_upcoming_all" domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d'))]"/> <filter string="Exception Activities" name="activities_exception" - domain="[('activity_exception_decoration', '!=', False)]"/> - <field name="workcenter_id"/> - <field name="production_id"/> + domain="[('activity_exception_decoration', '!=', False)]"/> <group expand="0" string="Group By"> - <filter string="Work Center" name="work_center" domain="[]" context="{'group_by':'workcenter_id'}"/> - <filter string="Production" name="production" domain="[]" context="{'group_by':'production_id'}"/> - <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/> - <filter string="Scheduled Date" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}"/> + <filter string="Work Center" name="work_center" domain="[]" context="{'group_by': 'workcenter_id'}"/> + <filter string="Manufacturing Order" name="production" domain="[]" context="{'group_by': 'production_id'}"/> + <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/> + <filter string="Scheduled Date" name="scheduled_month" domain="[]" context="{'group_by': 'date_planned_start'}"/> </group> </search> </field> |
