From 50ee2493f4b656799aa5ac01ae9d8cd4b14cbae3 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Mon, 23 Nov 2009 10:59:17 +0530 Subject: [PATCH 01/14] [IMP]: remove all menus (and their related actions) and keep bzr revid: uco@tinyerp.co.in-20091123052917-bj8x7mvtyqt41w72 --- addons/account/account_invoice_view.xml | 22 ----------------- addons/account/account_view.xml | 4 ---- .../process/customer_invoice_process.xml | 2 +- .../process/supplier_invoice_process.xml | 2 +- addons/account/project/project_view.xml | 1 - .../account_analytic_analysis_menu.xml | 6 ----- addons/account_payment/payment_view.xml | 5 ---- addons/account_voucher/voucher_view.xml | 24 ++++++++----------- addons/auction/auction_view.xml | 21 ++++------------ addons/audittrail/audittrail_view.xml | 4 ++-- addons/crm/crm_view.xml | 2 -- addons/delivery/delivery_view.xml | 1 - addons/event/event_view.xml | 19 ++------------- addons/hr_holidays/hr_view.xml | 9 ------- addons/hr_timesheet/hr_timesheet_view.xml | 2 -- .../hr_timesheet_invoice_view.xml | 22 ++--------------- .../hr_timesheet_sheet_view.xml | 6 ----- addons/idea/idea_view.xml | 13 ---------- addons/membership/membership_view.xml | 23 ++++-------------- addons/mrp/mrp_view.xml | 16 ++----------- .../mrp/process/stockable_product_process.xml | 2 +- addons/mrp_operations/mrp_operations_view.xml | 3 --- addons/mrp_repair/mrp_repair_view.xml | 15 ++++-------- addons/point_of_sale/pos_view.xml | 16 ++++++------- addons/project/project_view.xml | 16 ------------- addons/purchase/process/purchase_process.xml | 14 +++++------ addons/purchase/purchase_view.xml | 4 ---- addons/sale/process/sale_process.xml | 12 +++++----- addons/sale/sale_view.xml | 14 ++--------- addons/sale_journal/sale_journal_view.xml | 6 ++--- addons/scrum/scrum_view.xml | 7 ++---- addons/stock/stock_view.xml | 13 +--------- addons/wiki/wiki_view.xml | 6 +---- 33 files changed, 61 insertions(+), 271 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 40991fa0320..329115e8fb0 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -391,7 +391,6 @@ [('type','=','out_invoice')] {'type':'out_invoice'} - Supplier Invoices @@ -413,7 +412,6 @@ [('type','=','in_invoice')] {'type':'in_invoice'} - Customer Refunds @@ -436,7 +434,6 @@ [('type','=','out_refund')] {'type':'out_refund'} - Supplier Refunds @@ -459,7 +456,6 @@ [('type','=','in_refund')] {'type':'in_refund'} - @@ -484,8 +480,6 @@ - - PRO-FORMA Customer Invoices account.invoice @@ -508,8 +502,6 @@ - - Unpaid Customer Invoices account.invoice @@ -532,8 +524,6 @@ - - Draft Supplier Invoices account.invoice @@ -556,8 +546,6 @@ - - Unpaid Supplier Invoices account.invoice @@ -580,8 +568,6 @@ - - Draft Customer Refunds account.invoice @@ -604,8 +590,6 @@ - - Unpaid Customer Refunds account.invoice @@ -628,8 +612,6 @@ - - Draft Supplier Refunds account.invoice @@ -652,8 +634,6 @@ - - Unpaid Supplier Refunds account.invoice @@ -676,8 +656,6 @@ - - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1e25c23e7e3..4bcb13af0b3 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -390,7 +390,6 @@ [('state','=','draft')] - New Statement @@ -398,7 +397,6 @@ form form,tree - account.bank.statement.reconcile.form @@ -1343,7 +1341,6 @@ [('state','=','running')] - New Subscription @@ -1352,7 +1349,6 @@ form,tree - account.subscription.line.form diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index acdce086ee4..31d79a29971 100755 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -28,7 +28,7 @@ - + diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml index 8611dd6eb07..778530a3930 100755 --- a/addons/account/process/supplier_invoice_process.xml +++ b/addons/account/process/supplier_invoice_process.xml @@ -28,7 +28,7 @@ - + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 71bb124109d..dba8b0f1b30 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -116,7 +116,6 @@ form,tree,graph - diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index cd2148c7255..e6fb188789e 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -46,8 +46,6 @@ - - My Pending Accounts account.analytic.account @@ -57,8 +55,6 @@ - - New Analytic Account account.analytic.account @@ -105,7 +101,6 @@ [('state','=','open')] - Pending Analytic Accounts @@ -116,7 +111,6 @@ [('state','=','pending')] - diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml index b1ad3d54f53..df1e25a419c 100644 --- a/addons/account_payment/payment_view.xml +++ b/addons/account_payment/payment_view.xml @@ -192,7 +192,6 @@ [('state','=','draft')] - Payment Orders to Validate @@ -202,16 +201,12 @@ [('state','=','open')] - - New Payment Order payment.order form form,tree - - Payment Line diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 11858390e97..16fabe0e8c2 100755 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -101,9 +101,8 @@ [('type','=','rec_voucher')] {'type':'rec_voucher'} + - Cash Receipt Voucher @@ -114,7 +113,7 @@ [('type','=','rec_voucher')] {'type':'rec_voucher'} - + Bank Receipt @@ -124,9 +123,8 @@ [('type','=','bank_rec_voucher')] {'type':'bank_rec_voucher'} + - Bank Receipt Voucher @@ -137,7 +135,7 @@ [('type','=','bank_rec_voucher')] {'type':'bank_rec_voucher'} - + @@ -157,16 +155,15 @@ id="menu_action_payments_voucher_list" action="action_payments_voucher_list"/> - Payment Vouchers + Cash Payment Vouchers account.voucher form tree,form [('type','=','pay_voucher')] {'type':'pay_voucher'} + - Cash Payment Voucher @@ -177,19 +174,18 @@ [('type','=','pay_voucher')] {'type':'pay_voucher'} - + - Payment Vouchers + Bank Payment Vouchers account.voucher form tree,form [('type','=','bank_pay_voucher')] {'type':'bank_pay_voucher'} + - Bank Payment Voucher @@ -200,7 +196,7 @@ [('type','=','bank_pay_voucher')] {'type':'bank_pay_voucher'} - + diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 39217968ef7..80aa0f69bad 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -138,8 +138,8 @@ form [('state','=','closed')] + - auction.dates @@ -366,6 +366,7 @@ + Sold Objects auction.lots form [('state','=','sold')] @@ -375,26 +376,23 @@ - - + Objects to sell auction.lots form tree,form [('state','<>','sold')] - + Unplanned objects auction.lots form tree,form [('auction_id','=', False),('state','=','draft')] - - @@ -405,14 +403,6 @@ [('state','=','unsold')] - - - @@ -486,7 +476,6 @@ tree,form - Auction.deposit.tree @@ -501,8 +490,6 @@ - - auction.deposit.form auction.deposit diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index 076e5ef830e..98a4ecc00e9 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -53,13 +53,13 @@ - Rules + Subscribed Rules audittrail.rule form tree,form [('state','=','subscribed')] + - audittrail.log.form diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 80a08c87fc2..f9f1614ce69 100755 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -481,7 +481,6 @@ [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')] - My cases @@ -500,7 +499,6 @@ [('user_id','=',uid),('state','<>','done'),('state','<>','cancel'),('state','<>','pending')] - crm.case.section.open diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index d05aa480367..2c83fef3ec6 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -168,7 +168,6 @@ {'contact_display': 'partner'} - Generate Draft Invoices On Receptions diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 1df91d87cbc..06164b44bcb 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -146,10 +146,7 @@ [('state','=','draft')] - + Confirmed Events ir.actions.act_window @@ -157,10 +154,6 @@ [('state','=','confirm')] - - @@ -304,10 +297,7 @@ tree,form - + Confirmed Registrations event.registration @@ -315,11 +305,6 @@ [('state','in',('open','done'))] - - diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml index 3b87ba5a29a..911b6c4a54a 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_view.xml @@ -266,8 +266,6 @@ - - My Awaiting Confirmation Leave Requests ir.actions.act_window @@ -278,7 +276,6 @@ - My Validated Leave Requests @@ -290,7 +287,6 @@ - My Refused Leave Requests @@ -302,8 +298,6 @@ - - My Department's Leave Requests @@ -328,8 +322,6 @@ - - @@ -342,7 +334,6 @@ - diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 25b4a13c541..49ba1d602ad 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -83,7 +83,6 @@ - @@ -110,7 +109,6 @@ - hr.timesheet.employee.extd_form diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index c2e4877a7bd..c363a4172e5 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -108,18 +108,14 @@ - - Uninvoiced Entries account.analytic.line form tree,form [('invoice_id','=',False),('to_invoice','!=',False)] + - - - My Uninvoiced Entries @@ -127,9 +123,8 @@ form tree,form [('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)] + - - Open Analytic Accounts @@ -138,8 +133,6 @@ tree,form [('state','<>','close'),('type','<>','view')] - - Unclosed Invoiceable Accounts @@ -148,9 +141,6 @@ tree,form [('state','<>','close'),('type','<>','view'),('pricelist_id','<>',False)] - - - Draft Analytic Accounts @@ -159,9 +149,6 @@ tree,form [('state','=','draft'),('type','<>','view')] - - - Pending Analytic Accounts @@ -170,11 +157,6 @@ tree,form [('state','=','pending'),('type','<>','view')] - - - - - hr_timesheet_invoice.factor.form diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 7c54db176b1..0bc345324a0 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -224,7 +224,6 @@ - My Department's Timesheets @@ -248,7 +247,6 @@ - My Department's Timesheets to Validate @@ -260,7 +258,6 @@ - @@ -276,7 +273,6 @@ - Timesheets To Validate @@ -288,7 +284,6 @@ - @@ -163,6 +160,7 @@ Free members res.partner [('membership_state', '=', 'free')] + @@ -178,13 +176,6 @@ - - - - - associate members @@ -205,6 +196,7 @@ Associated members res.partner [('associate_member', '!=', False), ('membership_state', '!=', 'none')] + @@ -220,10 +212,6 @@ - - @@ -231,6 +219,7 @@ Invoiced members res.partner [('membership_state', '=', 'invoiced')] + @@ -246,10 +235,6 @@ - - diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index b180dbcb076..b617d11afb2 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -557,11 +557,6 @@ gantt,tree,form,calendar,graph [('state','in',('ready','confirmed','in_production'))] - Production Orders To Start @@ -573,7 +568,7 @@ - + Production Orders in Progress ir.actions.act_window @@ -584,7 +579,7 @@ - + Production Orders Waiting Products ir.actions.act_window @@ -595,7 +590,6 @@ - New Production Order @@ -604,7 +598,6 @@ form form,tree,calendar,graph,gantt - mrp.production.lot.line.form @@ -783,7 +776,6 @@ tree,form [('state','=','confirmed')] - Exceptions Procurements @@ -793,7 +785,6 @@ tree,form [('state','=','exception')] - Exceptions Procurements to Fix @@ -804,7 +795,6 @@ [('state','=','exception'), ('message', '<>', '')] - Temporary Procurement Exceptions @@ -814,7 +804,6 @@ tree,form [('state','=','exception'), ('message', '=', '')] - New Procurement @@ -823,7 +812,6 @@ form form,tree - diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml index 34ff93d3228..a90c3e95a00 100644 --- a/addons/mrp/process/stockable_product_process.xml +++ b/addons/mrp/process/stockable_product_process.xml @@ -39,7 +39,7 @@ - + diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 7341c31c8d5..2176afc0cee 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -176,9 +176,6 @@ - - - diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index cd73b312fd9..6ee19b291d2 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -191,6 +191,7 @@ form tree,form [('state','=','draft')] + @@ -200,6 +201,7 @@ form tree,form [('state','=','under_repair')] + @@ -209,6 +211,7 @@ form tree,form [('state','!=','draft'),('state','!=','under_repair'),('state','!=','2binvoiced'),('state','!=','invoice_except'),('state','!=','done'),('state','!=','cancel'),] + @@ -218,20 +221,10 @@ form tree,form [('state','=','2binvoiced')] + - - - - - - - - - - - diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml index ddd8c7c4bee..8390d25186e 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/pos_view.xml @@ -141,7 +141,7 @@ - + --> - Point of Sale + Orders of the day ir.actions.act_window pos.order form tree,form + [('date_order','>=',time.strftime('%Y-%m-%d')),('date_order','<=',time.strftime('%Y-%m-%d'))] - - - Point of Sale + All orders ir.actions.act_window pos.order form tree,form + - - Sale lines @@ -235,15 +233,15 @@ - Sale line + POS Lines of the day ir.actions.act_window pos.order.line form tree + [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))] - diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 22ecbfb7088..d837af47d97 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -163,7 +163,6 @@ - Templates of Projects @@ -248,11 +247,6 @@ - Projects Structure @@ -564,7 +558,6 @@ - My Current Tasks @@ -577,7 +570,6 @@ - My Tasks in Progress @@ -589,7 +581,6 @@ - My Draft Tasks @@ -601,7 +592,6 @@ - My Department's Pending Tasks @@ -613,7 +603,6 @@ - My Department's Current Tasks @@ -625,7 +614,6 @@ - My Department's Tasks in Progress @@ -636,7 +624,6 @@ - My Department's Draft Tasks @@ -647,7 +634,6 @@ - Overpassed Tasks @@ -675,7 +661,6 @@ [('state','=','open')] - Unassigned Tasks @@ -686,7 +671,6 @@ - diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index d266cb310bd..aacb501d37a 100755 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -17,7 +17,7 @@ --> - + @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -119,7 +119,7 @@ - + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index bcda8944bd0..eabcd08786d 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -151,7 +151,6 @@ - Purchase Order Waiting Approval @@ -163,7 +162,6 @@ - Purchase Orders in Progress @@ -175,7 +173,6 @@ - New Purchase Order @@ -183,7 +180,6 @@ purchase.order form,tree - diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index eb2d9f65ef3..c763cb50a67 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 092163d8cf1..4f31ec0e132 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -258,7 +258,7 @@ form tree,form,calendar,graph [('user_id','=',uid)] - + @@ -268,7 +268,7 @@ sale.order form tree,form,calendar,graph - + @@ -292,7 +292,6 @@ - Sales Order To Be Invoiced @@ -304,7 +303,6 @@ - Sales Order in Progress @@ -315,7 +313,6 @@ [('state','in',('progress','waiting_date','manual'))] - @@ -327,7 +324,6 @@ [('state','=','draft')] - My sales in shipping exception @@ -338,7 +334,6 @@ [('state','in',('shipping_except','invoice_except')),('user_id','=',uid)] - My sales order waiting Invoice @@ -349,7 +344,6 @@ [('state','=','manual'),('user_id','=',uid)] - My sales order in progress @@ -360,7 +354,6 @@ [('state','in',('progress','waiting_date','manual')),('user_id','=',uid)] - My Quotations @@ -371,7 +364,6 @@ [('state','=','draft'),('user_id','=',uid)] - Old Quotations @@ -505,7 +497,6 @@ [('invoiced','<>', 1),('state','<>','draft'),('state','<>','cancel')] - Uninvoiced and Delivered Lines @@ -516,7 +507,6 @@ [('invoiced','<>', 1),('state','=','done')] - diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index c2f0aa34581..08aa9f8fa40 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -314,8 +314,7 @@ - - + sale_journal.sale.stats @@ -324,8 +323,7 @@ tree,form - - + [('state','=','draft')] - Opened Backlogs @@ -136,7 +135,6 @@ [('state','=','open')] - @@ -172,9 +170,7 @@ [('review','=',True)] - - + wiki.wiki.history.tree wiki.wiki.history From 47a820f7a1a5c8797e3ea763f27d69b5bc7de5ac Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Mon, 23 Nov 2009 19:22:38 +0530 Subject: [PATCH 02/14] [ADD]: Added tooltips for all state fields. bzr revid: uco@tinyerp.co.in-20091123135238-oadv1oyefpsi9631 --- addons/account/account.py | 14 +++++++++----- addons/account/account_bank_statement.py | 3 ++- addons/account/account_move_line.py | 3 ++- .../account/process/customer_invoice_process.xml | 2 +- addons/account/project/project.py | 4 +++- addons/account_payment/payment.py | 3 ++- addons/auction/auction.py | 13 +++++++------ addons/base_report_creator/base_report_creator.py | 2 +- addons/crm/crm.py | 4 +++- addons/crm/crm_segmentation.py | 2 +- addons/event/event.py | 4 +++- addons/hr_expense/hr_expense.py | 3 ++- addons/hr_holidays/hr.py | 3 ++- .../hr_timesheet_invoice_view.xml | 2 +- addons/idea/idea.py | 4 +++- addons/mrp/mrp.py | 10 +++++++--- addons/mrp_operations/mrp_operations.py | 2 +- addons/mrp_repair/mrp_repair.py | 2 +- addons/product/product.py | 2 +- addons/project/project.py | 8 ++++++-- addons/purchase/purchase.py | 2 +- addons/purchase_manual/purchase_manual.py | 2 +- addons/sale/sale.py | 2 +- addons/scrum/scrum.py | 4 ++-- addons/stock/stock.py | 10 +++++++--- addons/subscription/subscription.py | 2 +- 26 files changed, 71 insertions(+), 41 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 1c45b6cd415..f9ec8763fc5 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -524,7 +524,8 @@ class account_fiscalyear(osv.osv): 'date_start': fields.date('Start Date', required=True), 'date_stop': fields.date('End Date', required=True), 'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'), - 'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True), + 'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True, + help='When fiscal year is created. The state is \'Draft\'. At the end of the year it is in \'Done\' state.'), } _defaults = { @@ -587,7 +588,8 @@ class account_period(osv.osv): 'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}), 'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}), 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True), - 'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True) + 'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True, + help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), } _defaults = { 'state': lambda *a: 'draft', @@ -669,7 +671,8 @@ class account_journal_period(osv.osv): 'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"), 'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32), 'active': fields.boolean('Active', required=True), - 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True), + 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True, + help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'), 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'), } @@ -754,7 +757,8 @@ class account_move(osv.osv): 'ref': fields.char('Ref', size=64), 'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}), - 'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'Status', required=True, readonly=True), + 'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', required=True, readonly=True, + help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Valid\' state.'), 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Be Verified'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"), @@ -1604,7 +1608,7 @@ class account_subscription(osv.osv): 'period_total': fields.integer('Number of Periods', required=True), 'period_nbr': fields.integer('Period', required=True), 'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True), - 'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True), + 'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True), 'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines') } diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 2d6c725fcc0..a0af45ad069 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -126,7 +126,8 @@ class account_bank_statement(osv.osv): 'Entry lines', states={'confirm':[('readonly',True)]}), 'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')], 'State', required=True, - states={'confirm': [('readonly', True)]}, readonly="1"), + states={'confirm': [('readonly', True)]}, readonly="1", + help='When new statement is created the state will be \'Draft\'. And after getting confirmation from the bank it will be in \'Confirmed\' state.'), 'currency': fields.function(_currency, method=True, string='Currency', type='many2one', relation='res.currency'), } diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 1d0cdb95008..3664dd58cea 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -377,7 +377,8 @@ class account_move_line(osv.osv): 'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'), 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6), 'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'), - 'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True), + 'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True, + help='When new move line is created the state will be \'Draft\'. When all the payments are done it will be in \'Valid\' state.'), 'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."), 'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\ this field will contain the basic amount(without tax)."), diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index 31d79a29971..29506429486 100755 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -28,7 +28,7 @@ - + diff --git a/addons/account/project/project.py b/addons/account/project/project.py index f86a246f3d8..474e8dc5e8b 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -189,7 +189,9 @@ class account_analytic_account(osv.osv): 'date': fields.date('Date End'), 'company_id': fields.many2one('res.company', 'Company', required=True), 'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'), - 'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True), + 'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True, + help='When an account is created its in \'Draft\' state. If any associated partner is there, it can be in \'Open\' state.\ + If any pending balance is there it can be in \'Pending\'. And finally when all the transactions are over, it can be in \'Close\' state.'), } def _default_company(self, cr, uid, context={}): diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py index 1b3392564bf..27a42de5a31 100644 --- a/addons/account_payment/payment.py +++ b/addons/account_payment/payment.py @@ -100,7 +100,8 @@ class payment_order(osv.osv): ('draft', 'Draft'), ('open','Confirmed'), ('cancel','Cancelled'), - ('done','Done')], 'State', select=True), + ('done','Done')], 'State', select=True, + help='When an order is placed the state is \'Draft\'. Once the bank is confirmed the state is set to \'Confirmed\'. Then the order is paid the state is \'Done\'.'), 'line_ids': fields.one2many('payment.line','order_id','Payment lines',states={'done':[('readonly',True)]}), 'total': fields.function(_total, string="Total", method=True, type='float'), diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 0c275578180..b09b1e9288f 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -75,7 +75,8 @@ class auction_dates(osv.osv): 'acc_income': fields.many2one('account.account', 'Income Account', required=True), 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True), - 'state': fields.selection((('draft','Draft'),('closed','Closed')),'Status',select=1, readonly=True), + 'state': fields.selection((('draft','Draft'),('closed','Closed')),'State',select=1, readonly=True, + help='When auction starts the state is \'Draft\'. At the end of auction, the state becomes \'Closed\'.'), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), } @@ -442,7 +443,7 @@ class auction_lots(osv.osv): # 'paid_vnd':fields.function(_is_paid_vnd,string='Seller Paid',method=True,type='boolean',store=True), 'paid_vnd':fields.boolean('Seller Paid'), 'paid_ach':fields.function(_is_paid_ach,string='Buyer invoice reconciled',method=True, type='boolean',store=True), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'Status', required=True, readonly=True), + 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'State', required=True, readonly=True), 'buyer_price': fields.function(_buyerprice, method=True, string='Buyer price',store=True), 'seller_price': fields.function(_sellerprice, method=True, string='Seller price',store=True), 'gross_revenue':fields.function(_grossprice, method=True, string='Gross revenue',store=True), @@ -989,7 +990,7 @@ class report_seller_auction(osv.osv): 'avg_price':fields.float('Avg adjudication',readonly=True), 'avg_estimation':fields.float('Avg estimation',readonly=True), 'date': fields.date('Create Date', required=True, select=1), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'Status',readonly=True, select=1) + 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'State',readonly=True, select=1) } def init(self, cr): @@ -1199,7 +1200,7 @@ class report_auction_adjudication(osv.osv): _auto = False _columns = { 'name': fields.many2one('auction.dates','Auction date',readonly=True,select=1), - 'state': fields.selection((('draft','Draft'),('close','Closed')),'Status', select=1), + 'state': fields.selection((('draft','Draft'),('close','Closed')),'State', select=1), 'adj_total': fields.float('Total Adjudication'), 'date': fields.date('Date', readonly=True,select=1), 'user_id':fields.many2one('res.users', 'User',select=1) @@ -1305,7 +1306,7 @@ class report_object_encoded(osv.osv): _description = "Object encoded" _auto = False _columns = { - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'Status', required=True,select=1), + 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'State', required=True,select=1), 'user_id':fields.many2one('res.users', 'User', select=1), 'estimation': fields.float('Estimation',select=2), 'date': fields.date('Create Date', required=True), @@ -1375,7 +1376,7 @@ class report_unclassified_objects(osv.osv): 'obj_num': fields.integer('Catalog Number'), 'obj_price': fields.float('Adjudication price'), 'lot_num': fields.integer('List Number', required=True, select=1 ), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'Status', required=True, readonly=True), + 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'State', required=True, readonly=True), 'obj_comm': fields.boolean('Commission'), 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True), 'ach_login': fields.char('Buyer Username',size=64), diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py index 1e65daedea0..326f09cfe90 100644 --- a/addons/base_report_creator/base_report_creator.py +++ b/addons/base_report_creator/base_report_creator.py @@ -314,7 +314,7 @@ class report_creator(osv.osv): 'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id','model_id', 'Reported Objects'), 'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'), 'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'), - 'state': fields.selection([('draft','Draft'),('valid','Valid')], 'Status', required=True), + 'state': fields.selection([('draft','Draft'),('valid','Valid')], 'State', required=True), 'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True), 'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel','report_id','group_id','Authorized Groups'), } diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 603b17a1aa6..7236930ac44 100755 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -511,7 +511,9 @@ class crm_case(osv.osv): 'user_id': fields.many2one('res.users', 'Responsible'), 'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1), 'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1), - 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, + help='The state is set to \'Draft\', when a case is created. If the case is in progress the state is set to \'Open\'.\ + When the case is over, the state is set to \'Done\'. If the case needs to be reviewed then the state is set to \'Pending\'.'), 'ref' : fields.reference('Reference', selection=_links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=_links_get, size=128), diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py index ef181f70221..5457cd8a6dd 100644 --- a/addons/crm/crm_segmentation.py +++ b/addons/crm/crm_segmentation.py @@ -36,7 +36,7 @@ class crm_segmentation(osv.osv): 'description': fields.text('Description'), 'categ_id': fields.many2one('res.partner.category', 'Partner Category', required=True, help='The partner category that will be added to partners that match the segmentation criterions after computation.'), 'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn\'t match segmentation criterions'), - 'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution Status', readonly=True), + 'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution State', readonly=True), 'partner_id': fields.integer('Max Partner ID processed'), 'segmentation_line': fields.one2many('crm.segmentation.line', 'segmentation_id', 'Criteria', required=True), 'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."), diff --git a/addons/event/event.py b/addons/event/event.py index e3595987c7d..e2e19212393 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -130,7 +130,9 @@ class event(osv.osv): 'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'), 'date_begin': fields.datetime('Beginning date', required=True), 'date_end': fields.datetime('Ending date', required=True), - 'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'Status', readonly=True, required=True), + 'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'State', readonly=True, required=True, + help='If event is created, the state is \'Draft\'. If event is confirmed for the particular dates the state is set to \'Confirmed\'.\ + If the event is over, the state is set to \'Done\'. If event is cancelled the state is set to \'Cancelled\'.'), 'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'), 'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), 'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'), diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index dd9c4e44aba..a9f4c5fbd70 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -77,7 +77,8 @@ class hr_expense_expense(osv.osv): ('invoiced', 'Invoiced'), ('paid', 'Reimbursed'), ('cancelled', 'Cancelled')], - 'State', readonly=True), + 'State', readonly=True, help='When the expense request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\ + If the admin accepts it, the state is \'Accepted\'. If an invoice is made for the expense request, the state is \'Invoiced\'. If the expense is paid to user, the state is \'Reimbursed\'.'), } _defaults = { 'date' : lambda *a: time.strftime('%Y-%m-%d'), diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py index 0d638d67a08..68fc6b7ccbb 100644 --- a/addons/hr_holidays/hr.py +++ b/addons/hr_holidays/hr.py @@ -96,7 +96,8 @@ class hr_holidays(osv.osv): _columns = { 'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}), - 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'Status', readonly=True), + 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\ + If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'), 'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}), 'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True), 'date_to' : fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}), diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index c363a4172e5..4ff5ac27c95 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -15,7 +15,7 @@ - + diff --git a/addons/idea/idea.py b/addons/idea/idea.py index ad5b29e42e1..45275aa78c3 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -119,7 +119,9 @@ class idea_idea(osv.osv): 'count_votes' : fields.function(_vote_count, method=True, string="Count of votes", type="integer"), 'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"), 'category_id': fields.many2one('idea.category', 'Category', required=True ), - 'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'Status', readonly=True), + 'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True, + help='When the Idea is created the state is \'Draft\'. It is opened by the user, the state is \'Opened\'.\ + If the idea is accepted, the state is \'Accepted\'.'), 'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True), } diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 5ba9d487400..65eed59ec10 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -435,8 +435,10 @@ class mrp_production(osv.osv): 'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'), 'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'), - 'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True), - 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'), + 'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True, + help='When the production order is created the state is set to \'Draft\'. If the order is confirmed the state is set to \'Waiting Goods\'. If any exceptions are there, the state is set to \'Packing Exception\'.\ + If the stock is available then the state is set to \'Ready to Produce\'. When the production get started then the state is set to \'In Production\'. When the production is over, the state is set to \'Done\'.'), + 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'), 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'), 'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'), @@ -820,7 +822,9 @@ class mrp_procurement(osv.osv): ('cancel','Cancel'), ('ready','Ready'), ('done','Done'), - ('waiting','Waiting')], 'Status', required=True), + ('waiting','Waiting')], 'State', required=True, + help='When a procurement is created the state is set to \'Draft\'. If the procurement is confirmed, the state is set to \'Confirmed\'.\ + After confirming the state is set to \'Running\'. If any exception arises in the order then the state is set to \'Exception\'. Once the exception is removed the state becomes \'Ready\'. It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'), 'note' : fields.text('Note'), } _defaults = { diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 155ca928077..e446f4a5014 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -68,7 +68,7 @@ class mrp_production_workcenter_line(osv.osv): return res _inherit = 'mrp.production.workcenter.line' _columns = { - 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True), + 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'State', readonly=True), 'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'), 'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'), 'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'), diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 48986c3918e..93f671baeaa 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -503,7 +503,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): 'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True), 'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True), 'move_id': fields.many2one('stock.move', 'Inventory Move', readonly=True), - 'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', required=True, readonly=True), + 'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'State', required=True, readonly=True), } _defaults = { 'state': lambda *a: 'draft', diff --git a/addons/product/product.py b/addons/product/product.py index 509bd61c373..7a497fbe344 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -262,7 +262,7 @@ class product_template(osv.osv): 'warranty': fields.float('Warranty (months)'), 'sale_ok': fields.boolean('Can be sold', help="Determine if the product can be visible in the list of product within a selection from a sale order line."), 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."), - 'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."), + 'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."), 'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."), 'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True, help="Default Unit of Measure used for purchase orders. It must in the same category than the default unit of measure."), 'uos_id' : fields.many2one('product.uom', 'Unit of Sale', diff --git a/addons/project/project.py b/addons/project/project.py index 96e86b4153c..694c308551c 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -115,7 +115,9 @@ class project(osv.osv): 'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."), 'notes': fields.text('Notes', help="Internal description of the project."), 'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"), - 'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True), + 'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True, + help='The project can be in either if the states \'Template\' and \'Running\'. If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\ + If it is to be reviewed then the state is \'Pending\'. When the project is completed the state is set to \'Done\'.'), } _defaults = { @@ -278,7 +280,9 @@ class task(osv.osv): 'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'), 'sequence': fields.integer('Sequence'), 'type': fields.many2one('project.task.type', 'Type'), - 'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True), + 'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, + help='If the task is created the state \'Draft\'. If the task is started, the state becomes \'In Progress\'. If review is needed the task is in \'Pending\' state.\ + If the task is over, the states is set to \'Done\'.'), 'date_start': fields.datetime('Starting Date'), 'date_deadline': fields.datetime('Deadline'), 'date_close': fields.datetime('Date Closed', readonly=True), diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 05128504ed5..9b100e9998d 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -163,7 +163,7 @@ class purchase_order(osv.osv): 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."), - 'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True), + 'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True), 'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}), 'validator' : fields.many2one('res.users', 'Validated by', readonly=True), 'notes': fields.text('Notes'), diff --git a/addons/purchase_manual/purchase_manual.py b/addons/purchase_manual/purchase_manual.py index 2f5cf2cb44d..d9ce523f078 100644 --- a/addons/purchase_manual/purchase_manual.py +++ b/addons/purchase_manual/purchase_manual.py @@ -26,7 +26,7 @@ import netsvc class purchase_order_line(osv.osv): _inherit='purchase.order.line' _columns = { - 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True), + 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True), 'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True), 'invoiced': fields.boolean('Invoiced', readonly=True), 'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"), diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 794935855a2..676a406d9de 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -763,7 +763,7 @@ class sale_order_line(osv.osv): 'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'), 'notes': fields.text('Notes'), 'th_weight': fields.float('Weight'), - 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'Status', required=True, readonly=True), + 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'State', required=True, readonly=True), 'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'), 'salesman_id':fields.related('order_id','user_id',type='many2one',relation='res.users',string='Salesman'), } diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py index a0bacc41f11..387c1ce0f00 100644 --- a/addons/scrum/scrum.py +++ b/addons/scrum/scrum.py @@ -98,7 +98,7 @@ class scrum_sprint(osv.osv): 'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'), 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'), 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'), - 'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True), + 'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True), } _defaults = { 'state': lambda *a: 'draft', @@ -166,7 +166,7 @@ class scrum_product_backlog(osv.osv): 'sequence' : fields.integer('Sequence'), 'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'), 'tasks_id': fields.one2many('scrum.task', 'product_backlog_id', 'Tasks Details'), - 'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True), + 'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True), 'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'), 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'), 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours') diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 0128fb0a2ed..7585ebc6466 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -453,7 +453,9 @@ class stock_picking(osv.osv): ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled'), - ], 'Status', readonly=True, select=True), + ], 'State', readonly=True, select=True, + help=' The \'Draft\' state is used when a user is encoding a new and unconfirmed picking. The \'Confirmed\' state is used for stock movement to do with unavailable products. The \'Available\' state is set automatically when the \ + products are ready to be moved. The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'), 'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date", method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"), 'date': fields.datetime('Date Order', help="Date of Order"), @@ -979,7 +981,9 @@ class stock_move(osv.osv): 'note': fields.text('Notes'), - 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True), + 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True, + help='When the stock move is created it is in the \'Draft\' state. After that it is set to \'Confirmed\' state. If stock is available state is set to \'Avaiable\'. When the packing it done the state is \'Done\'.\ + The state is \'Waiting\' if the move is waiting for another one.'), 'price_unit': fields.float('Unit Price', digits=(16, int(config['price_accuracy']))), } @@ -1340,7 +1344,7 @@ class stock_inventory(osv.osv): 'date_done': fields.datetime('Date done'), 'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}), 'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'), - 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'Status', readonly=True), + 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True), } _defaults = { 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py index 412b317d388..49ad477759a 100644 --- a/addons/subscription/subscription.py +++ b/addons/subscription/subscription.py @@ -70,7 +70,7 @@ class subscription_subscription(osv.osv): 'interval_type': fields.selection([('days', 'Days'), ('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'), 'exec_init': fields.integer('Number of documents'), 'date_init': fields.datetime('First Date'), - 'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status'), + 'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'), 'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128), 'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True), 'cron_id': fields.many2one('ir.cron', 'Cron Job') From 56c69a3fcaf2009f80c8ddf8cef925b9bcd5d1af Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Tue, 24 Nov 2009 16:03:41 +0530 Subject: [PATCH 03/14] [Merge]:Merged remaining changes bzr revid: uco@tinyerp.co.in-20091124103341-u11umpaatol01yqp --- addons/crm/crm_view.xml | 2 +- addons/delivery/delivery_view.xml | 2 +- addons/hr_holidays/hr_view.xml | 4 +- .../hr_timesheet_sheet_view.xml | 4 +- addons/project/project_view.xml | 6 +-- addons/report_sale/report_sale.py | 47 ++++++++++++------- addons/report_sale/report_sale_view.xml | 2 + addons/sale/sale_view.xml | 4 +- addons/scrum/scrum_view.xml | 16 +++---- addons/stock/stock_view.xml | 2 +- 10 files changed, 51 insertions(+), 38 deletions(-) diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index f9f1614ce69..c5f8ca448fb 100755 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -490,7 +490,7 @@ [('user_id','=',uid)] - + My Open Cases crm.case diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 2c83fef3ec6..ca28ec3415a 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -180,7 +180,7 @@ {'contact_display': 'partner'} - + diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml index 911b6c4a54a..a7c46b0e33e 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_view.xml @@ -253,7 +253,7 @@ - + My Draft Leave Request @@ -309,7 +309,7 @@ - + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 0bc345324a0..9f78c6ce236 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -212,7 +212,7 @@ - + My timesheets to confirm @@ -235,7 +235,7 @@ - + My Department's Timesheets to Confirm diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d837af47d97..a093032e9d2 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -235,7 +235,7 @@ - @@ -534,7 +534,7 @@ - + My Department Tasks @@ -546,7 +546,7 @@ - + My Pending Tasks diff --git a/addons/report_sale/report_sale.py b/addons/report_sale/report_sale.py index 8c4705644ac..424b0c7042b 100644 --- a/addons/report_sale/report_sale.py +++ b/addons/report_sale/report_sale.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,18 +15,20 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## +import tools from osv import fields,osv + class report_sale_order_product(osv.osv): _name = "report.sale.order.product" _description = "Sales Orders by Products" _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 +44,18 @@ class report_sale_order_product(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 = 'name desc,price_total desc' def init(self, cr): + tools.drop_view_if_exists(cr, 'report_sale_order_product') cr.execute(""" create or replace view report_sale_order_product 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, l.product_id, sum(l.product_uom_qty*u.factor) as quantity, @@ -60,7 +66,7 @@ class report_sale_order_product(osv.osv): right join sale_order_line l on (s.id=l.order_id) left join product_uom u on (u.id=l.product_uom) where l.product_uom_qty != 0 - group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state + group by l.product_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state ) """) report_sale_order_product() @@ -70,7 +76,7 @@ class report_sale_order_category(osv.osv): _description = "Sales Orders by Categories" _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'), @@ -86,14 +92,19 @@ class report_sale_order_category(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 = 'name desc,price_total desc' def init(self, cr): + tools.drop_view_if_exists(cr, 'report_sale_order_category') cr.execute(""" create or replace view report_sale_order_category 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, t.categ_id as category_id, sum(l.product_uom_qty*u.factor) as quantity, @@ -105,8 +116,8 @@ class report_sale_order_category(osv.osv): left join product_product p on (p.id=l.product_id) left join product_template t on (t.id=p.product_tmpl_id) left join product_uom u on (u.id=l.product_uom) - where l.product_uom_qty != 0 - group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state + where l.product_uom_qty != 0 + group by t.categ_id,to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state ) """) report_sale_order_category() @@ -119,13 +130,13 @@ class report_turnover_per_month(osv.osv): 'name': fields.date('Month', readonly=True), 'turnover': fields.float('Total Turnover', readonly=True), } - + def init(self, cr): cr.execute(""" create or replace view report_turnover_per_month as ( select min(am.id) as id, sum(credit) as turnover,to_char(am.date, 'YYYY-MM-01') as name from account_move_line am - where am.account_id in (select distinct(account_id) from account_invoice_line) - and + where am.account_id in (select distinct(account_id) from account_invoice_line) + and am.move_id in(select distinct(aw.move_id) from account_invoice aw,account_invoice_line l where l.invoice_id=aw.id) group by to_char(am.date, 'YYYY-MM-01') ) @@ -137,17 +148,17 @@ class report_turnover_per_product(osv.osv): _description = "Turnover Per Product" _auto = False _rec_name = 'product_id' - + _columns = { 'product_id': fields.many2one('product.product','Product', readonly=True), 'turnover': fields.float('Total Turnover', readonly=True), } - + def init(self, cr): cr.execute(""" create or replace view report_turnover_per_product as ( - select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id - from account_move_line am + select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id + from account_move_line am group by am.product_id ) """) @@ -176,12 +187,12 @@ class report_sale_order_created(osv.osv): 'create_date' : fields.datetime('Create Date', readolnly=True) } _order = 'create_date' - + def init(self, cr): cr.execute("""create or replace view report_sale_order_created as ( select sale.id as id, sale.date_order as date_order, sale.name as name, - sale.partner_id as partner_id, + sale.partner_id as partner_id, sale.partner_shipping_id as partner_shipping_id, sale.amount_untaxed as amount_untaxed, sale.state as state, sale.create_date as create_date diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml index 4194f374d15..c7a09a1804b 100644 --- a/addons/report_sale/report_sale_view.xml +++ b/addons/report_sale/report_sale_view.xml @@ -9,6 +9,7 @@
+ @@ -73,6 +74,7 @@ + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 4f31ec0e132..3cf275e9e70 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -260,7 +260,7 @@ [('user_id','=',uid)] - + All Sales Order @@ -270,7 +270,7 @@ tree,form,calendar,graph - + New Quotation diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml index 4d9ebd7006b..81047222aa9 100644 --- a/addons/scrum/scrum_view.xml +++ b/addons/scrum/scrum_view.xml @@ -216,7 +216,7 @@ [('state','=','open')] - + Draft Sprints scrum.sprint @@ -224,7 +224,7 @@ [('state','=','draft')] - + Sprints Done scrum.sprint @@ -232,7 +232,7 @@ [('state','=','done')] - + My Sprints (Product Owner) @@ -241,7 +241,7 @@ [('product_owner_id','=',uid)] - + My Sprints (Scrum Master) scrum.sprint @@ -249,7 +249,7 @@ [('scrum_master_id','=',uid)] - + My opened sprints (Product Owner) @@ -258,7 +258,7 @@ [('product_owner_id','=',uid),('state','=','open')] - + My opened sprints (Scrum Master) scrum.sprint @@ -266,7 +266,7 @@ [('scrum_master_id','=',uid),('state','=','open')] - + + hr.expense.line.tree tree @@ -34,6 +36,8 @@ + + hr.expense.form form @@ -93,6 +97,7 @@ + hr.expense.expense.filter hr.expense.expense @@ -120,59 +125,18 @@ form - - - - Draft expenses - hr.expense.expense - form - tree,form - [('state','=','draft')] - - - - - - Expenses waiting validation - hr.expense.expense - form - tree,form - [('state','=','confirm')] - - - - - - Expenses waiting invoice - hr.expense.expense - form - tree,form - [('state','=','accepted')] - - - - - - Expenses waiting payment - hr.expense.expense - form - tree,form - [('state','=','invoiced')] - - - - + + + + + My expenses menu + --> + + My Expenses hr.expense.expense @@ -182,38 +146,11 @@ - - - - New Expenses Sheet - hr.expense.expense - form - form,tree - [('user_id','=',uid)] - - - - - - My Draft expenses - hr.expense.expense - form - tree,form - [('user_id','=',uid),('state','=','draft')] - - - - - - My expenses waiting validation - hr.expense.expense - form - tree,form - [('user_id','=',uid),('state','=','confirm')] - - - - + + + product.product.expense.form From 99b22867b623fffe954e1cdffb61f3730cbdc473 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 25 Nov 2009 14:57:52 +0530 Subject: [PATCH 09/14] [IMP]: * account: improved state name to proforma2 in filter * Removed extra menu in account_analytic_analysis bzr revid: rpa@tinyerp.com-20091125092752-orrdoqdh7q8sriyr --- addons/account/account_invoice_view.xml | 2 +- .../account_analytic_analysis_menu.xml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 08fa76ce4f6..3633e05f8a6 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -327,7 +327,7 @@ - + diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index d84f411a9d4..3a68fa513d0 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -54,15 +54,6 @@ - - New Analytic Account - account.analytic.account - - form - form,tree,graph - - - All Analytic Accounts account.analytic.account From 0ea7f73f70cc70c0594faa55c8ff01a4f5055eea Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 25 Nov 2009 15:18:14 +0530 Subject: [PATCH 10/14] [IMP]: Remaining changes in merge bzr revid: rpa@tinyerp.com-20091125094814-grz0uqpz9dp5qq0a --- addons/account/account.py | 1 + addons/project/project.py | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/account/account.py b/addons/account/account.py index 7954e678574..7c9405c2d70 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -593,6 +593,7 @@ class account_period(osv.osv): 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True), 'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True, help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), + 'company_id': fields.many2one('res.company', 'Company', required=True) } _defaults = { 'state': lambda *a: 'draft', diff --git a/addons/project/project.py b/addons/project/project.py index def0bf75b92..b0eb8a67a02 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -118,6 +118,7 @@ class project(osv.osv): 'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True, help='The project can be in either if the states \'Template\' and \'Running\'. If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\ If it is to be reviewed then the state is \'Pending\'. When the project is completed the state is set to \'Done\'.'), + 'company_id': fields.many2one('res.company', 'Company'), } _defaults = { From b095e64e847746ca2030e94b1dd96f4bc4e7881b Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 25 Nov 2009 15:28:41 +0530 Subject: [PATCH 11/14] [FIX]: Fixed problem of action reference of menu in point of sale bzr revid: rpa@tinyerp.com-20091125095841-1j98q0mi41typ8bf --- addons/point_of_sale/pos_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml index 8390d25186e..22cd23cffff 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/pos_view.xml @@ -141,7 +141,7 @@ - + [('date_order','>=',time.strftime('%Y-%m-%d')),('date_order','<=',time.strftime('%Y-%m-%d'))] + All orders From 9a47388fd63e2f1194316991627e5cb70c295253 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Wed, 25 Nov 2009 15:33:47 +0530 Subject: [PATCH 12/14] [REF]: Improved state field tooltips bzr revid: uco@tinyerp.co.in-20091125100347-xt927v8iyl0bu2ua --- addons/account/account_bank_statement.py | 3 ++- addons/account/account_move_line.py | 2 +- addons/account/project/project.py | 6 ++++-- addons/account_payment/payment.py | 2 +- addons/auction/auction.py | 2 +- addons/crm/crm.py | 4 ++-- addons/event/event.py | 4 ++-- addons/hr_expense/hr_expense.py | 4 ++-- addons/hr_holidays/hr.py | 2 +- addons/idea/idea.py | 4 ++-- addons/mrp/mrp.py | 8 ++++---- addons/project/project.py | 8 ++++---- addons/stock/stock.py | 4 ++-- 13 files changed, 28 insertions(+), 25 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index a0af45ad069..0b9b8868ca2 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -127,7 +127,8 @@ class account_bank_statement(osv.osv): 'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1", - help='When new statement is created the state will be \'Draft\'. And after getting confirmation from the bank it will be in \'Confirmed\' state.'), + help='When new statement is created the state will be \'Draft\'. \ + \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'), 'currency': fields.function(_currency, method=True, string='Currency', type='many2one', relation='res.currency'), } diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 130bb51692b..02882fad1e7 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -378,7 +378,7 @@ class account_move_line(osv.osv): 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6), 'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'), 'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True, - help='When new move line is created the state will be \'Draft\'. When all the payments are done it will be in \'Valid\' state.'), + help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'), 'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."), 'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\ this field will contain the basic amount(without tax)."), diff --git a/addons/account/project/project.py b/addons/account/project/project.py index fcdfd94b4e0..f446b6fdf29 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -190,8 +190,10 @@ class account_analytic_account(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=True), 'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'), 'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True, - help='When an account is created its in \'Draft\' state. If any associated partner is there, it can be in \'Open\' state.\ - If any pending balance is there it can be in \'Pending\'. And finally when all the transactions are over, it can be in \'Close\' state.'), + help='* When an account is created its in \'Draft\' state.\ + \n* If any associated partner is there, it can be in \'Open\' state.\ + \n* If any pending balance is there it can be in \'Pending\'. \ + \n* And finally when all the transactions are over, it can be in \'Close\' state.'), } def _default_company(self, cr, uid, context={}): diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py index 27a42de5a31..8d46db771f4 100644 --- a/addons/account_payment/payment.py +++ b/addons/account_payment/payment.py @@ -101,7 +101,7 @@ class payment_order(osv.osv): ('open','Confirmed'), ('cancel','Cancelled'), ('done','Done')], 'State', select=True, - help='When an order is placed the state is \'Draft\'. Once the bank is confirmed the state is set to \'Confirmed\'. Then the order is paid the state is \'Done\'.'), + help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'), 'line_ids': fields.one2many('payment.line','order_id','Payment lines',states={'done':[('readonly',True)]}), 'total': fields.function(_total, string="Total", method=True, type='float'), diff --git a/addons/auction/auction.py b/addons/auction/auction.py index b09b1e9288f..29ce8b30421 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -76,7 +76,7 @@ class auction_dates(osv.osv): 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True), 'state': fields.selection((('draft','Draft'),('closed','Closed')),'State',select=1, readonly=True, - help='When auction starts the state is \'Draft\'. At the end of auction, the state becomes \'Closed\'.'), + help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), } diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 8db567ea985..e893e601d66 100755 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -512,8 +512,8 @@ class crm_case(osv.osv): 'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1), 'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, - help='The state is set to \'Draft\', when a case is created. If the case is in progress the state is set to \'Open\'.\ - When the case is over, the state is set to \'Done\'. If the case needs to be reviewed then the state is set to \'Pending\'.'), + help='The state is set to \'Draft\', when a case is created.\n If the case is in progress the state is set to \'Open\'.\ + \n When the case is over, the state is set to \'Done\'.\n If the case needs to be reviewed then the state is set to \'Pending\'.'), 'ref' : fields.reference('Reference', selection=_links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=_links_get, size=128), diff --git a/addons/event/event.py b/addons/event/event.py index e2e19212393..d330a0cbec4 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -131,8 +131,8 @@ class event(osv.osv): 'date_begin': fields.datetime('Beginning date', required=True), 'date_end': fields.datetime('Ending date', required=True), 'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'State', readonly=True, required=True, - help='If event is created, the state is \'Draft\'. If event is confirmed for the particular dates the state is set to \'Confirmed\'.\ - If the event is over, the state is set to \'Done\'. If event is cancelled the state is set to \'Cancelled\'.'), + help='If event is created, the state is \'Draft\'.\n If event is confirmed for the particular dates the state is set to \'Confirmed\'.\ + \nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'), 'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'), 'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), 'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'), diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index a9f4c5fbd70..0658300bf14 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -77,8 +77,8 @@ class hr_expense_expense(osv.osv): ('invoiced', 'Invoiced'), ('paid', 'Reimbursed'), ('cancelled', 'Cancelled')], - 'State', readonly=True, help='When the expense request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\ - If the admin accepts it, the state is \'Accepted\'. If an invoice is made for the expense request, the state is \'Invoiced\'. If the expense is paid to user, the state is \'Reimbursed\'.'), + 'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\ + \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'), } _defaults = { 'date' : lambda *a: time.strftime('%Y-%m-%d'), diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py index 68fc6b7ccbb..7abc9f5ffb6 100644 --- a/addons/hr_holidays/hr.py +++ b/addons/hr_holidays/hr.py @@ -96,7 +96,7 @@ class hr_holidays(osv.osv): _columns = { 'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}), - 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\ + 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\ If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'), 'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}), 'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True), diff --git a/addons/idea/idea.py b/addons/idea/idea.py index 45275aa78c3..2462ee615ff 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -120,8 +120,8 @@ class idea_idea(osv.osv): 'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"), 'category_id': fields.many2one('idea.category', 'Category', required=True ), 'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True, - help='When the Idea is created the state is \'Draft\'. It is opened by the user, the state is \'Opened\'.\ - If the idea is accepted, the state is \'Accepted\'.'), + help='When the Idea is created the state is \'Draft\'.\n It is opened by the user, the state is \'Opened\'.\ + \nIf the idea is accepted, the state is \'Accepted\'.'), 'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True), } diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 65eed59ec10..c3c70ccd61e 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -436,8 +436,8 @@ class mrp_production(osv.osv): 'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'), 'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True, - help='When the production order is created the state is set to \'Draft\'. If the order is confirmed the state is set to \'Waiting Goods\'. If any exceptions are there, the state is set to \'Packing Exception\'.\ - If the stock is available then the state is set to \'Ready to Produce\'. When the production get started then the state is set to \'In Production\'. When the production is over, the state is set to \'Done\'.'), + help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\ + \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'), 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'), 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'), @@ -823,8 +823,8 @@ class mrp_procurement(osv.osv): ('ready','Ready'), ('done','Done'), ('waiting','Waiting')], 'State', required=True, - help='When a procurement is created the state is set to \'Draft\'. If the procurement is confirmed, the state is set to \'Confirmed\'.\ - After confirming the state is set to \'Running\'. If any exception arises in the order then the state is set to \'Exception\'. Once the exception is removed the state becomes \'Ready\'. It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'), + help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\ + \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'), 'note' : fields.text('Note'), } _defaults = { diff --git a/addons/project/project.py b/addons/project/project.py index b0eb8a67a02..edd03ee68e3 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -116,8 +116,8 @@ class project(osv.osv): 'notes': fields.text('Notes', help="Internal description of the project."), 'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"), 'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True, - help='The project can be in either if the states \'Template\' and \'Running\'. If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\ - If it is to be reviewed then the state is \'Pending\'. When the project is completed the state is set to \'Done\'.'), + help='The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\ + \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'), 'company_id': fields.many2one('res.company', 'Company'), } @@ -283,8 +283,8 @@ class task(osv.osv): 'sequence': fields.integer('Sequence'), 'type': fields.many2one('project.task.type', 'Type'), 'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, - help='If the task is created the state \'Draft\'. If the task is started, the state becomes \'In Progress\'. If review is needed the task is in \'Pending\' state.\ - If the task is over, the states is set to \'Done\'.'), + help='If the task is created the state \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\ + \n If the task is over, the states is set to \'Done\'.'), 'date_start': fields.datetime('Starting Date'), 'date_deadline': fields.datetime('Deadline'), 'date_close': fields.datetime('Date Closed', readonly=True), diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 97a2461318b..b76ae30fd70 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -984,8 +984,8 @@ class stock_move(osv.osv): 'note': fields.text('Notes'), 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True, - help='When the stock move is created it is in the \'Draft\' state. After that it is set to \'Confirmed\' state. If stock is available state is set to \'Avaiable\'. When the packing it done the state is \'Done\'.\ - The state is \'Waiting\' if the move is waiting for another one.'), + help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the packing it done the state is \'Done\'.\ + \nThe state is \'Waiting\' if the move is waiting for another one.'), 'price_unit': fields.float('Unit Price', digits=(16, int(config['price_accuracy']))), } From 1941f33e65f6948039392d6f11ed8d2d3a91811e Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 25 Nov 2009 17:10:55 +0530 Subject: [PATCH 13/14] [IMP]: Minor improvement in crm state help and timesheet search view bzr revid: rpa@tinyerp.com-20091125114055-csoknmoc6yyit9ak --- addons/crm/crm.py | 6 ++++-- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index e893e601d66..4b246a0665b 100755 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -512,8 +512,10 @@ class crm_case(osv.osv): 'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1), 'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, - help='The state is set to \'Draft\', when a case is created.\n If the case is in progress the state is set to \'Open\'.\ - \n When the case is over, the state is set to \'Done\'.\n If the case needs to be reviewed then the state is set to \'Pending\'.'), + help='The state is set to \'Draft\', when a case is created.\ + \nIf the case is in progress the state is set to \'Open\'.\ + \nWhen the case is over, the state is set to \'Done\'.\ + \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 'ref' : fields.reference('Reference', selection=_links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=_links_get, size=128), diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 2ea871eaab0..512fce48765 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -175,15 +175,16 @@ search - + + + + - - From 864a09a03188b90f88567a8e2f0ee1b32eecd0d5 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 25 Nov 2009 18:37:25 +0530 Subject: [PATCH 14/14] [IMP]: hr_holidays: Improvements in holidays & Removed extra menus bzr revid: rpa@tinyerp.com-20091125130725-x7q27au4d664z5yu --- addons/hr_holidays/hr_view.xml | 180 +++++++++------------------------ 1 file changed, 46 insertions(+), 134 deletions(-) diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml index c28664b146e..9aa266a1c5b 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_view.xml @@ -2,7 +2,8 @@ - + + Leave Request hr.holidays @@ -20,7 +21,6 @@ - @@ -36,7 +36,8 @@ - + + Allocation Request hr.holidays @@ -49,7 +50,6 @@ - @@ -67,7 +67,8 @@ - + + Company Allocation hr.holidays @@ -81,7 +82,6 @@ - @@ -106,7 +106,7 @@ hr.holidays tree - + @@ -121,52 +121,68 @@ + Leave Request(s) hr.holidays form [('type','=','remove')] + - - + + tree + + + + + + + form + + + + + + Allocation Request(s) hr.holidays form {'type':'add'} [('type','=','add')] - - + + tree + + + + + + + form + + + + + - - hr.holidays - form - form,tree - - {'allocation_type':'company'} - - - - hr.holidays.status.form @@ -201,6 +217,7 @@ form tree,form + - - ir.actions.act_window - hr.holidays - form - tree,form - - - - - - My Leave Requests - ir.actions.act_window - hr.holidays - form - tree,form - [('user_id','=',uid)] - - - - - - - My Draft Leave Request - ir.actions.act_window - hr.holidays - form - tree,form - [('user_id','=',uid), ('state','=','draft')] - - - - - - My Awaiting Confirmation Leave Requests - ir.actions.act_window - hr.holidays - form - tree,form - [('user_id','=',uid), ('state','=','confirm')] - - - - - - My Validated Leave Requests - ir.actions.act_window - hr.holidays - form - tree,form - [('user_id','=',uid), ('state','=','validate')] - - - - - - My Refused Leave Requests - ir.actions.act_window - hr.holidays - form - tree,form - [('user_id','=',uid), ('state','=','refuse')] - - - - - - My Department's Leave Requests - ir.actions.act_window - hr.holidays - form - tree,form - [('user_id', 'child_of', [uid])] - - - - - - - - Leave Requests to Validate - ir.actions.act_window - hr.holidays - form - tree,form - [('user_id', 'child_of', [uid]), ('state','=','confirm')] - - - - - - - Requests Awaiting for Validation - ir.actions.act_window - hr.holidays - form - tree,form - [('state','=','confirm')] - - - -