diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 3e3266044b4..0b723b4c9e4 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -24,6 +24,7 @@ import time from osv import fields from osv import osv from tools.translate import _ +import tools class account_analytic_line(osv.osv): _name = 'account.analytic.line' @@ -113,20 +114,24 @@ class timesheet_invoice(osv.osv): _description = "Analytic account costs and revenues" _auto = False _columns = { - 'name': fields.date('Month', readonly=True), + 'name': fields.char('Year',size=64,required=False, readonly=True), 'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, select=True), 'journal_id': fields.many2one('account.analytic.journal', 'Journal', readonly=True), 'quantity': fields.float('Quantities', readonly=True), 'cost': fields.float('Credit', readonly=True), - 'revenue': fields.float('Debit', readonly=True) + 'revenue': fields.float('Debit', readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), + ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), } _order = 'name desc, account_id' def init(self, cr): + tools.drop_view_if_exists(cr, 'report_hr_timesheet_invoice_journal') cr.execute(""" create or replace view report_hr_timesheet_invoice_journal as ( select min(l.id) as id, - date_trunc('month', l.date)::date as name, + to_char(l.date, 'YYYY') as name, + to_char(l.date,'MM') as month, sum( CASE WHEN l.amount>0 THEN 0 ELSE l.amount END @@ -141,7 +146,8 @@ class timesheet_invoice(osv.osv): from account_analytic_line l LEFT OUTER join product_uom u on (u.id=l.product_uom_id) group by - date_trunc('month', l.date), + to_char(l.date, 'YYYY'), + to_char(l.date,'MM'), journal_id, account_id )""") diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index aff83eaf918..a92e223cadc 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -384,15 +384,6 @@ - - New Customer Invoice - account.invoice - form - form,tree,calendar,graph - - [('type','=','out_invoice')] - {'type':'out_invoice'} - Supplier Invoices @@ -405,15 +396,6 @@ - - New Supplier Invoice - account.invoice - form - form,tree,calendar,graph - - [('type','=','in_invoice')] - {'type':'in_invoice'} - Customer Refunds @@ -441,16 +423,6 @@ - - New Customer Refund - account.invoice - form - form,tree,calendar,graph - - [('type','=','out_refund')] - {'type':'out_refund'} - - Supplier Refunds account.invoice @@ -463,215 +435,6 @@ - - New Supplier Refund - account.invoice - form - form,tree,calendar,graph - - [('type','=','in_refund')] - {'type':'in_refund'} - - - - - Draft Customer Invoices - account.invoice - form - tree,form,calendar,graph - [('state','=','draft'),('type','=','out_invoice')] - {'type':'out_invoice'} - - - - - - tree - - - - - form - - - - - - PRO-FORMA Customer Invoices - account.invoice - form - tree,form,calendar,graph - [('state','=','proforma2'),('type','=','out_invoice')] - {'type':'out_invoice'} - - - - - - tree - - - - - form - - - - - - Unpaid Customer Invoices - account.invoice - form - tree,form,calendar,graph - [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')] - {'type':'out_invoice'} - - - - - - tree - - - - - form - - - - - - Draft Supplier Invoices - account.invoice - form - tree,form,calendar,graph - [('state','=','draft'),('type','=','in_invoice')] - {'type':'in_invoice'} - - - - - - tree - - - - - form - - - - - - Unpaid Supplier Invoices - account.invoice - form - tree,form,calendar,graph - [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')] - {'type':'in_invoice'} - - - - - - tree - - - - - form - - - - - - Draft Customer Refunds - account.invoice - form - tree,form,calendar,graph - [('state','=','draft'),('type','=','out_refund')] - {'type':'out_refund'} - - - - - - tree - - - - - form - - - - - - Unpaid Customer Refunds - account.invoice - form - tree,form,calendar,graph - [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')] - {'type':'out_refund'} - - - - - - tree - - - - - form - - - - - - Draft Supplier Refunds - account.invoice - form - tree,form,calendar,graph - [('state','=','draft'),('type','=','in_refund')] - {'type':'in_refund'} - - - - - - tree - - - - - form - - - - - - Unpaid Supplier Refunds - account.invoice - form - tree,form,calendar,graph - [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')] - {'type':'in_refund'} - - - - - - tree - - - - - form - - - - diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index accbbf52d53..472eec0f23c 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -17,6 +17,25 @@ + + + account.analytic.account.search + account.analytic.account + search + + + + + + + + + + + + + + account.analytic.account.tree @@ -77,6 +96,7 @@ form tree,graph,form + @@ -109,15 +129,8 @@ - - New Analytic Account - account.analytic.account - form - form,tree,graph - - - - + + account.analytic.line.form @@ -349,33 +362,43 @@ + + + + report.hr.timesheet.invoice.journal.search + report.hr.timesheet.invoice.journal + search + + + + + + + + + + + + + Account cost and revenue by journal report.hr.timesheet.invoice.journal form tree,graph + - - - - Account cost and revenue by journal (This Month) - report.hr.timesheet.invoice.journal - form - tree - [('name','=',time.strftime('%Y-%m-01'))] - - + - diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 3a68fa513d0..232ba274769 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -1,70 +1,28 @@ - - My Accounts - account.analytic.account - form - tree,form,graph - [('user_id','=',uid)] - - - - - All Uninvoiced Entries - account.analytic.line form tree,form [('invoice_id','=',False),('to_invoice','!=',False)] + - - My Uninvoiced Entries - account.analytic.line - form - tree,form - [('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)] - - - - - - My Current Accounts - account.analytic.account - form - tree,form,graph - - [('user_id','=',uid),('state','=','open')] - - - - - My Pending Accounts - account.analytic.account - form - - tree,form,graph - [('user_id','=',uid),('state','=','pending')] - - - All Analytic Accounts account.analytic.account - form tree,form,graph + [] - - + Overpassed Accounts @@ -72,32 +30,7 @@ form tree,form,graph [('date','<=',time.strftime('%Y-%m-%d')),('state','=','open')] - - - - - Current Analytic Accounts - account.analytic.account - form - - tree,form,graph - - [('state','=','open')] - - - - - Pending Analytic Accounts - - account.analytic.account - form - tree,form,graph - - [('state','=','pending')] - - - diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 446da0cb2ea..0e9bc494a56 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -90,7 +90,6 @@ - diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml index 5eee434ed1c..ce2b629f030 100644 --- a/addons/account_report/account_view.xml +++ b/addons/account_report/account_view.xml @@ -93,14 +93,6 @@ - - New Reporting Item Formula - account.report.report - form - form,tree - - - account.report.report.tree account.report.report diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py index 7265919bb1a..ce5705560f7 100755 --- a/addons/account_voucher/__terp__.py +++ b/addons/account_voucher/__terp__.py @@ -41,8 +41,8 @@ "update_xml" : [ "voucher_sequence.xml", "account_report.xml", - "voucher_wizard.xml", "voucher_view.xml", + "voucher_wizard.xml", "account_view.xml", ], 'certificate': '0037580727101', diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 172aedd92ec..cc8a4af0dd8 100755 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -77,8 +77,8 @@ tree,form - + @@ -90,8 +90,8 @@ [('type','like','rec_voucher')] {'type':'rec_voucher'} - + Cash Receipt @@ -102,20 +102,9 @@ [('type','=','rec_voucher')] {'type':'rec_voucher'} - + - - Cash Receipt Voucher - account.voucher - form - form,tree - - [('type','=','rec_voucher')] - {'type':'rec_voucher'} - - - Bank Receipt account.voucher @@ -125,20 +114,8 @@ [('type','=','bank_rec_voucher')] {'type':'bank_rec_voucher'} - - - - Bank Receipt Voucher - account.voucher - form - form,tree - - [('type','=','bank_rec_voucher')] - {'type':'bank_rec_voucher'} - - - + @@ -153,8 +130,8 @@ [('type','like','pay_voucher')] {'type':'pay_voucher'} - + Payment Vouchers @@ -165,20 +142,9 @@ [('type','=','pay_voucher')] {'type':'pay_voucher'} - + - - Cash Payment Voucher - account.voucher - form - form,tree - - [('type','=','pay_voucher')] - {'type':'pay_voucher'} - - - Payment Vouchers account.voucher @@ -188,19 +154,8 @@ [('type','=','bank_pay_voucher')] {'type':'bank_pay_voucher'} - - - - Bank Payment Voucher - account.voucher - form - form,tree - - [('type','=','bank_pay_voucher')] - {'type':'bank_pay_voucher'} - - + @@ -212,53 +167,57 @@ tree,form - + Contra Voucher account.voucher form - form,tree - + tree,form + [('type','=','cont_voucher')] {'type':'cont_voucher'} - + + Journal Sale Voucher account.voucher form - form,tree - + tree,form + [('type','=','journal_sale_vou')] {'type':'journal_sale_vou'} - + + Journal Purchase Voucher account.voucher form - form,tree - + tree,form + [('type','=','journal_pur_voucher')] {'type':'journal_pur_voucher'} - + Journal Voucher account.voucher form - form,tree - + tree,form + [('type','=','journal_voucher')] {'type':'journal_voucher'} + name="Journal Voucher" id="menu_action_view_jour_voucher_form" + action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/> diff --git a/addons/account_voucher/voucher_wizard.xml b/addons/account_voucher/voucher_wizard.xml index 5d31cdc3ec3..5e8a3f6ce5d 100644 --- a/addons/account_voucher/voucher_wizard.xml +++ b/addons/account_voucher/voucher_wizard.xml @@ -11,9 +11,10 @@ + type="wizard" + parent="menu_action_voucher_list"/> diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 80aa0f69bad..bc5547a3608 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -141,15 +141,6 @@ - - auction.dates - form - - - - - - ======================================================= Auction Management/Auction Dates/Reporting ======================================================= @@ -1245,14 +1236,6 @@ My Latest Objects My Latest Deposit ============================== - - auction.deposit - form - tree,form - [('create_uid','=',uid)] - - - auction.deposit form @@ -1304,13 +1287,6 @@ Objects per Day - - - report.auction.object.date - form - graph,tree - [('user_id','=',uid),('month','=',time.strftime('%Y-%m-01'))] - report.auction.object.date form @@ -1322,12 +1298,6 @@ Objects per Day action="action_report_auction_object_date_tree" id="menu_report_auction_object_date_tree" parent="auction_report_manager_menu"/> - - Detailed lots diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml index 2efcd318caa..01d1e11a9a0 100644 --- a/addons/board_account/board_account_view.xml +++ b/addons/board_account/board_account_view.xml @@ -45,7 +45,7 @@ - + diff --git a/addons/board_association/board_association_view.xml b/addons/board_association/board_association_view.xml index c2403f1f8b7..d178077b941 100644 --- a/addons/board_association/board_association_view.xml +++ b/addons/board_association/board_association_view.xml @@ -17,14 +17,14 @@ name="%(event.action_event_registration)d" colspan="4"/> diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml index 0c5feecea12..01baa763c7c 100644 --- a/addons/board_auction/board_auction_view.xml +++ b/addons/board_auction/board_auction_view.xml @@ -18,8 +18,8 @@ name="%(auction.action_report_latest_objects_tree)d" height="200" width="510"/> - - + diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml index 79f627af24f..f60c14a0bf6 100644 --- a/addons/board_project/board_project_manager_view.xml +++ b/addons/board_project/board_project_manager_view.xml @@ -64,7 +64,7 @@