diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml index 0bbaf9df0dd..3e6d894887a 100644 --- a/addons/portal_sale/portal_sale_view.xml +++ b/addons/portal_sale/portal_sale_view.xml @@ -83,7 +83,7 @@ tree,form [('state','in',('draft','sent','cancel'))] {} - + We haven't sent you any quotation. @@ -92,7 +92,7 @@ ir.actions.act_window sale.order tree,form - + [('state', 'not in', ('draft', 'sent', 'cancel'))] {} We haven't sent you any sales order. diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 484e82712f5..d3ba1a3deed 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -363,12 +363,6 @@ - - - - - - @@ -379,13 +373,43 @@ + + sale.order.search.inherit.quotation + sale.order + primary + + + + + + + + + + + + sale.order.search.inherit.sale + sale.order + primary + + + + + + + + + + + + Sales Orders ir.actions.act_window sale.order form tree,kanban,form,calendar,pivot,graph - + {'show_sale': True} [('state', 'not in', ('draft', 'sent', 'cancel'))] @@ -412,6 +436,7 @@ tree,form,calendar,graph,pivot {'show_sale': True} [('invoice_status','=','to invoice')] + tree,form,calendar,graph,pivot [('invoice_status','=','upselling')] {'show_sale': True} + form tree,kanban,form,calendar,pivot,graph - {} [('state','in',('draft','sent','cancel'))] - +

Create a Quotation, the first step of a new sale. @@ -607,7 +632,7 @@ sale.order form tree,form,calendar,graph - + [('state','not in',('draft','sent','cancel'))] { 'show_sale': True, @@ -631,7 +656,7 @@ sale.order form tree,form,calendar,graph - + [('state', '=', 'sale'),('invoice_status','=','to invoice')] { 'show_sale': True, @@ -655,7 +680,7 @@ } [('state','in',('draft','sent','cancel'))] - +

Create a Quotation, the first step of a new sale. diff --git a/addons/sale/sales_team_dashboard.xml b/addons/sale/sales_team_dashboard.xml index c4b5c851200..d83a7298fbe 100644 --- a/addons/sale/sales_team_dashboard.xml +++ b/addons/sale/sales_team_dashboard.xml @@ -11,7 +11,7 @@ 'default_user_id': uid, } - +