diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index b611b569ee5..4bedda1498c 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -8,7 +8,7 @@ project.project - Project Task + Project task project.task diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 6cf0cd8206a..2476710bcc4 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -144,7 +144,7 @@ @@ -156,7 +156,7 @@ @@ -169,7 +169,7 @@ @@ -351,7 +351,7 @@ form - + Unbilled closed tasks @@ -360,7 +360,7 @@ tree,form [('state','=','done'), ('billable','=',True), ('invoice_id','=',False)] - + Unbilled open tasks @@ -369,7 +369,7 @@ tree,form [('state','=','open'), ('billable','=',True), ('invoice_id','=',False)] - + My tasks @@ -414,16 +414,16 @@ tree,form [('state', '=', 'open')] - + - Tasks in Progress + Tasks in progress project.task form tree,form [('state', '=', 'progress')] - + Unassigned tasks @@ -432,7 +432,7 @@ tree,form [('user_id', '=', False)] - + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 31a1cf5593c..b812125cb33 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -48,7 +48,7 @@ sale.order tree - + @@ -66,7 +66,7 @@ sale.order form -
+ @@ -124,7 +124,7 @@
- + @@ -184,47 +184,62 @@ form
- + - My Sales Order + My sales order ir.actions.act_window sale.order form tree,form [('user_id','=',uid)] - + + + + + All sales order + ir.actions.act_window + sale.order + form + tree,form + + + - Sales Order in Shipping Exception + Sales order in shipping exception ir.actions.act_window sale.order form tree,form [('state','=','shipping_except')] - + - Sales Order waiting Invoice + Sales order waiting Invoice ir.actions.act_window sale.order form tree,form [('state','=','manual')] - + - Sales Order in Progress + Sales order in progress ir.actions.act_window sale.order form tree,form [('state','=','progress')] - + @@ -235,49 +250,57 @@ tree,form [('state','=','draft')] - + - Sales Order in Invoice Exception + Sales order in invoice exception ir.actions.act_window sale.order form tree,form [('state','=','invoice_except')] - + - My Sales Order in Shipping Exception + My sales order in shipping exception ir.actions.act_window sale.order form tree,form [('state','=','shipping_except'),('user_id','=',uid)] - + - My Sales Order waiting Invoice + My sales order waiting Invoice ir.actions.act_window sale.order form tree,form [('state','=','manual'),('user_id','=',uid)] - + - My Sales Order in Progress + My sales order in progress ir.actions.act_window sale.order form tree,form [('state','=','progress'),('user_id','=',uid)] - + @@ -288,7 +311,10 @@ tree,form [('state','=','draft'),('user_id','=',uid)] - + @@ -296,7 +322,7 @@ sale.order.line graph - + @@ -309,7 +335,7 @@ sale.order.line tree - + @@ -327,7 +353,7 @@ sale.order.line form -
+ @@ -372,7 +398,7 @@ form - + Uninvoiced lines @@ -382,7 +408,7 @@ tree,form [('invoiced','<>', 1)] - + Uninvoiced lines done @@ -392,7 +418,7 @@ tree,form [('invoiced','<>', 1),('state','=','done')] - + [('scrum','=',1)] - + @@ -65,7 +65,7 @@ scrum.product.backlog tree - + @@ -83,9 +83,9 @@ scrum.product.backlog form - + - + @@ -110,7 +110,7 @@ scrum.product.backlog form - + Draft Backlogs @@ -119,7 +119,7 @@ tree,form [('state','=','draft')] - + Opened Backlogs @@ -128,7 +128,7 @@ tree,form [('state','=','open')] - + @@ -199,21 +199,21 @@ tree [('state','=','open')] - + Draft Sprints scrum.sprint tree [('state','=','draft')] - + Sprints Done scrum.sprint tree [('state','=','done')] - + My Sprints (Product Owner) @@ -221,14 +221,14 @@ tree [('product_owner_id','=',uid)] - + My Sprints (Scrum Master) scrum.sprint tree [('scrum_master_id','=',uid)] - + My opened sprints (Product Owner) @@ -236,14 +236,14 @@ tree [('product_owner_id','=',uid),('state','=','open')] - + My opened sprints (Scrum Master) scrum.sprint tree [('scrum_master_id','=',uid),('state','=','open')] - + @@ -296,7 +296,7 @@ form - +