From 999f811faae03b4fa1ee2c6afa75d4f6d98bf9a8 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Tue, 1 Dec 2009 17:18:26 +0530 Subject: [PATCH 1/9] [REF]: Removed menu items 'New..' and 'My..' and also its related actions bzr revid: uco@tinyerp.co.in-20091201114826-nponzy9okhrjt8zs --- addons/account/account_invoice_view.xml | 237 ------------------ addons/account/project/project_view.xml | 11 +- .../account_analytic_analysis_menu.xml | 40 --- addons/account_voucher/voucher_view.xml | 45 ---- addons/auction/auction_view.xml | 9 - addons/event/event_view.xml | 18 -- addons/hr/hr_view.xml | 11 - addons/hr_expense/hr_expense_view.xml | 20 -- addons/hr_timesheet/hr_timesheet_view.xml | 25 +- .../hr_timesheet_invoice_view.xml | 25 -- .../hr_timesheet_sheet_view.xml | 44 ---- addons/idea/idea_view.xml | 27 -- addons/mrp/mrp_view.xml | 25 -- addons/project/project_view.xml | 107 +------- addons/project/security/project_security.xml | 3 - .../process/project_timesheet_process.xml | 2 +- .../report_analytic_planning_view.xml | 39 --- addons/sale/process/sale_process.xml | 4 +- addons/sale/sale_view.xml | 60 ----- addons/stock/stock_view.xml | 48 ---- addons/wiki/wiki_view.xml | 12 - 21 files changed, 7 insertions(+), 805 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index d728eed9ffc..a478c45b812 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -383,15 +383,6 @@ - - New Customer Invoice - account.invoice - form - form,tree,calendar,graph - - [('type','=','out_invoice')] - {'type':'out_invoice'} - Supplier Invoices @@ -404,15 +395,6 @@ - - New Supplier Invoice - account.invoice - form - form,tree,calendar,graph - - [('type','=','in_invoice')] - {'type':'in_invoice'} - Customer Refunds @@ -426,16 +408,6 @@ - - New Customer Refund - account.invoice - form - form,tree,calendar,graph - - [('type','=','out_refund')] - {'type':'out_refund'} - - Supplier Refunds account.invoice @@ -448,215 +420,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 716f182c948..d07060cc150 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -109,15 +109,8 @@ - - New Analytic Account - account.analytic.account - form - form,tree,graph - - - - + + account.analytic.line.form diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 3a68fa513d0..77aba3e7f65 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -1,19 +1,9 @@ - - My Accounts - account.analytic.account - form - tree,form,graph - [('user_id','=',uid)] - - - - All Uninvoiced Entries @@ -24,36 +14,6 @@ - - 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 diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 172aedd92ec..e267e07d22c 100755 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -105,17 +105,6 @@ - - Cash Receipt Voucher - account.voucher - form - form,tree - - [('type','=','rec_voucher')] - {'type':'rec_voucher'} - - - Bank Receipt account.voucher @@ -128,18 +117,6 @@ - - Bank Receipt Voucher - account.voucher - form - form,tree - - [('type','=','bank_rec_voucher')] - {'type':'bank_rec_voucher'} - - - - @@ -168,17 +145,6 @@ - - Cash Payment Voucher - account.voucher - form - form,tree - - [('type','=','pay_voucher')] - {'type':'pay_voucher'} - - - Payment Vouchers account.voucher @@ -191,17 +157,6 @@ - - Bank Payment Voucher - account.voucher - form - form,tree - - [('type','=','bank_pay_voucher')] - {'type':'bank_pay_voucher'} - - - diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 80aa0f69bad..02da9be31c7 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 ======================================================= diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 06164b44bcb..b4709fbf9da 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -129,16 +129,6 @@ - - New event - ir.actions.act_window - event.event - form - form,tree - - - - Draft Events ir.actions.act_window @@ -280,14 +270,6 @@ name="All Registrations" id="menu_action_registration" parent="menu_event_main" action="action_registration"/> - - New Registration - event.registration - form - form,tree - - - Unconfirmed Registrations diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 7b459b21c47..a862ac86c0f 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -124,17 +124,6 @@ id="menu_open_view_employee_list_my" parent="menu_open_view_employee_list"/> - - New Employee - hr.employee - form - form,tree - - - - - - - My Expenses - hr.expense.expense - form - tree,form - [('user_id','=',uid)] - - - - - - - product.product.expense.form product.product diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 49ba1d602ad..0650889f182 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -69,22 +69,10 @@ form tree,form [('user_id','=',uid)] + - - - My Working Hours of The Day - ir.actions.act_window - hr.analytic.timesheet - form - tree,form - [('user_id','=',uid),('date', '=',time.strftime('%Y-%m-%d'))] - - - - - Working Hours ir.actions.act_window @@ -99,17 +87,6 @@ parent="hr_timesheet.menu_act_hr_timesheet_line_today_form" groups="hr.group_hr_manager"/> - - Working Hours of The Day - ir.actions.act_window - hr.analytic.timesheet - form - tree,form - [('date', '=', time.strftime('%Y-%m-%d'))] - - - - hr.timesheet.employee.extd_form hr.employee diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 4ff5ac27c95..0c89c430c15 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -117,15 +117,6 @@ - - My Uninvoiced Entries - account.analytic.line - form - tree,form - [('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)] - - - Open Analytic Accounts account.analytic.account @@ -142,22 +133,6 @@ [('state','<>','close'),('type','<>','view'),('pricelist_id','<>',False)] - - Draft Analytic Accounts - account.analytic.account - form - tree,form - [('state','=','draft'),('type','<>','view')] - - - - Pending Analytic Accounts - account.analytic.account - form - tree,form - [('state','=','pending'),('type','<>','view')] - - hr_timesheet_invoice.factor.form hr_timesheet_invoice.factor diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index f6443c0cf0b..d5708f0ba54 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -236,55 +236,11 @@ - - - My Department's Timesheets to Confirm - ir.actions.act_window - hr_timesheet_sheet.sheet - [('user_id', 'child_of', [uid]),('state','=','draft'),('date_to','<=',time.strftime('%Y-%m-%d'))] - form - tree,form - - - - - - My Department's Timesheets to Validate - ir.actions.act_window - hr_timesheet_sheet.sheet - [('user_id', 'child_of', [uid]),('state','=','confirm'),('date_to','<=',time.strftime('%Y-%m-%d'))] - form - tree,form - - - - - - Timesheets To Confirm - ir.actions.act_window - hr_timesheet_sheet.sheet - [('state','=','draft'),('date_to','<=',time.strftime('%Y-%m-%d'))] - form - tree,form - - - - - Timesheets To Validate - ir.actions.act_window - hr_timesheet_sheet.sheet - [('state','=','confirm')] - form - tree,form - - - - diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 9c599dc6521..e136d40ad87 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -194,33 +194,6 @@ - - My Ideas - idea.idea - form - tree,form - [('user_id', '=', uid)] - - - - - My Draft Ideas - idea.idea - form - tree,form - [('state','=','draft'),('user_id','=',uid)] - - - - - My Open Ideas - idea.idea - form - tree,form - [('state','=','open'),('user_id','=',uid)] - - - idea.vote_stat.graph idea.vote.stat diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index c415a12d7c3..327d3030d09 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -306,15 +306,6 @@ - - New Bill of Materials - ir.actions.act_window - mrp.bom - form - form,tree - [('bom_id','=',False)] - - Bill of Materials Components @@ -594,14 +585,6 @@ - - New Production Order - ir.actions.act_window - mrp.production - form - form,tree,calendar,graph,gantt - - mrp.production.lot.line.form mrp.production.lot.line @@ -809,14 +792,6 @@ [('state','=','exception'), ('message', '=', '')] - - New Requisition - ir.actions.act_window - mrp.procurement - form - form,tree - - stock.warehouse.orderpoint.tree diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index cdc7670b8fd..3a15bfc6edf 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -155,16 +155,6 @@ - - Running projects - project.project - form - [('state','=','open')] - - - - - Templates of Projects project.project @@ -174,15 +164,6 @@ - - New Project - project.project - form - form,tree - - - - project.task.work.form project.task.work @@ -227,29 +208,8 @@ - - My Projects - project.project - form - [('manager', '=', uid)] - - - - - - - My Running Projects - project.project - form - [('manager', '=', uid),('state','=','open')] - - - - - - + Projects Structure project.project tree @@ -526,18 +486,6 @@ - - My Tasks - project.task - form - tree,form,calendar,gantt,graph - [('user_id', '=', uid)] - - - - - - My Department Tasks project.task @@ -548,52 +496,6 @@ - - - - My Pending Tasks - project.task - form - tree,form,calendar,graph - [('user_id', '=', uid),('state','=','pending')] - - - - - - - My Current Tasks - project.task - form - tree,form,calendar,graph - [('user_id', '=', uid),('state','in',('open','draft'))] - - - - - - - - My Tasks in Progress - project.task - form - tree,form,calendar,graph - [('user_id', '=', uid),('state','=','open')] - - - - - - - My Draft Tasks - project.task - form - tree,form,calendar,graph - [('user_id', '=', uid),('state','=','draft')] - - - - My Department's Pending Tasks @@ -646,13 +548,6 @@ - - New Task - project.task - form - form,tree,calendar,gantt,graph - - Tasks in Progress diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index 02c80e70c9f..779ec43bc24 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -15,9 +15,6 @@ - - - Project multi-company diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml index 811973680cd..301ee3c71ee 100644 --- a/addons/project_timesheet/process/project_timesheet_process.xml +++ b/addons/project_timesheet/process/project_timesheet_process.xml @@ -7,7 +7,7 @@ --> - + diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml index b8fd81d2091..159a3448eea 100644 --- a/addons/report_analytic_planning/report_analytic_planning_view.xml +++ b/addons/report_analytic_planning/report_analytic_planning_view.xml @@ -216,45 +216,6 @@ id="menu_report_account_analytic_planning_my2" parent="planning_main" /> - - My Current Plannings - report_account_analytic.planning - form - tree,form - [('user_id','=',uid),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))] - - - - - Current Plannings - report_account_analytic.planning - form - tree,form - [('date_from','<=',time.strftime('%Y-%m-%d')),('date_to','>=',time.strftime('%Y-%m-%d'))] - - - - - New Planning - report_account_analytic.planning - form - form,tree - - - - - - diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index ff7673558d8..9cfb0215940 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 590ddb445db..2efe2981156 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -252,17 +252,6 @@ - - My Sales Order - ir.actions.act_window - sale.order - form - tree,form,calendar,graph - [('user_id','=',uid)] - - - - All Sales Order ir.actions.act_window @@ -273,15 +262,6 @@ - - New Quotation - ir.actions.act_window - sale.order - form - form,tree,calendar,graph - - - Sales in Exception ir.actions.act_window @@ -325,46 +305,6 @@ - - My sales in shipping exception - ir.actions.act_window - sale.order - form - tree,form,calendar,graph - [('state','in',('shipping_except','invoice_except')),('user_id','=',uid)] - - - - - My sales order waiting Invoice - ir.actions.act_window - sale.order - form - tree,form,calendar,graph - [('state','=','manual'),('user_id','=',uid)] - - - - - My sales order in progress - ir.actions.act_window - sale.order - form - tree,form,calendar,graph - [('state','in',('progress','waiting_date','manual')),('user_id','=',uid)] - - - - - My Quotations - ir.actions.act_window - sale.order - form - tree,form,calendar,graph - [('state','=','draft'),('user_id','=',uid)] - - - Old Quotations ir.actions.act_window diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index a2dfb9d5e5d..c6d62c93931 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -92,15 +92,6 @@ - - New Periodical Inventory - ir.actions.act_window - stock.inventory - form - form,tree - [('state','=','draft')] - - ============================= Lot ============================= @@ -1151,34 +1142,6 @@ - - New Reception Picking - stock.picking - ir.actions.act_window - form - form,tree,calendar - {'contact_display': 'partner'} - [('type','=','in')] - - - - tree - - - - - - form - - - - - - calendar - - - - Internal Moves stock.picking @@ -1217,17 +1180,6 @@ - - New Internal Picking - stock.picking - ir.actions.act_window - form - form,tree,calendar - [('state','=','draft'),('type','=','internal')] - {'contact_display': 'partner'} - - - ============================= Move Tracking ============================= diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index 1c4be802a55..626de776ffb 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -147,18 +147,6 @@ - - - My Pages - wiki.wiki - form - tree,form - - {'section':'1'} - [('create_uid','=',uid)] - - - Pages Waiting Review From 1343cdf0241528719e2059c5671cd8a71ddf47c3 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Tue, 1 Dec 2009 19:12:58 +0530 Subject: [PATCH 2/9] [REF]: Removed actions and filters from stock and purchase. Removedmenus 'All months/this month' from account,document reports. bzr revid: uco@tinyerp.co.in-20091201134258-vphruj87565ruhtt --- addons/purchase/purchase_view.xml | 41 --- .../report_account/report_receivable_view.xml | 54 ++-- .../report_document/report_document_view.xml | 51 ++-- addons/stock/stock_view.xml | 246 +++--------------- 4 files changed, 98 insertions(+), 294 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 37577dd5844..31611ede82d 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -142,28 +142,6 @@ - - Request For Quotations - ir.actions.act_window - purchase.order - [('state','=','draft')] - form - tree,form,calendar,graph - - - - - - Purchase Order Waiting Approval - ir.actions.act_window - purchase.order - form - tree,form,calendar,graph - [('state','=','confirmed')] - - - - Purchase Orders in Progress ir.actions.act_window @@ -171,28 +149,9 @@ form tree,form,calendar,graph [('state','=','approved')] - - - New Purchase Order - ir.actions.act_window - purchase.order - form,tree - - - - Purchase Order Waiting Approval - ir.actions.act_window - purchase.order - form - tree,form,calendar,graph - [('state','=','confirmed')] - - - - purchase.order.tree purchase.order diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml index 7ef469c96fe..9d02b716739 100644 --- a/addons/report_account/report_receivable_view.xml +++ b/addons/report_account/report_receivable_view.xml @@ -115,8 +115,8 @@ - - + + report.account.sales.tree @@ -146,26 +146,30 @@ - - - Sales by Account (this month) - report.account.sales - form - graph,tree - [('name','=',time.strftime('%Y-%m-01'))] - - + + report.account.sales.search + report.account.sales + search + + + + + + + + + + Sales by Account report.account.sales form graph,tree + - - @@ -211,21 +215,27 @@ - - Sales by Account Type (this month) - report.account_type.sales - form - graph,tree - [('name','=',time.strftime('%Y-%m-01'))] + + report.account_type.sales.search + report.account_type.sales + search + + + + + + + + + - - - + Sales by Account Type report.account_type.sales form graph,tree + diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml index 7226e953aa9..8f654c96983 100644 --- a/addons/report_document/report_document_view.xml +++ b/addons/report_document/report_document_view.xml @@ -34,49 +34,46 @@ + + report.document.user.search + report.document.user + search + + + + + + + + + + + + + + - My files (This months) + My files report.document.user form tree - [('user_id','=',uid),('name','=',time.strftime('%Y-%m-01'))] + - - - - - My files (All months) - report.document.user - form - tree,graph - [('user_id','=',uid)] - - - - - - - All Users files (This month) - report.document.user - form - tree,graph - [('name','=',time.strftime('%Y-%m-01'))] - - - + - All Users files (All months) + All Users files report.document.user form tree + - + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index c6d62c93931..6bbe4bce2dd 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -585,6 +585,26 @@ + + + + stock.picking.list.select + stock.picking + search + + + + + + + + + + + + + + # # Delivery Orders @@ -728,74 +748,6 @@ - - Delivery Orders to Process - stock.picking - ir.actions.act_window - form - tree,form,calendar - [('state','=','assigned'),('type','=','delivery')] - {'contact_display': 'partner'} - - - - - - tree - - - - - - form - - - - - - calendar - - - - - Future Delivery Orders - stock.picking - ir.actions.act_window - form - tree,form,calendar - [('state','=','confirmed'),('type','=','delivery')] - {'contact_display': 'partner'} - - - - - - tree - - - - - - form - - - - - - calendar - - - - - Calendar of Deliveries - stock.picking - ir.actions.act_window - form - calendar,tree,form - [('state','=','assigned'),('type','=','delivery')] - {'contact_display': 'partner'} - - # # Sending Products # @@ -902,7 +854,6 @@ tree,form,calendar [('type','=','out')] {'contact_display': 'partner'} - @@ -924,64 +875,6 @@ - - Available Picking - stock.picking - ir.actions.act_window - form - tree,form,calendar - [('state','=','assigned'),('type','=','out')] - {'contact_display': 'partner'} - - - - - - tree - - - - - - form - - - - - - calendar - - - - - Confirmed Picking Waiting Availability - stock.picking - ir.actions.act_window - form - tree,form,calendar - [('state','=','confirmed'),('type','=','out')] - {'contact_display': 'partner'} - - - - - - tree - - - - - - form - - - - - - calendar - - - # # Reception of Products # @@ -1090,7 +983,6 @@ tree,form,calendar [('type','=','in')] {'contact_display': 'partner'} - @@ -1112,36 +1004,6 @@ - - Picking to Process - stock.picking - ir.actions.act_window - form - tree,form,calendar - [('state','=','assigned'),('type','=','in')] - {'contact_display': 'partner'} - - - - - - tree - - - - - - form - - - - - - calendar - - - - Internal Moves stock.picking @@ -1150,36 +1012,10 @@ tree,form,calendar [('type','=','internal')] {'contact_display': 'partner'} - - - - Available Picking - stock.picking - ir.actions.act_window - form - tree,form,calendar - [('state','=','assigned'),('type','=','internal')] - {'contact_display': 'partner'} - - - - - - Confirmed Picking Waiting Availability - stock.picking - ir.actions.act_window - form - tree,form,calendar - [('state','=','confirmed'),('type','=','internal')] - {'contact_display': 'partner'} - - - - ============================= Move Tracking ============================= @@ -1253,41 +1089,43 @@ + + + stock.move.search + stock.move + tree + + + + + + + + + + + + + + + Stock Moves stock.move ir.actions.act_window form + - - Draft Moves - stock.move - ir.actions.act_window - form - [('state','=','draft')] - - - - - - Available Moves - stock.move - ir.actions.act_window - form - [('state','=','assigned')] - - - - Picking stock.picking ir.actions.act_window form tree,form,calendar + {'contact_display': 'partner'} From 110765133ad9f76ec97d77041a6220ac914e3d71 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Wed, 2 Dec 2009 12:32:41 +0530 Subject: [PATCH 3/9] [IMP]: Needed to change All months , This months like: For these reporting menus remove the structure 'All Months'/'This Month'. Just put one menu and add two buttons in the search view: This Year and This Month. bzr revid: uco@tinyerp.co.in-20091202070241-90ryh677bxkhk3p4 --- addons/board_account/board_account_view.xml | 2 +- .../board_association_view.xml | 8 +-- addons/board_document/board_document_view.xml | 2 +- .../board_manufacturing_view.xml | 2 +- addons/board_sale/board_sale_view.xml | 2 +- .../report_account/report_receivable_view.xml | 4 +- addons/report_project/report_project_view.xml | 56 +++++++++++----- .../report_purchase/report_purchase_view.xml | 60 ++++++++++++----- addons/report_sale/report_sale_graph.xml | 2 +- addons/report_sale/report_sale_view.xml | 67 +++++++++++++------ addons/report_task/report_task_view.xml | 2 +- 11 files changed, 142 insertions(+), 65 deletions(-) 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_document/board_document_view.xml b/addons/board_document/board_document_view.xml index d5d701680e1..ba2c50e1f58 100644 --- a/addons/board_document/board_document_view.xml +++ b/addons/board_document/board_document_view.xml @@ -15,7 +15,7 @@ - + diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml index a457f58a04a..95cb5c289e0 100644 --- a/addons/board_sale/board_sale_view.xml +++ b/addons/board_sale/board_sale_view.xml @@ -13,7 +13,7 @@
- + diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml index 9d02b716739..362123999ed 100644 --- a/addons/report_account/report_receivable_view.xml +++ b/addons/report_account/report_receivable_view.xml @@ -153,8 +153,8 @@ search - - + + diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml index 6589c5cea35..ae0e5a68236 100644 --- a/addons/report_project/report_project_view.xml +++ b/addons/report_project/report_project_view.xml @@ -41,22 +41,34 @@ - - Tasks finished by project and user (this month) - report.project.task.user - form - tree - [('name','=',time.strftime('%Y-%m-01'))] + + + report.project.task.user.search + report.project.task.user + search + + + + + + + + + + + + + - Tasks Closed by Project and User report.project.task.user form tree + - + @@ -94,22 +106,34 @@ - - Tasks finished by project (this month) - report.project.task - form - tree - [('name','=',time.strftime('%Y-%m-01'))] + + + report.project.task.search + report.project.task + search + + + + + + + + + + + + + - Tasks Closed by Project report.project.task form tree + - + diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml index b4640915c70..20c70825170 100644 --- a/addons/report_purchase/report_purchase_view.xml +++ b/addons/report_purchase/report_purchase_view.xml @@ -50,22 +50,36 @@ - - - Purchases by Products (this month) - report.purchase.order.product - form - tree,graph - [('name','=',time.strftime('%Y-%m-01'))] + + + report.purchase.order.product.search + report.purchase.order.product + search + + + + + + + + + + + + + - + Purchases by Products report.purchase.order.product form tree,graph + - + + + @@ -117,21 +131,33 @@ - - Purchases by Category of Product (this month) - report.purchase.order.category - form - tree,graph - [('name','=',time.strftime('%Y-%m-01'))] + + report.purchase.order.category.search + report.purchase.order.category + search + + + + + + + + + + + + + - + Purchases by Category of Products report.purchase.order.category form tree,graph + - + diff --git a/addons/report_sale/report_sale_graph.xml b/addons/report_sale/report_sale_graph.xml index d0e337ed75d..28f8ed4f74a 100644 --- a/addons/report_sale/report_sale_graph.xml +++ b/addons/report_sale/report_sale_graph.xml @@ -2,7 +2,7 @@ - + diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml index c7a09a1804b..c3e2637ac38 100644 --- a/addons/report_sale/report_sale_view.xml +++ b/addons/report_sale/report_sale_view.xml @@ -48,22 +48,36 @@ - - - Sale Orders by Product (this month) - report.sale.order.product - form - graph,tree - [('name','=',time.strftime('%Y-%m-01'))] - - + + + report.sale.order.product.search + report.sale.order.product + search + + + + + + + + + + + + + + + Sale Orders by Product report.sale.order.product form graph,tree + - + + + @@ -113,21 +127,34 @@ - - Sale Orders by Category of Product (this month) - report.sale.order.category - form - graph,tree - [('name','=',time.strftime('%Y-%m-01')),('state','<>','draft'),('state','<>','cancel')] - - + + + report.sale.order.category.search + report.sale.order.category + search + + + + + + + + + + + + + + + Sale Orders by Category of Products report.sale.order.category form graph,tree + - + @@ -148,7 +175,7 @@ graph,tree,form [('date_order','>=',time.strftime('%Y-%m-01')),('state','<>','draft'),('state','<>','cancel')] - + sale.order.dashboard.graph diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml index 8bc033721a3..d503b585eff 100644 --- a/addons/report_task/report_task_view.xml +++ b/addons/report_task/report_task_view.xml @@ -56,7 +56,7 @@ [] - + From 2a061d8e2cf832c7dacbe6fb5f5fdabf898b6c99 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Wed, 2 Dec 2009 16:59:25 +0530 Subject: [PATCH 4/9] [REF]: Removed menus, actions and filters from remaining views bzr revid: uco@tinyerp.co.in-20091202112925-hwyahuonhpl8qd6u --- addons/account_report/account_view.xml | 8 - addons/board_project/board_project_view.xml | 2 +- addons/crm_configuration/crm_meeting_menu.xml | 40 +---- addons/crm_configuration/crm_meeting_view.xml | 1 + .../crm_meeting_vertical_view.xml | 7 - addons/event/event_view.xml | 33 ---- .../hr_timesheet_sheet_view.xml | 23 --- addons/l10n_be/account.report.report.csv | 42 ++--- addons/l10n_lu/account.report.report.csv | 42 ++--- addons/membership/membership_view.xml | 160 +----------------- addons/point_of_sale/pos_view.xml | 6 +- .../report_account/report_receivable_view.xml | 4 +- .../report_document/report_document_view.xml | 2 +- .../report_intrastat_view.xml | 31 ++-- addons/report_project/report_project_view.xml | 4 +- .../report_purchase/report_purchase_view.xml | 4 +- addons/report_sale/report_sale_view.xml | 4 +- .../report_timesheet_view.xml | 120 ++++++------- addons/sale_journal/picking_journal_view.xml | 11 -- addons/sale_journal/sale_journal_view.xml | 33 ++-- addons/scrum/scrum_view.xml | 85 ---------- 21 files changed, 159 insertions(+), 503 deletions(-) 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/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml index eda8fd50cb5..ebb84180f79 100644 --- a/addons/board_project/board_project_view.xml +++ b/addons/board_project/board_project_view.xml @@ -61,7 +61,7 @@ - +
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml index c5d8f30a911..d0b99250ba9 100755 --- a/addons/crm_configuration/crm_meeting_menu.xml +++ b/addons/crm_configuration/crm_meeting_menu.xml @@ -74,45 +74,7 @@ - - - - crm.case - calendar,tree,form,graph,gantt - - - - - - - - - calendar - - - - - - tree - - - - - - form - - - - - - gantt - - - - - + diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml index 67ed305e864..207a6b0fe69 100755 --- a/addons/crm_configuration/crm_meeting_view.xml +++ b/addons/crm_configuration/crm_meeting_view.xml @@ -103,6 +103,7 @@ + diff --git a/addons/crm_vertical/crm_meeting_vertical_view.xml b/addons/crm_vertical/crm_meeting_vertical_view.xml index fe638b8abab..c87883381e4 100644 --- a/addons/crm_vertical/crm_meeting_vertical_view.xml +++ b/addons/crm_vertical/crm_meeting_vertical_view.xml @@ -6,12 +6,5 @@ - - - - - - - diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index b4709fbf9da..dfb56d8d7c2 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -128,22 +128,6 @@ - - - Draft Events - ir.actions.act_window - event.event - [('state','=','draft')] - - - - - Confirmed Events - ir.actions.act_window - event.event - [('state','=','confirm')] - - @@ -271,23 +255,6 @@ id="menu_action_registration" parent="menu_event_main" action="action_registration"/> - - Unconfirmed Registrations - event.registration - form - [('state','=','draft')] - tree,form - - - - - Confirmed Registrations - event.registration - form - [('state','in',('open','done'))] - - - report.event.registration.tree diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index d5708f0ba54..b7201b31bbe 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -210,7 +210,6 @@ [('user_id','=',uid)] form tree,form - @@ -222,18 +221,6 @@ [('user_id','=',uid),('state','=','draft'),('date_to','<=',time.strftime('%Y-%m-%d'))] form tree,form - - - - - - My Department's Timesheets - ir.actions.act_window - hr_timesheet_sheet.sheet - [('user_id', 'child_of', [uid])] - form - tree,form - @@ -327,15 +314,5 @@ - - Unvalidated Timesheets - hr_timesheet_sheet.sheet - [('state','<>','done'),('date_to','<',time.strftime('%Y-%m-%d'))] - form - - - - - diff --git a/addons/l10n_be/account.report.report.csv b/addons/l10n_be/account.report.report.csv index 8bf965c741c..831c8098dab 100644 --- a/addons/l10n_be/account.report.report.csv +++ b/addons/l10n_be/account.report.report.csv @@ -1,21 +1,21 @@ -"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" -0,,,,0,1,"indicator","BILAN","Bilan" -"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" -"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" -"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" -"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable" -"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" -"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" -"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" -"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" -0,,,,0,1,"fiscal","CRES","Compte des résultats" -"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" -"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" -"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" -"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" -"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" -0,,,,0,1,"indicator","IIMMO","Immobilisations" -"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" -0,,,,0,1,"indicator","ITRE","Trésorerie" -"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" -"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie" +"id","expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" +1,0,,,,0,1,"indicator","BILAN","Bilan" +2,"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" +3,"balance('2')",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" +4,"balance('3')",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" +5,"balance('4')",,"Actif",3,0,1,"indicator","BREAL","Réalisable" +6,"balance('5')",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" +7,"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" +8,"balance('1')",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" +9,"-balance('7')+balance('6')",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" +10,0,,,,0,1,"fiscal","CRES","Compte des résultats" +11,"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" +12,"balance('6')",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" +13,"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" +14,"-balance('7')",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" +15,"-balance('7')+balance('6')",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" +16,0,,,,0,1,"indicator","IIMMO","Immobilisations" +17,"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" +18,0,,,,0,1,"indicator","ITRE","Trésorerie" +19,"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" +20,"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie" diff --git a/addons/l10n_lu/account.report.report.csv b/addons/l10n_lu/account.report.report.csv index 89e497ce8c6..004f61438f0 100644 --- a/addons/l10n_lu/account.report.report.csv +++ b/addons/l10n_lu/account.report.report.csv @@ -1,21 +1,21 @@ -"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" -0,,,,0,1,"indicator","BILAN","Bilan" -"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" -"balance(['2'])",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" -"balance(['3']",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" -"balance(['4'])",,"Actif",3,0,1,"indicator","BREAL","Réalisable" -"balance(['5'])",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" -"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" -"balance(['1'])",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" -"-balance(['7'])+balance(['6'])",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" -0,,,,0,1,"fiscal","CRES","Compte des résultats" -"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" -"balance(['6'])",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" -"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" -"-balance(['7'])",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" -"-balance(['7'])+balance(['6'])",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" -0,,,,0,1,"indicator","IIMMO","Immobilisations" -"balance(['1'])/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" -0,,,,0,1,"indicator","ITRE","Trésorerie" -"balance(['3','4','5']) / balance(['101','13','15','16','17','18'])","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" -"balance(['4','5']) / balance(['101','13','15','16','17','18'])",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie" +"id","expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" +1,0,,,,0,1,"indicator","BILAN","Bilan" +2,"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" +3,"balance(['2'])",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" +4,"balance(['3']",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" +5,"balance(['4'])",,"Actif",3,0,1,"indicator","BREAL","Réalisable" +6,"balance(['5'])",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" +7,"report('BCAP') + report('BRESNET')",,"BILAN",1,0,1,"fiscal","PASSIF","Passif" +8,"balance(['1'])",,"PASSIF",1,0,1,"indicator","BCAP","Capitaux propores" +9,"-balance(['7'])+balance(['6'])",,"PASSIF",,0,1,"fiscal","BRESNET","Résultat net" +10,0,,,,0,1,"fiscal","CRES","Compte des résultats" +11,"report('CCHAR','CBENEF')",,"CRES",,0,1,"fiscal","CRESACTIF","Résultat Actif" +12,"balance(['6'])",,"CRESACTIF",,0,1,"fiscal","CCHAR","Total des charges" +13,"report('CRESPROD')",,"CRES",,0,1,"fiscal","CRESPASSIF","Résultat Passif" +14,"-balance(['7'])",,"CRESPASSIF",,0,1,"fiscal","CRESPROD","Total des produits" +15,"-balance(['7'])+balance(['6'])",,"CRESACTIF",,0,1,"fiscal","CBENEF","Résultat (Bénéfice)" +16,0,,,,0,1,"indicator","IIMMO","Immobilisations" +17,"balance(['1'])/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,1,"indicator","CIMMO","Couverture des immobilisations" +18,0,,,,0,1,"indicator","ITRE","Trésorerie" +19,"balance(['3','4','5']) / balance(['101','13','15','16','17','18'])","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,1,"indicator","IFR","Indice du fond de roulement" +20,"balance(['4','5']) / balance(['101','13','15','16','17','18'])",,"ITRE",,0,1,"indicator","RTRE","Ratio de trésorerie" diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 236cb3d9769..b2ef7611c67 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -103,11 +103,11 @@ + - Current members res.partner @@ -131,164 +131,6 @@ id="menu_members" sequence="2" action="action_membership_members"/> - - - - Paid members - res.partner - [('membership_state', '=', 'paid')] - - - - - - tree - - - - - - - form - - - - - - - - Free members - res.partner - [('membership_state', '=', 'free')] - - - - - - tree - - - - - - - form - - - - - - associate members - res.partner - tree - - - - - - - - - - - - - Associated members - res.partner - [('associate_member', '!=', False), ('membership_state', '!=', 'none')] - - - - - - tree - - - - - - - form - - - - - - - - Invoiced members - res.partner - [('membership_state', '=', 'invoiced')] - - - - - - tree - - - - - - - form - - - - - - - - Future members - res.partner - [('membership_state', '=', 'waiting')] - - - - - tree - - - - - - - form - - - - - - - - - Old members - res.partner - [('membership_state', '=', 'old')] - - - - - tree - - - - - - - form - - - - - - diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml index 22cd23cffff..3f328f00f4d 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/pos_view.xml @@ -170,13 +170,12 @@ - Orders of the day + Orders for today ir.actions.act_window pos.order form tree,form - [('date_order','>=',time.strftime('%Y-%m-%d')),('date_order','<=',time.strftime('%Y-%m-%d'))] @@ -188,7 +187,6 @@ form tree,form - @@ -234,7 +232,7 @@ - POS Lines of the day + POS Lines for today ir.actions.act_window pos.order.line form diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml index 362123999ed..8d5d20a5e93 100644 --- a/addons/report_account/report_receivable_view.xml +++ b/addons/report_account/report_receivable_view.xml @@ -154,7 +154,7 @@ - + @@ -222,7 +222,7 @@ - + diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml index 8f654c96983..f4345e0a13f 100644 --- a/addons/report_document/report_document_view.xml +++ b/addons/report_document/report_document_view.xml @@ -42,7 +42,7 @@ - + diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index 51841c13bb5..baeb7f53af0 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -89,27 +89,34 @@ - - Intrastat (this month) - ir.actions.act_window - report.intrastat - form - tree - [('name','=',time.strftime('%b.%Y'))] + + report.intrastat.search + report.intrastat + search + + + + + + + + + + + + + - - - Intrastat ir.actions.act_window report.intrastat form tree + - - + diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml index ae0e5a68236..7560fd1d917 100644 --- a/addons/report_project/report_project_view.xml +++ b/addons/report_project/report_project_view.xml @@ -50,7 +50,7 @@ - + @@ -115,7 +115,7 @@ - + diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml index 20c70825170..ff940fab14c 100644 --- a/addons/report_purchase/report_purchase_view.xml +++ b/addons/report_purchase/report_purchase_view.xml @@ -59,7 +59,7 @@ - + @@ -139,7 +139,7 @@ - + diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml index c3e2637ac38..6526bcbece0 100644 --- a/addons/report_sale/report_sale_view.xml +++ b/addons/report_sale/report_sale_view.xml @@ -57,7 +57,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml index 4ebaaca7e86..100419607e2 100644 --- a/addons/report_timesheet/report_timesheet_view.xml +++ b/addons/report_timesheet/report_timesheet_view.xml @@ -17,7 +17,6 @@ - report_timesheet.timesheet.user.form report_timesheet.user @@ -31,7 +30,6 @@ - report_timesheet.timesheet.user.tree report_timesheet.user @@ -46,15 +44,6 @@ - - Timesheet by user (this month) - report_timesheet.user - form - graph,tree - [('name','>=',time.strftime('%Y-%m-01'))] - - - report_timesheet.account.date.graph report_timesheet.account.date @@ -68,26 +57,32 @@ - - - - My Timesheet of the Month - report_timesheet.account.date - form - graph,tree - - [('name','>=',time.strftime('%Y-%m-01')), ('user_id','=',uid)] + + report_timesheet.timesheet.user.search + report_timesheet.user + search + + + + + + + + + + + + - - Timesheet by User report_timesheet.user form graph,tree + - + @@ -103,7 +98,6 @@ - report_timesheet.timesheet.invoice.form report_timesheet.invoice @@ -117,7 +111,6 @@ - report_timesheet.timesheet.invoice.tree report_timesheet.invoice @@ -139,16 +132,7 @@ form graph,tree - - - - My timesheets to invoice - report_timesheet.invoice - form - graph,tree - [('manager_id','=',uid)] - - + @@ -178,7 +162,6 @@ - report_timesheet.timesheet.account.date.form report_timesheet.account.date @@ -194,22 +177,33 @@ + + report_timesheet.timesheet.account.date.search + report_timesheet.account.date + search + + + + + + + + + + + + + + + Daily Timesheet by Account report_timesheet.account.date form graph,tree + - - - - My daily timesheets by account - report_timesheet.account.date - form - graph,tree - [('user_id','=',uid)] - - + @@ -239,8 +233,6 @@ - - report_timesheet.timesheet.account.form report_timesheet.account @@ -256,22 +248,34 @@ + + report_timesheet.timesheet.account.search + report_timesheet.account + search + +
+ + + + + + + + + +
+ + + + Timesheet by Account report_timesheet.account form graph,tree + - - - - My timesheets by account - report_timesheet.account - form - graph,tree - [('user_id','=',uid)] - - + diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml index 72559f31620..3a91aeb37b7 100644 --- a/addons/sale_journal/picking_journal_view.xml +++ b/addons/sale_journal/picking_journal_view.xml @@ -70,17 +70,6 @@ - - My open packing journals - sale_journal.picking.journal - form - tree,form - [('user_id','=',uid),('state','=','open')] - - - - - Picking by journal sale_journal.picking.journal diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index 3a595b319c8..a10c46c3a1a 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -303,27 +303,36 @@ - - - Sales by journal (this month) - sale_journal.sale.stats - ir.actions.act_window - form - tree,form - [('name','=',time.strftime('%Y-%m-01'))] + + + sale_journal.sale.stats.search + sale_journal.sale.stats + search + + + + + + + + + + + + - - - + Sales by Journal sale_journal.sale.stats ir.actions.act_window form tree,form + - + + - - Draft Backlogs - scrum.product.backlog - form - tree,form - [('state','=','draft')] - - - - - Opened Backlogs - scrum.product.backlog - form - tree,form - [('state','=','open')] - - - @@ -201,73 +183,6 @@ - - Sprint - scrum.sprint - form - - - - - - Opened Sprints - scrum.sprint - tree - [('state','=','open')] - - - - - Draft Sprints - scrum.sprint - tree - [('state','=','draft')] - - - - - Sprints Done - scrum.sprint - tree - [('state','=','done')] - - - - - - My Sprints (Product Owner) - scrum.sprint - tree - [('product_owner_id','=',uid)] - - - - - My Sprints (Scrum Master) - scrum.sprint - tree - [('scrum_master_id','=',uid)] - - - - - - My opened sprints (Product Owner) - scrum.sprint - tree - [('product_owner_id','=',uid),('state','=','open')] - - - - - My opened sprints (Scrum Master) - scrum.sprint - tree - [('scrum_master_id','=',uid),('state','=','open')] - - - - From f2bb57289ccc595664bb207335d12775fe9d88a6 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Wed, 9 Dec 2009 11:02:07 +0530 Subject: [PATCH 5/9] [IMP]: Deleted the menu items and actions from remaining views. bzr revid: uco@tinyerp.co.in-20091209053207-fgtzp1bzm9rb9vyi --- addons/auction/auction_view.xml | 21 ---------- addons/board_auction/board_auction_view.xml | 8 ++-- .../board_project_manager_view.xml | 2 +- addons/board_project/board_project_view.xml | 2 +- addons/crm/crm_view.xml | 29 +------------- .../hr_timesheet_sheet_view.xml | 25 ------------ .../process/hr_timesheet_sheet_process.xml | 10 ++--- .../report_analytic_planning_view.xml | 39 ------------------- .../report_document/report_document_view.xml | 9 ----- addons/scrum/scrum_view.xml | 19 --------- 10 files changed, 12 insertions(+), 152 deletions(-) diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 02da9be31c7..bc5547a3608 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -1236,14 +1236,6 @@ My Latest Objects My Latest Deposit ============================== - - auction.deposit - form - tree,form - [('create_uid','=',uid)] - - - auction.deposit form @@ -1295,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 @@ -1313,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_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_view.xml b/addons/board_project/board_project_view.xml index ebb84180f79..d59f188c33b 100644 --- a/addons/board_project/board_project_view.xml +++ b/addons/board_project/board_project_view.xml @@ -60,7 +60,7 @@ - + diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 1d7c3a4fca5..6e8a1bdecb5 100755 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -483,24 +483,6 @@ - - My cases - crm.case - form - tree,form,calendar - [('user_id','=',uid)] - - - - - My Open Cases - crm.case - form - tree,form,calendar - [('user_id','=',uid),('state','<>','done'),('state','<>','cancel'),('state','<>','pending')] - - - Cases crm.case @@ -540,16 +522,7 @@ tree,form - - - - My Histories - crm.case.history - form - tree,form - [('user_id','=',uid)] - - + crm.segmentation.line.tree diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index cebf0b06532..f80a94a67ff 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -203,31 +203,6 @@ - - My timesheets - ir.actions.act_window - hr_timesheet_sheet.sheet - [('user_id','=',uid)] - form - tree,form - - - - - - My timesheets to confirm - ir.actions.act_window - hr_timesheet_sheet.sheet - [('user_id','=',uid),('state','=','draft'),('date_to','<=',time.strftime('%Y-%m-%d'))] - form - tree,form - - - - - - - diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 0135aa2dfb6..9e2d87c55c3 100755 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -26,7 +26,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml index 159a3448eea..28a5b101602 100644 --- a/addons/report_analytic_planning/report_analytic_planning_view.xml +++ b/addons/report_analytic_planning/report_analytic_planning_view.xml @@ -204,18 +204,6 @@ - - My Plannings - report_account_analytic.planning - form - tree,form - [('user_id','=',uid)] - - - - @@ -277,33 +265,6 @@ - - My Planning Statistics - report_account_analytic.planning.stat - form - [('user_id','=',uid),('planning_id.state','<>','cancel')] - graph,tree - - - - - - Planning Statistics of My Projects - report_account_analytic.planning.stat - form - [('manager_id','=',uid),('planning_id.state','<>','cancel')] - graph,tree - - - - diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml index f4345e0a13f..d2c2c57654f 100644 --- a/addons/report_document/report_document_view.xml +++ b/addons/report_document/report_document_view.xml @@ -53,17 +53,8 @@ - - My files - report.document.user - form - tree - - - - All Users files diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml index e28274960f9..f867b2b9e5f 100644 --- a/addons/scrum/scrum_view.xml +++ b/addons/scrum/scrum_view.xml @@ -343,25 +343,6 @@ - - My tasks - scrum.task - form - tree,form - [('user_id', '=', uid),('scrum','=',1)] - - - - - - My opened tasks - scrum.task - form - tree,form - [('user_id','=',uid),('state','=','open'),('scrum','=',1)] - - - Opened tasks scrum.task From cb12465124c33f6cfe180c4c81ebfb9f5ae85429 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Thu, 10 Dec 2009 13:00:41 +0530 Subject: [PATCH 6/9] [IMP]: Improved sale journal report views. Removed This Month/All Months menus. bzr revid: uco@tinyerp.co.in-20091210073041-d1cyuwb9f28aqvfc --- addons/account/account_analytic_line.py | 14 ++-- addons/account/project/project_view.xml | 31 ++++++--- .../report_analytic/report_analytic_view.xml | 2 +- .../report_analytic_line_view.xml | 2 +- addons/sale_journal/picking_journal_view.xml | 11 ---- .../picking_journal_view_report.xml | 65 ++++++++++++------- .../sale_journal_picking_report.py | 23 +++++-- addons/sale_journal/sale_journal_report.py | 11 +++- addons/sale_journal/sale_journal_view.xml | 44 ++++++------- 9 files changed, 121 insertions(+), 82 deletions(-) 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/project/project_view.xml b/addons/account/project/project_view.xml index 00dd4d821fc..8b5da45e965 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -362,29 +362,40 @@ + + + + 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/report_analytic/report_analytic_view.xml b/addons/report_analytic/report_analytic_view.xml index dc1a6fd1b71..50d861a10b6 100644 --- a/addons/report_analytic/report_analytic_view.xml +++ b/addons/report_analytic/report_analytic_view.xml @@ -57,7 +57,7 @@ tree,graph [('state','=','open')] - + diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml index e5c9a3d2c06..545021bccd4 100644 --- a/addons/report_analytic_line/report_analytic_line_view.xml +++ b/addons/report_analytic_line/report_analytic_line_view.xml @@ -57,7 +57,7 @@ form tree,graph - + diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml index 3a91aeb37b7..a8b2abb351d 100644 --- a/addons/sale_journal/picking_journal_view.xml +++ b/addons/sale_journal/picking_journal_view.xml @@ -70,17 +70,6 @@ - - Picking by journal - sale_journal.picking.journal - form - tree,form - [('state','=','open')] - - - - - Picking by invoice_method sale_journal.invoice.type.tree diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml index 060b1fd1da6..79c795145f5 100644 --- a/addons/sale_journal/picking_journal_view_report.xml +++ b/addons/sale_journal/picking_journal_view_report.xml @@ -12,6 +12,7 @@
+ @@ -29,6 +30,7 @@ + @@ -39,6 +41,24 @@ + + sale_journal.invoice.type.stats.search + sale_journal.invoice.type.stats + search + + + + + + + + + + + + + + Statistics on picking to invoice sale_journal.invoice.type.stats @@ -48,18 +68,7 @@ [('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)] - - Picking by invoice method - sale_journal.invoice.type.stats - ir.actions.act_window - form - tree,form - [('name','=',time.strftime('%Y-%m-01'))] - - - - Picking by invoice method @@ -67,10 +76,10 @@ ir.actions.act_window form tree,form + - - + # # Packing by journal @@ -83,6 +92,7 @@ + @@ -108,27 +118,34 @@ - - - Picking by journal - sale_journal.picking.stats - ir.actions.act_window - form - tree,form - [('name','=',time.strftime('%Y-%m-01'))] + + sale_journal.picking.stats.search + sale_journal.picking.stats + search + + + + + + + + + + + + - - Picking by journal sale_journal.picking.stats ir.actions.act_window form tree,form + - + diff --git a/addons/sale_journal/sale_journal_picking_report.py b/addons/sale_journal/sale_journal_picking_report.py index 5ae9ee814e4..d7735b2a29c 100644 --- a/addons/sale_journal/sale_journal_picking_report.py +++ b/addons/sale_journal/sale_journal_picking_report.py @@ -20,13 +20,14 @@ ############################################################################## from osv import fields,osv +import tools class report_sale_journal_invoice_type_stats(osv.osv): _name = "sale_journal.invoice.type.stats" _description = "Stats on packing by invoice method" _auto = False _columns = { - 'name': fields.date('Month', readonly=True), + 'name': fields.char('Year',size=64,required=False, readonly=True), 'invoice_state':fields.selection([ ("invoiced","invoiced"), ("2binvoiced","to be invoiced"), @@ -45,14 +46,19 @@ class report_sale_journal_invoice_type_stats(osv.osv): 'price_total': fields.float('Total Price', readonly=True), 'price_average': fields.float('Average Price', readonly=True), 'count': fields.integer('# of Lines', 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 = 'state,invoice_state,name desc' def init(self, cr): + tools.drop_view_if_exists(cr, 'sale_journal_invoice_type_stats') cr.execute(""" create or replace view sale_journal_invoice_type_stats as ( select min(l.id) as id, - to_char(s.date, 'YYYY-MM-01') as name, + to_char(s.date, 'YYYY') as name, + to_char(s.date, 'MM') as month, s.state, s.invoice_state, s.invoice_type_id, @@ -63,7 +69,7 @@ class report_sale_journal_invoice_type_stats(osv.osv): from stock_picking s left join stock_move l on (s.id=l.picking_id) left join sale_order_line ol on (l.sale_line_id=ol.id) - group by s.invoice_type_id, to_char(s.date, 'YYYY-MM-01'),s.state, s.invoice_state + group by s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state order by s.invoice_type_id, s.invoice_state, s.state ) """) @@ -74,7 +80,7 @@ class report_sale_journal_picking(osv.osv): _description = "Picking lists by Journal" _auto = False _columns = { - 'name': fields.date('Month', readonly=True), + 'name': fields.char('Year',size=64,required=False, readonly=True), 'state': fields.selection([ ('draft','draft'), ('auto','waiting'), @@ -88,14 +94,19 @@ class report_sale_journal_picking(osv.osv): 'price_total': fields.float('Total Price', readonly=True), 'price_average': fields.float('Average Price', readonly=True), 'count': fields.integer('# of Lines', 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 = 'journal_id,name desc,price_total desc' def init(self, cr): + tools.drop_view_if_exists(cr, 'sale_journal_picking_stats') cr.execute(""" create or replace view sale_journal_picking_stats as ( select min(l.id) as id, - to_char(s.date, 'YYYY-MM-01') as name, + to_char(s.date, 'YYYY') as name, + to_char(s.date, 'MM') as month, s.state, s.journal_id, sum(l.product_qty) as quantity, @@ -105,7 +116,7 @@ class report_sale_journal_picking(osv.osv): from stock_picking s right join stock_move l on (s.id=l.picking_id) right join sale_order_line ol on (l.sale_line_id=ol.id) - group by s.journal_id, to_char(s.date, 'YYYY-MM-01'),s.state + group by s.journal_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state ) """) report_sale_journal_picking() diff --git a/addons/sale_journal/sale_journal_report.py b/addons/sale_journal/sale_journal_report.py index f1fe7e96946..2aee0ba09e9 100644 --- a/addons/sale_journal/sale_journal_report.py +++ b/addons/sale_journal/sale_journal_report.py @@ -20,13 +20,14 @@ ############################################################################## from osv import fields,osv +import tools class report_sale_journal_sale(osv.osv): _name = "sale_journal.sale.stats" _description = "Sales Orders by Journal" _auto = False _columns = { - 'name': fields.date('Month', readonly=True), + 'name': fields.char('Year',size=64,required=False, readonly=True), 'state': fields.selection([ ('draft','Quotation'), ('waiting_date','Waiting Schedule'), @@ -42,14 +43,18 @@ class report_sale_journal_sale(osv.osv): 'price_total': fields.float('Total Price', readonly=True), 'price_average': fields.float('Average Price', readonly=True), 'count': fields.integer('# of Lines', 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 = 'journal_id,name desc,price_total desc' def init(self, cr): + tools.drop_view_if_exists(cr, 'sale_journal_sale_stats') cr.execute(""" create or replace view sale_journal_sale_stats as ( select min(l.id) as id, - to_char(s.date_order, 'YYYY-MM-01') as name, + to_char(s.date_order, 'YYYY') as name, + to_char(s.date_order,'MM') as month, s.state, s.journal_id, sum(l.product_uom_qty) as quantity, @@ -58,7 +63,7 @@ class report_sale_journal_sale(osv.osv): (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty))::decimal(16,2) as price_average from sale_order s right join sale_order_line l on (s.id=l.order_id) - group by s.journal_id, to_char(s.date_order, 'YYYY-MM-01'),s.state + group by s.journal_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state ) """) report_sale_journal_sale() diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index a10c46c3a1a..5fe8e511870 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -91,10 +91,31 @@ + + + sale_journal.sale.journal.search + sale_journal.sale.journal + search + + + + + + + + + + + + + + + sale_journal.sale.journal form tree,form + @@ -104,32 +125,11 @@ form tree,form [] + - - My open journals - sale_journal.sale.journal - form - tree,form - [('user_id','=',uid),('state','=','open')] - - - - - - - Open journals - sale_journal.sale.journal - form - tree,form - [('state','=','open')] - - - - - sale.order.journal.view.form form From 66e73397a4a757a890442b5deda7c392cc08f890 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Thu, 10 Dec 2009 14:55:25 +0530 Subject: [PATCH 7/9] [ADD]: Added Search views in crm reports. [IMP]: Improved some report search views in report_crm. bzr revid: uco@tinyerp.co.in-20091210092525-k6nbgtx2d4gey4c3 --- addons/crm/crm_report_view.xml | 48 ++++++++++++++++++++++++--- addons/report_crm/report_crm_view.xml | 23 ++++++++----- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml index d33630bcbec..ebdeb8d7521 100644 --- a/addons/crm/crm_report_view.xml +++ b/addons/crm/crm_report_view.xml @@ -57,11 +57,32 @@ + + + CRM Report - Sections and Type(Select) + report.crm.case.section.categ2 + search + + + + + + + + + + + + + + + report.crm.case.section.categ2 form graph,tree + @@ -117,11 +138,30 @@ + + CRM Report - Sections and Stage(Select) + report.crm.case.section.stage + search + + + + + + + + + + + + + + report.crm.case.section.stage form graph,tree + @@ -173,9 +213,9 @@ - + - + @@ -255,9 +295,9 @@ - + - + diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index 8589daa1a9b..84fbad5d985 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -61,10 +61,10 @@ search - - + + - + @@ -143,10 +143,10 @@ search - - + + - + @@ -215,10 +215,15 @@ search - - + + - + + + + + + From f7a1726f20ec12342c4c4592187396adfe34d71c Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Sat, 12 Dec 2009 12:20:20 +0530 Subject: [PATCH 8/9] [ADD]: With reference to bug #493714: Stock reception improvements bzr revid: uco@tinyerp.co.in-20091212065020-txrl3txbj97giv9d --- addons/stock/stock.py | 5 +- addons/stock/stock_view.xml | 77 +++++++ addons/stock/stock_wizard.xml | 7 + addons/stock/wizard/__init__.py | 1 + addons/stock/wizard/wizard_partial_move.py | 225 +++++++++++++++++++++ 5 files changed, 314 insertions(+), 1 deletion(-) create mode 100644 addons/stock/wizard/wizard_partial_move.py diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 8b5356a8573..a5d4f0870bd 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1000,7 +1000,10 @@ class stock_move(osv.osv): \nThe state is \'Waiting\' if the move is waiting for another one.'), 'price_unit': fields.float('Unit Price', digits=(16, int(config['price_accuracy']))), - 'company_id': fields.many2one('res.company', 'Company', required=True), + 'company_id': fields.many2one('res.company', 'Company', required=True), + 'purchase_id': fields.related('picking_id','purchase_id',type='many2one', relation="purchase.order", string="Purchase Orders"), + 'supplier_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Supplier"), + 'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"), } _constraints = [ (_check_tracking, diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index d5da515f50e..a85ba9320e7 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1138,6 +1138,83 @@ + ==================================== + Reception Picking (By Stock Move) + ==================================== + + + stock.move.tree2 + stock.move + tree + + + + + + + + + + + + + +