diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py index 730730f5858..a7747ffeff7 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -57,7 +57,6 @@ 'auction_view.xml', 'auction_report.xml', 'report/report_auction_view.xml', - 'report/report_attendance_view.xml', 'auction_wizard.xml', 'board_auction_view.xml', 'board_auction_manager_view.xml', diff --git a/addons/auction/board_auction_manager_view.xml b/addons/auction/board_auction_manager_view.xml index a7efd0ef0e0..edc799588e3 100644 --- a/addons/auction/board_auction_manager_view.xml +++ b/addons/auction/board_auction_manager_view.xml @@ -5,6 +5,7 @@ Auction manager + board.auction.manager.form board.board @@ -13,8 +14,6 @@
- - -
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml index 0bd3b8ea75d..e1d92d5e753 100644 --- a/addons/auction/board_auction_view.xml +++ b/addons/auction/board_auction_view.xml @@ -4,7 +4,7 @@ Auction - + board.auction.manager.form board.board diff --git a/addons/auction/report/__init__.py b/addons/auction/report/__init__.py index 38617f0a84f..feb96ce1564 100644 --- a/addons/auction/report/__init__.py +++ b/addons/auction/report/__init__.py @@ -33,7 +33,6 @@ import buyer_form_report import seller_form_report import report_auction -import report_attendance import buyer_list diff --git a/addons/auction/report/report_auction_view.xml b/addons/auction/report/report_auction_view.xml index 2ab2222a81b..d64a5429a5d 100644 --- a/addons/auction/report/report_auction_view.xml +++ b/addons/auction/report/report_auction_view.xml @@ -111,5 +111,551 @@ + + + + + Unplanned objects + report.unplanned.object + tree + + + + + + + + + + + + + + + Unplanned objects + report.unplanned.object + form + +
+ + + + + + + + + + +
+ +============================= +estimation.adj.category +============================== + + report.auction.estimation.adj.category.form + report.auction.estimation.adj.category + form + +
+ + + + + + + + + +
+ + report.auction.estimation.adj.category.tree + report.auction.estimation.adj.category + tree + + + + + + + + + + + + + + + report.auction.estimation.adj.category.graph + report.auction.estimation.adj.category + graph + + + + + + + + + + + + + Min est/Adj/Max est + report.auction.estimation.adj.category + form + graph,tree + [('date','like',time.strftime('%Y-%m'))] + + + + Min est/Adj/Max est + report.auction.estimation.adj.category + form + graph,tree + [('date','like',time.strftime('%Y-%m')),('user_id','=',uid)] + + + + + + + + + + + report attendance + report.attendance + tree + + + + + + + + + + + Graph attendance + report.attendance + graph + + + + + + + + + + + + + report.attendance + form + tree,graph + [('name','=',time.strftime('%Y-%m-%d')),('employee_id','=',uid)] + + + + + + + report.attendance + form + tree,graph + [('name','=',time.strftime('%Y-%m-%d'))] + + + + +============================== +My Latest Objects +============================== + + auction.lots + form + tree,form + [('create_uid','=',uid)] + + + + auction.lots + form + tree,form + + + + +============================= +My Latest Deposit +============================== + + + auction.deposit + form + tree,form + [('create_uid','=',uid)] + + + + + auction.deposit + form + tree,form + + + +============================= +Objects per Day +============================== + + Objects by date + report.auction.object.date + tree + + + + + + + + + + + + Object date + report.auction.object.date + form + +
+ + + + + + +
+ + + report.auction.object.date.graph + report.auction.object.date + graph + + + + + + + + + + + + report.auction.object.date + form + graph,tree + [('user_id','=',uid),('month','=',time.strftime('%Y-%m-01'))] + + + report.auction.object.date + form + graph,tree + [('month','=',time.strftime('%Y-%m-01'))] + + + + + + + Detailed lots + auction.lots + form + [('auction_id','=', active_id)] + + + + tree_but_open + auction.dates + Open auction + + + + + + Simplified lots for adjudication + auction.lots + form + [('auction_id','=',active_id)] + + + + + tree_but_action + auction.dates + Open lots for adjudication + + + + + + Auction dates + auction.dates + tree + [('state','=', 'draft')] + + +============================= +Auction adjudication +============================== + + + report.auction.adjudication.tree + report.auction.adjudication + tree + + + + + + + + + + + report.auction.adjudication.graph + report.auction.adjudication + graph + + + + + + + + + + + + report.auction.adjudication + form + graph,tree + + + + + + Depositer's statistics + report.deposit.border + tree + + + + + + + + + + + + report.deposit.border + form + tree + + + +============================= +Object encoded +============================== + + report.object.encoded.form + report.object.encoded + form + +
+ + + + + + + + +
+ + + report.object.encoded.tree + report.object.encoded + tree + + + + + + + + + + + + + + report.object.encoded.graph + report.object.encoded + graph + + + + + + + + + + + + report.object.encoded + form + tree + [('user_id','=',uid),('date','ilike',time.strftime('%Y-%m'))] + + + + + report.object.encoded.tree + report.object.encoded.manager + tree + + + + + + + + + + + + + + + + + + report.object.encoded.graph + report.object.encoded.manager + graph + + + + + + + + + + + + + + report.object.encoded.manager + form + tree + [('date','ilike',time.strftime('%Y-%m'))] + + + + report.unclassified.objects + report.unclassified.objects + tree + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv index f0e394700a1..ed15002542e 100644 --- a/addons/auction/security/ir.model.access.csv +++ b/addons/auction/security/ir.model.access.csv @@ -9,4 +9,11 @@ "access_auction_bid_line","auction.bid.line","model_auction_bid_line","base.group_user",1,1,1,1 "access_auction_lot_history","auction.lot.history","model_auction_lot_history","base.group_user",1,1,1,1 "access_report_auction","report.auction","model_report_auction","base.group_user",1,0,0,0 +"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","base.group_user",1,0,0,0 +"access_report_auction_estimation_adj_category","report.auction.estimation.adj.category","model_report_auction_estimation_adj_category","base.group_user",1,0,0,0 +"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,0,0,0 "access_report_attendance","report.attendance","model_report_attendance","base.group_user",1,0,0,0 +"access_report_deposit_border","report.deposit.border","model_report_deposit_border","base.group_user",1,0,0,0 +"access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0 +"access_report_object_encoded_manager","report.object.encoded.manager","model_report_object_encoded_manager","base.group_user",1,0,0,0 +"access_report_unclassified_objects","report.unclassified.objects","model_report_unclassified_objects","base.group_user",1,0,0,0