From d8692a69aa19e5c753968d175ae4ee9c5f358f9f Mon Sep 17 00:00:00 2001 From: "Saurang Suthar (OpenERP)" Date: Fri, 4 May 2012 16:15:06 +0530 Subject: [PATCH 1/9] [IMP]:improved some titles as per requirement bzr revid: ssu@tinyerp.com-20120504104506-2j2btsseva9de1xc --- addons/base_calendar/base_calendar_view.xml | 2 +- addons/crm/crm_lead.py | 4 ++-- addons/crm/crm_lead_view.xml | 2 +- addons/crm/crm_meeting_view.xml | 10 +++++----- addons/hr_recruitment/hr_recruitment_menu.xml | 4 ++-- addons/mrp_subproduct/mrp_subproduct.py | 2 +- addons/product/product.py | 2 +- addons/project/project.py | 2 +- addons/purchase/stock_view.xml | 2 +- addons/stock/stock_view.xml | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index b6d2136fc16..464290b9e46 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -350,7 +350,7 @@ - + diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 29e40c7d5ad..3d3554fd2cc 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -51,7 +51,7 @@ class account_entries_report(osv.osv): 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'product_uom_id': fields.many2one('product.uom', 'Product UOM', readonly=True), - 'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', readonly=True), + 'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', readonly=True), 'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True), 'reconcile_id': fields.many2one('account.move.reconcile', readonly=True), 'partner_id': fields.many2one('res.partner','Partner', readonly=True), diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 6e5f83a83d1..76748f41f1b 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -112,7 +112,7 @@ - + diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py index 9f81f295d74..555d1ee7c25 100644 --- a/addons/account/report/account_report.py +++ b/addons/account/report/account_report.py @@ -175,7 +175,7 @@ class report_invoice_created(osv.osv): ('open','Open'), ('paid','Done'), ('cancel','Cancelled') - ],'State', readonly=True), + ],'Status', readonly=True), 'origin': fields.char('Source Document', size=64, readonly=True, help="Reference of the document that generated this invoice report."), 'create_date': fields.datetime('Create Date', readonly=True) } diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 964383246dd..0c28155b76d 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -43,7 +43,7 @@ - + diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 97aec1d8487..0799a59a423 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -223,7 +223,7 @@ class account_asset_asset(osv.osv): 'parent_id': fields.many2one('account.asset.asset', 'Parent Asset', readonly=True, states={'draft':[('readonly',False)]}), 'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'), 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', required=True, + 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', required=True, help="When an asset is created, the state is 'Draft'.\n" \ "If the asset is confirmed, the state goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \ "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that state."), diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py index a7d9adf00f9..000967a555c 100644 --- a/addons/account_asset/report/account_asset_report.py +++ b/addons/account_asset/report/account_asset_report.py @@ -33,7 +33,7 @@ class asset_asset_report(osv.osv): 'asset_id': fields.many2one('account.asset.asset', string='Asset', readonly=True), 'asset_category_id': fields.many2one('account.asset.category',string='Asset category'), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), - 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', readonly=True), + 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', readonly=True), 'depreciation_value': fields.float('Amount of Depreciation Lines', readonly=True), 'move_check': fields.boolean('Posted', readonly=True), 'nbr': fields.integer('# of Depreciation Lines', readonly=True), diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py index 6fb51bbc4aa..d42e188679a 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement.py +++ b/addons/account_bank_statement_extensions/account_bank_statement.py @@ -113,7 +113,7 @@ class account_bank_statement_line(osv.osv): 'globalisation_amount': fields.related('globalisation_id', 'amount', type='float', relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True), 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')], - 'State', required=True, readonly=True), + 'Status', required=True, readonly=True), 'counterparty_name': fields.char('Counterparty Name', size=35), 'counterparty_bic': fields.char('Counterparty BIC', size=11), 'counterparty_number': fields.char('Counterparty Number', size=34), diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 70d3fbe54cc..4aa12634e09 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -94,7 +94,7 @@ class payment_order(osv.osv): ('draft', 'Draft'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), - ('done', 'Done')], 'State', select=True, + ('done', 'Done')], 'Status', select=True, 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", type='float'), diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 71856dcf703..8375cbef988 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -214,7 +214,7 @@ - + diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 0191f5866ba..597d1bf7308 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -278,7 +278,7 @@ class account_voucher(osv.osv): ('proforma','Pro-forma'), ('posted','Posted'), ('cancel','Cancelled') - ], 'State', readonly=True, size=32, + ], 'Status', readonly=True, size=32, help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \ \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \ \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \ diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index e519d23b09e..3dad80343dc 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -139,7 +139,7 @@ - + diff --git a/addons/account_voucher/report/account_voucher.rml b/addons/account_voucher/report/account_voucher.rml index 3892d281f5b..6b3337aa64f 100644 --- a/addons/account_voucher/report/account_voucher.rml +++ b/addons/account_voucher/report/account_voucher.rml @@ -185,7 +185,7 @@ - State: + Status: PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml index 99935520b81..923e900887a 100644 --- a/addons/account_voucher/report/account_voucher_print.rml +++ b/addons/account_voucher/report/account_voucher_print.rml @@ -159,7 +159,7 @@ - State: + Status: PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index 0433d9572d4..454bcefd5dd 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -93,7 +93,7 @@ - + diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index b422c0dbe73..8db619627d9 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -28,7 +28,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 162605be36c..9880e4533aa 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -27,7 +27,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 6e800247cb5..21915b7189f 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -169,7 +169,7 @@ class account_analytic_account(osv.osv): 'date_start': fields.date('Date Start'), 'date': fields.date('Date End', select=True), 'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts. - 'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'State', required=True, + 'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed')], 'Status', required=True, 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\'. \ diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py index 39fb415e9e1..21c000aadf7 100644 --- a/addons/anonymization/anonymization.py +++ b/addons/anonymization/anonymization.py @@ -48,7 +48,7 @@ class ir_model_fields_anonymization(osv.osv): 'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'), 'field_name': fields.char('Field Name', size=128, required=True), 'field_id': fields.many2one('ir.model.fields', 'Field', ondelete='set null'), - 'state': fields.selection(selection=FIELD_STATES, String='State', required=True, readonly=True), + 'state': fields.selection(selection=FIELD_STATES, String='Status', required=True, readonly=True), } _sql_constraints = [ @@ -209,7 +209,7 @@ class ir_model_fields_anonymization_history(osv.osv): _columns = { 'date': fields.datetime('Date', required=True, readonly=True), 'field_ids': fields.many2many('ir.model.fields.anonymization', 'anonymized_field_to_history_rel', 'field_id', 'history_id', 'Fields', readonly=True), - 'state': fields.selection(selection=ANONYMIZATION_HISTORY_STATE, string='State', required=True, readonly=True), + 'state': fields.selection(selection=ANONYMIZATION_HISTORY_STATE, string='Status', required=True, readonly=True), 'direction': fields.selection(selection=ANONYMIZATION_DIRECTION, string='Direction', required=True, readonly=True), 'msg': fields.text('Message', readonly=True), 'filepath': fields.char(string='File path', size=256, readonly=True), @@ -243,7 +243,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): 'summary': fields.function(_get_summary, type='text', string='Summary'), 'file_export': fields.binary(string='Export'), 'file_import': fields.binary(string='Import'), - 'state': fields.function(_get_state, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False), + 'state': fields.function(_get_state, string='Status', type='selection', selection=ANONYMIZATION_STATES, readonly=False), 'msg': fields.text(string='Message'), } diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 6d8b88f3d06..ed2c5f22f5e 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -96,7 +96,7 @@ 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, string='Total Adjudication', store=True), - 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True, + 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'Status', select=1, readonly=True, 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=False), 'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Buyer Invoice", type='many2many', multi=True), @@ -389,7 +389,7 @@ class auction_lots(osv.osv): ('unsold', 'Unsold'), ('paid', 'Paid'), ('sold', 'Sold'), - ('taken_away', 'Taken away')), 'State', required=True, readonly=True, + ('taken_away', 'Taken away')), 'Status', required=True, readonly=True, help=' * The \'Draft\' state is used when a object is encoding as a new object. \ \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \ \n* The \'Paid\' state is used when user pay for the object \ diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index a807b7c2ce1..3f9ca97e090 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -219,7 +219,7 @@ - + - + - + - + diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 50ebd96a3c2..b208864700b 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -95,7 +95,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."), 'trg_user_id': fields.many2one('res.users', 'Responsible'), 'trg_partner_id': fields.many2one('res.partner', 'Partner'), 'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'), - 'trg_state_from': fields.selection(_state_get, 'State', size=16), + 'trg_state_from': fields.selection(_state_get, 'Status', size=16), 'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), 'act_method': fields.char('Call Object Method', size=64), diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 4dffd8bcbf8..fadd2242c2a 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -337,7 +337,7 @@ class calendar_attendee(osv.osv): ('needs-action', 'Needs Action'), ('accepted', 'Accepted'), ('declined', 'Declined'), - ('delegated', 'Delegated')], 'State', readonly=True, \ + ('delegated', 'Delegated')], 'Status', readonly=True, \ help="Status of the attendee's participation"), 'rsvp': fields.boolean('Required Reply?', help="Indicats whether the favor of a reply is requested"), @@ -767,7 +767,7 @@ class calendar_alarm(osv.osv): ('run', 'Run'), ('stop', 'Stop'), ('done', 'Done'), - ], 'State', select=True, readonly=True), + ], 'Status', select=True, readonly=True), } _defaults = { @@ -1037,7 +1037,7 @@ class calendar_event(osv.osv): 'base_calendar_url': fields.char('Caldav URL', size=264), 'state': fields.selection([('tentative', 'Tentative'), ('confirmed', 'Confirmed'), - ('cancelled', 'Cancelled')], 'State', readonly=True), + ('cancelled', 'Cancelled')], 'Status', readonly=True), 'exdate': fields.text('Exception Date/Times', help="This property \ defines the list of date/time exceptions for a recurring calendar component."), 'exrule': fields.char('Exception Rule', size=352, help="Defines a \ diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 464290b9e46..f83d6e39344 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -139,7 +139,7 @@ - @@ -470,7 +470,7 @@ domain="[]" context="{'group_by':'show_as'}" /> - - + @@ -619,7 +619,7 @@ - + diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index 70f1d7bff1e..a0e4803cde7 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -70,7 +70,7 @@ class crm_meeting(crm_base, osv.osv): 'state': fields.selection([('open', 'Confirmed'), ('draft', 'Unconfirmed'), ('cancel', 'Cancelled'), - ('done', 'Done')], 'State', \ + ('done', 'Done')], 'Status', \ size=16, readonly=True), } _defaults = { diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index e869c2a890a..b60c1905539 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -54,7 +54,7 @@ class crm_phonecall(crm_base, osv.osv): ('cancel', 'Cancelled'), ('done', 'Held'), ('pending', 'Not Held'), - ], 'State', size=16, readonly=True, + ], 'Status', size=16, readonly=True, help='The state is set to \'Todo\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ \nWhen the call is over, the state is set to \'Held\'.\ diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index ab8c7ca7c83..2ee1f2945f4 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -79,7 +79,7 @@ class crm_lead_report(osv.osv): 'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True), 'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True), 'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'email': fields.integer('# Emails', size=128, readonly=True), 'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"), diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index e012d4745e4..456afd884ea 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -161,7 +161,7 @@ - - - diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py index 6075a842182..4cda15c0969 100644 --- a/addons/crm_claim/report/crm_claim_report.py +++ b/addons/crm_claim/report/crm_claim_report.py @@ -51,7 +51,7 @@ class crm_claim_report(osv.osv): 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'month':fields.selection([('01', 'January'), ('02', 'February'), \ ('03', 'March'), ('04', 'April'),\ ('05', 'May'), ('06', 'June'), \ diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index a100747690e..8a241b8acc0 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -139,7 +139,7 @@ - - diff --git a/addons/crm_fundraising/report/crm_fundraising_report.py b/addons/crm_fundraising/report/crm_fundraising_report.py index c0f3ec8c3a6..74f36aebfb1 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report.py +++ b/addons/crm_fundraising/report/crm_fundraising_report.py @@ -42,7 +42,7 @@ class crm_fundraising_report(osv.osv): 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'month':fields.selection([('01', 'January'), ('02', 'February'), \ ('03', 'March'), ('04', 'April'),\ ('05', 'May'), ('06', 'June'), \ diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 4a0323ff4da..2629149d75a 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -135,7 +135,7 @@ domain="[]" context="{'group_by':'section_id'}" /> - diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 7717ae2ce21..d5ee8efc17e 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -72,7 +72,7 @@ class crm_helpdesk(crm.crm_case, osv.osv): domain="['|',('section_id','=',False),('section_id','=',section_id),\ ('object_id.model', '=', 'crm.helpdesk')]"), 'duration': fields.float('Duration', states={'done': [('readonly', True)]}), - 'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, + 'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True, 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\'.\ diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 48681357660..5a3e77926c1 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -249,7 +249,7 @@ - - - - + @@ -465,7 +465,7 @@ - + diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 51702cf28fe..93ebd063051 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -53,7 +53,7 @@ class fetchmail_server(osv.osv): 'state':fields.selection([ ('draft', 'Not Confirmed'), ('done', 'Confirmed'), - ], 'State', select=True, readonly=True), + ], 'Status', select=True, readonly=True), 'server' : fields.char('Server Name', size=256, readonly=True, help="Hostname or IP of the mail server", states={'draft':[('readonly', False)]}), 'port' : fields.integer('Port', readonly=True, states={'draft':[('readonly', False)]}), 'type':fields.selection([ diff --git a/addons/hr/hr.py b/addons/hr/hr.py index bd0c730d92d..978b6495b75 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -110,7 +110,7 @@ class hr_job(osv.osv): 'requirements': fields.text('Requirements'), 'department_id': fields.many2one('hr.department', 'Department'), 'company_id': fields.many2one('res.company', 'Company'), - 'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True), + 'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'Status', readonly=True, required=True), } _defaults = { 'expected_employees': 1, diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index c60eaed818d..a0ab9fbad33 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -415,7 +415,7 @@ - + diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 6e1983d7a11..a86a8815db2 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -165,7 +165,7 @@ class hr_evaluation(osv.osv): ('progress','Waiting Appreciation'), ('done','Done'), ('cancel','Cancelled'), - ], 'State', required=True, readonly=True), + ], 'Status', required=True, readonly=True), 'date_close': fields.date('Ending Date', select=True), 'progress': fields.float("Progress"), } diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index e38a8796895..17344dd90ca 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -183,7 +183,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -314,7 +314,7 @@ - + @@ -362,7 +362,7 @@ - + diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py index bd9e5874d10..a5f4bc71e2f 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report.py +++ b/addons/hr_evaluation/report/hr_evaluation_report.py @@ -56,7 +56,7 @@ class hr_evaluation_report(osv.osv): ('progress','Final Validation'), ('done','Done'), ('cancel','Cancelled'), - ], 'State',readonly=True), + ], 'Status',readonly=True), } _order = 'create_date desc' def init(self, cr): diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index b82c8f6f850..a0ef05fcf69 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -82,7 +82,7 @@ - + diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 6e7db83bbb7..a35027b20d7 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -84,7 +84,7 @@ class hr_expense_expense(osv.osv): ('invoiced', 'Invoiced'), ('paid', 'Reimbursed'), ('cancelled', 'Refused')], - '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\'.\ + 'Status', 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 = { diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index 325a1d850c8..adef11f5269 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -63,7 +63,7 @@ class hr_expense_report(osv.osv): ('invoiced', 'Invoiced'), ('paid', 'Reimbursed'), ('cancelled', 'Cancelled')], - 'State', readonly=True), + 'Status', readonly=True), } _order = 'date desc' def init(self, cr): diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 32f4ab32b65..c007f2c2509 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -98,7 +98,7 @@ - + diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 43d7202547c..8e67233333c 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -114,7 +114,7 @@ class hr_holidays(osv.osv): 'name': fields.char('Description', required=True, size=64), 'state': fields.selection([('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')], - 'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\ + 'Status', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\ \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\ \nThe state is \'Refused\', when holiday request is refused by manager.\ \nThe state is \'Approved\', when holiday request is approved by manager.'), diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 9f8f998cbd9..3b4e7a871ca 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -37,7 +37,7 @@ - + diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 5c16655a530..e8f96df261b 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -218,7 +218,7 @@ class hr_payslip_run(osv.osv): 'state': fields.selection([ ('draft', 'Draft'), ('close', 'Close'), - ], 'State', select=True, readonly=True), + ], 'Status', select=True, readonly=True), 'date_start': fields.date('Date From', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'date_end': fields.date('Date To', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'credit_note': fields.boolean('Credit Note', readonly=True, states={'draft': [('readonly', False)]}, help="If its checked, indicates that all payslips generated from here are refund payslips."), @@ -271,7 +271,7 @@ class hr_payslip(osv.osv): ('verify', 'Waiting'), ('done', 'Done'), ('cancel', 'Rejected'), - ], 'State', select=True, readonly=True, + ], 'Status', select=True, readonly=True, help='* When the payslip is created the state is \'Draft\'.\ \n* If the payslip is under verification, the state is \'Waiting\'. \ \n* If the payslip is confirmed then state is set to \'Done\'.\ diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 17a2d11fd0e..62ca25bbcd4 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -144,7 +144,7 @@ class hr_applicant(crm.crm_case, osv.osv): 'create_date': fields.datetime('Creation Date', readonly=True, select=True), 'write_date': fields.datetime('Update Date', readonly=True), 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True, 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\'.\ @@ -169,7 +169,7 @@ class hr_applicant(crm.crm_case, osv.osv): 'partner_mobile': fields.char('Mobile', size=32), 'type_id': fields.many2one('hr.recruitment.degree', 'Degree'), 'department_id': fields.many2one('hr.department', 'Department'), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'survey': fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'), 'response': fields.integer("Response"), 'reference': fields.char('Refered By', size=128), diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 5d175bd16f5..ff8b9eb8ae3 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -206,7 +206,7 @@ - + diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 1a596dfa2c6..5c74bac4a5a 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -41,7 +41,7 @@ class hr_recruitment_report(osv.osv): _columns = { 'user_id': fields.many2one('res.users', 'User', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'month':fields.selection([('01', 'January'), ('02', 'February'), \ ('03', 'March'), ('04', 'April'),\ ('05', 'May'), ('06', 'June'), \ diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 112258ac4af..6fee524157a 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -109,7 +109,7 @@ - + diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py index d2db7fd4027..22ea593a3d9 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic.py +++ b/addons/hr_timesheet_invoice/report/report_analytic.py @@ -30,7 +30,7 @@ class report_analytic_account_close(osv.osv): _auto = False _columns = { 'name': fields.many2one('account.analytic.account', 'Analytic account', readonly=True), - 'state': fields.char('State', size=32, readonly=True), + 'state': fields.char('Status', size=32, readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), 'quantity': fields.float('Quantity', readonly=True), 'quantity_max': fields.float('Max. Quantity', readonly=True), diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 3e0f3963ad5..f9d662b9b5d 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -357,7 +357,7 @@ class hr_timesheet_sheet(osv.osv): ('new', 'New'), ('draft','Open'), ('confirm','Waiting Approval'), - ('done','Approved')], 'State', select=True, required=True, readonly=True, + ('done','Approved')], 'Status', select=True, required=True, readonly=True, help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \ \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \ \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'), diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index 986beb453eb..38e19d708d4 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -51,7 +51,7 @@ class timesheet_report(osv.osv): ('new', 'New'), ('draft','Draft'), ('confirm','Confirmed'), - ('done','Done')], 'State', readonly=True), + ('done','Done')], 'Status', readonly=True), 'quantity': fields.float('#Quantity',readonly=True), 'cost': fields.float('#Cost',readonly=True), } diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 96277f10c78..7c06971c7d2 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -102,7 +102,7 @@ - + diff --git a/addons/idea/idea.py b/addons/idea/idea.py index 57b7c84351c..f6f0bdac787 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -189,7 +189,7 @@ class idea_idea(osv.osv): ('open', 'Opened'), ('close', 'Accepted'), ('cancel', 'Refused')], - 'State', readonly=True, + 'Status', readonly=True, 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\'.' diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index b5a23b80481..ab29a6185e4 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -294,7 +294,7 @@ - + diff --git a/addons/idea/report/report_vote.py b/addons/idea/report/report_vote.py index f44786ef8a9..84f7b5c033f 100644 --- a/addons/idea/report/report_vote.py +++ b/addons/idea/report/report_vote.py @@ -41,7 +41,7 @@ class report_vote(osv.osv): 'idea_state': fields.selection([('draft', 'Draft'),('open', 'Opened'), ('close', 'Accepted'), ('cancel', 'Cancelled')], - 'State'), + 'Status'), 'category_id': fields.many2one('idea.category', 'Category'), 'creater_id': fields.many2one('res.users', 'User Name'), diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml index f3b722a4ce5..951ace27f4a 100644 --- a/addons/idea/report/report_vote_view.xml +++ b/addons/idea/report/report_vote_view.xml @@ -64,7 +64,7 @@ - + diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py index 226f38b349a..3b06ea5ce32 100644 --- a/addons/lunch/lunch.py +++ b/addons/lunch/lunch.py @@ -138,7 +138,7 @@ class lunch_order(osv.osv): 'descript': fields.char('Description Order', readonly=True, size=250, \ states = {'draft':[('readonly', False)]}), 'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \ - 'State', readonly=True, select=True), + 'Status', readonly=True, select=True), 'price': fields.function(_price_get, string="Price"), 'category': fields.many2one('lunch.category','Category'), } diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 5d5d599be0e..c062a39b428 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -217,7 +217,7 @@ class mail_message(osv.osv): ('received', 'Received'), ('exception', 'Delivery Failed'), ('cancel', 'Cancelled'), - ], 'State', readonly=True), + ], 'Status', readonly=True), 'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"), 'original': fields.binary('Original', help="Original version of the message, as it was sent on the network", readonly=1), } diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 50993f93744..8d2f1907025 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -190,7 +190,7 @@ - + diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index 15753e3ad9a..bef3792d340 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -117,7 +117,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor ('running', 'Running'), ('done', 'Done'), ('cancelled', 'Cancelled'),], - 'State',), + 'Status',), 'activity_ids': fields.one2many('marketing.campaign.activity', 'campaign_id', 'Activities'), 'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')), @@ -272,7 +272,7 @@ class marketing_campaign_segment(osv.osv): ('running', 'Running'), ('done', 'Done'), ('cancelled', 'Cancelled')], - 'State',), + 'Status',), 'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."), 'date_done': fields.datetime('End Date', help="Date this segment was last closed or cancelled."), 'date_next_sync': fields.function(_get_next_sync, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"), @@ -650,7 +650,7 @@ class marketing_campaign_workitem(osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True), 'state': fields.selection([('todo', 'To Do'), ('exception', 'Exception'), ('done', 'Done'), - ('cancelled', 'Cancelled')], 'State', readonly=True), + ('cancelled', 'Cancelled')], 'Status', readonly=True), 'error_msg' : fields.text('Error Message', readonly=True) } diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index d04cde0e428..bb8e2528a3c 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -103,7 +103,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -421,7 +421,7 @@ - + diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py index a193476783d..0330cd1f7d3 100644 --- a/addons/marketing_campaign/report/campaign_analysis.py +++ b/addons/marketing_campaign/report/campaign_analysis.py @@ -68,7 +68,7 @@ class campaign_analysis(osv.osv): 'count' : fields.integer('# of Actions', readonly=True), 'state': fields.selection([('todo', 'To Do'), ('exception', 'Exception'), ('done', 'Done'), - ('cancelled', 'Cancelled')], 'State', readonly=True), + ('cancelled', 'Cancelled')], 'Status', readonly=True), } def init(self, cr): tools.drop_view_if_exists(cr, 'campaign_analysis') diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index ea1ddc9a397..19d1c78f896 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -69,7 +69,7 @@ - + diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 88908884b26..64fb245bed0 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -481,7 +481,7 @@ class mrp_production(osv.osv): 'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products', domain=[('state','in', ('done', 'cancel'))]), 'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'), 'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'), - 'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'State', readonly=True, + 'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True, 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 \'Picking Exception\'.\ \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets 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, type='float', string='Total Hours', multi='workorder', store=True), diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 121567b3e56..6f64c3dcdda 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -823,7 +823,7 @@ - + diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py index 01391d9fb0b..76eb3c51a5b 100644 --- a/addons/mrp_operations/__openerp__.py +++ b/addons/mrp_operations/__openerp__.py @@ -29,7 +29,7 @@ This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). ============================================================================================================= -State: draft, confirm, done, cancel +Status: draft, confirm, done, cancel When finishing/confirming,cancelling production orders set all state lines to the according state Create menus: diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 78deb68e5e7..79666352911 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -86,7 +86,7 @@ class mrp_production_workcenter_line(osv.osv): _order = "sequence, date_planned" _columns = { - 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True, + 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'Status', readonly=True, help="* When a work order is created it is set in 'Draft' state.\n" \ "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \ "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \ @@ -101,7 +101,7 @@ class mrp_production_workcenter_line(osv.osv): 'production_state':fields.related('production_id','state', type='selection', selection=[('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')], - string='Production State', readonly=True), + string='Production Status', readonly=True), 'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product', readonly=True), 'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True, store=True), diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index ec2ef72d40d..183f62d21ad 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -152,7 +152,7 @@ - + diff --git a/addons/mrp_operations/report/mrp_workorder_analysis.py b/addons/mrp_operations/report/mrp_workorder_analysis.py index 545ce73656d..e38f5be7acc 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis.py +++ b/addons/mrp_operations/report/mrp_workorder_analysis.py @@ -36,7 +36,7 @@ class mrp_workorder(osv.osv): 'date': fields.date('Date', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), readonly=True), - 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True), + 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'Status', readonly=True), 'total_hours': fields.float('Total Hours', readonly=True), 'total_cycles': fields.float('Total Cycles', readonly=True), 'delay': fields.float('Delay', readonly=True), diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index 45b6ffd9be9..9b1b022e668 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -75,7 +75,7 @@ - + diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 4a0085e3db9..d8c2690124d 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -129,7 +129,7 @@ class mrp_repair(osv.osv): ('invoice_except','Invoice Exception'), ('done','Done'), ('cancel','Cancel') - ], 'State', readonly=True, + ], 'Status', readonly=True, help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed repair order. \ \n* The \'Confirmed\' state is used when a user confirms the repair order. \ \n* The \'Ready to Repair\' state is used to start to repairing, user can start repairing only after repair order is confirmed. \ @@ -655,7 +655,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): ('draft','Draft'), ('confirmed','Confirmed'), ('done','Done'), - ('cancel','Canceled')], 'State', required=True, readonly=True, + ('cancel','Canceled')], 'Status', required=True, readonly=True, help=' * The \'Draft\' state is set automatically as draft when repair order in draft state. \ \n* The \'Confirmed\' state is set automatically as confirm when repair order in confirm state. \ \n* The \'Done\' state is set automatically when repair order is completed.\ diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index 6af1dc702fa..86d5f3089ba 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -200,7 +200,7 @@ - + diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml index a1a0fa44b39..e5ade747840 100644 --- a/addons/point_of_sale/account_statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml @@ -39,7 +39,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 5af78b131b2..5576714b3f7 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -152,7 +152,7 @@ class pos_order(osv.osv): ('paid', 'Paid'), ('done', 'Posted'), ('invoiced', 'Invoiced')], - 'State', readonly=True), + 'Status', readonly=True), 'invoice_id': fields.many2one('account.invoice', 'Invoice'), 'account_move': fields.many2one('account.move', 'Journal Entry', readonly=True), diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 2622c2ba863..c5954ddb74e 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -150,7 +150,7 @@ - + diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py index ceb20a11a36..2a66923a39b 100644 --- a/addons/point_of_sale/report/pos_order_report.py +++ b/addons/point_of_sale/report/pos_order_report.py @@ -36,7 +36,7 @@ class pos_order_report(osv.osv): 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'state': fields.selection([('draft', 'New'), ('paid', 'Closed'), ('done', 'Synchronized'), ('invoiced', 'Invoiced'), ('cancel', 'Cancelled')], - 'State'), + 'Status'), 'user_id':fields.many2one('res.users', 'Salesman', readonly=True), 'price_total':fields.float('Total Price', readonly=True), 'total_discount':fields.float('Total Discount', readonly=True), diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml index 6374a09da02..8684ea11662 100644 --- a/addons/point_of_sale/report/pos_sales_user.rml +++ b/addons/point_of_sale/report/pos_sales_user.rml @@ -139,7 +139,7 @@ User - State + Status Company diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml index 5b0bc2a1dcb..d036d2d4813 100644 --- a/addons/point_of_sale/report/pos_sales_user_today.rml +++ b/addons/point_of_sale/report/pos_sales_user_today.rml @@ -139,7 +139,7 @@ User - State + Status Company diff --git a/addons/point_of_sale/report/report_cash_register.py b/addons/point_of_sale/report/report_cash_register.py index c86c40bb32f..4e99d2010b1 100644 --- a/addons/point_of_sale/report/report_cash_register.py +++ b/addons/point_of_sale/report/report_cash_register.py @@ -34,7 +34,7 @@ class report_cash_register(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'state': fields.selection([('draft', 'Quotation'),('open','Open'),('confirm', 'Confirmed')],'State'), + 'state': fields.selection([('draft', 'Quotation'),('open','Open'),('confirm', 'Confirmed')],'Status'), 'journal_id': fields.many2one('account.journal', 'Journal'), 'balance_start': fields.float('Opening Balance'), 'balance_end_real': fields.float('Closing Balance'), diff --git a/addons/process/process.py b/addons/process/process.py index 524a3236e7b..f9744608c50 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -293,7 +293,7 @@ class process_node(osv.osv): _columns = { 'name': fields.char('Name', size=30,required=True, translate=True), 'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'), - 'kind': fields.selection([('state','State'), ('subflow','Subflow')], 'Kind of Node', required=True), + 'kind': fields.selection([('state','Status'), ('subflow','Subflow')], 'Kind of Node', required=True), 'menu_id': fields.many2one('ir.ui.menu', 'Related Menu'), 'note': fields.text('Notes', translate=True), 'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'), diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 164314c4573..c858e8c7d3e 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -112,7 +112,7 @@ class procurement_order(osv.osv): ('cancel','Cancel'), ('ready','Ready'), ('done','Done'), - ('waiting','Waiting')], 'State', required=True, + ('waiting','Waiting')], 'Status', required=True, 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'), diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index b3e90ab4e6e..245ee2b230b 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -119,7 +119,7 @@ - + diff --git a/addons/project/project.py b/addons/project/project.py index 4f5b6d9a202..6f0bb96fcfc 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -662,7 +662,7 @@ class task(osv.osv): 'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True), 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."), 'type_id': fields.many2one('project.task.type', 'Stage'), - 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True, + 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'Status', readonly=True, required=True, help='If the task is created the state is \'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\'.'), 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', @@ -1291,7 +1291,7 @@ class project_task_history(osv.osv): _columns = { 'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True), 'type_id': fields.many2one('project.task.type', 'Stage'), - 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State'), + 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'Status'), 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', required=False), 'date': fields.date('Date', select=True), 'end_date': fields.function(_get_date, string='End Date', type="date", store={ diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 956b159a0bb..25c90f31b02 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -510,7 +510,7 @@ - + diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index 1b66361854b..1012ca9d518 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -51,7 +51,7 @@ class report_project_task_user(osv.osv): 'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority', 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), - 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'State', readonly=True), + 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), 'type_id': fields.many2one('project.task.type', 'Stage', readonly=True), @@ -131,7 +131,7 @@ class project_vs_hours(osv.osv): 'user_id': fields.many2one('res.users', 'Assigned To', readonly=True), 'planned_hours': fields.float('Planned Hours', readonly=True), 'total_hours': fields.float('Total Hours', readonly=True), - 'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True, readonly=True) + 'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'Status', required=True, readonly=True) } _order = 'project desc' @@ -178,7 +178,7 @@ class task_by_days(osv.osv): _auto = False _columns = { 'day': fields.char('Day', size=128, required=True), - 'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True), + 'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True), 'total_task': fields.float('Total tasks', readonly=True), 'project_id':fields.many2one('project.project', 'Project') } diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index d1306d31b01..3bdec47fcb9 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -132,7 +132,7 @@ - + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index e61af235d42..83f10a72fb7 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -179,7 +179,7 @@ class project_issue(crm.crm_case, osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner', select=1), 'company_id': fields.many2one('res.company', 'Company'), 'description': fields.text('Description'), - 'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True, + 'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'Status', size=16, readonly=True, 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\'.\ diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 7c22ad748c0..9c24e7243f6 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -186,7 +186,7 @@ context="{'group_by':'priority'}" /> - - - + diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py index 85eba636b90..273a6f22cab 100644 --- a/addons/project_scrum/project_scrum.py +++ b/addons/project_scrum/project_scrum.py @@ -109,7 +109,7 @@ class project_scrum_sprint(osv.osv): 'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."), 'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."), 'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'), - 'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True), + 'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'Status', required=True), } _defaults = { 'state': 'draft', @@ -229,7 +229,7 @@ class project_scrum_product_backlog(osv.osv): 'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint'), 'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."), 'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'), - 'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True), + 'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'Status', required=True), 'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', string='Progress', help="Computed as: Time Spent / Total Time."), 'effective_hours': fields.function(_compute, multi="effective_hours", string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True), 'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'), diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 0f33ded8523..b54d10292ca 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -167,7 +167,7 @@ - + @@ -334,7 +334,7 @@ - + diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 687221f371b..d9a02ed836f 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -169,7 +169,7 @@ class purchase_order(osv.osv): 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}), 'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]), 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('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(STATE_SELECTION, '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), + 'state': fields.selection(STATE_SELECTION, '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), 'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}), 'validator' : fields.many2one('res.users', 'Validated by', readonly=True), 'notes': fields.text('Notes'), @@ -729,7 +729,7 @@ class purchase_order_line(osv.osv): 'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'), 'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',), 'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), - 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True, + 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True, help=' * The \'Draft\' state is set automatically when purchase order in draft state. \ \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \ \n* The \'Done\' state is set automatically when purchase order is set as done. \ diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index a074f4d7a08..b4e04d1f1aa 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -232,7 +232,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -445,7 +445,7 @@ - + diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 399db12fb01..dc3594afcd7 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -106,7 +106,7 @@ - + diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index c8958d4ebf7..3692149c534 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -84,7 +84,7 @@ - - + diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index a86df29d56f..7cb0df63a79 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -104,7 +104,7 @@ - + diff --git a/addons/sale/sale.py b/addons/sale/sale.py index c2ee42b6fca..6a3539fc10f 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1025,7 +1025,7 @@ class sale_order_line(osv.osv): 'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'), 'notes': fields.text('Notes'), 'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}), - 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'State', required=True, readonly=True, + 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True, help='* The \'Draft\' state is set when the related sales order in draft state. \ \n* The \'Confirmed\' state is set when the related sales order is confirmed. \ \n* The \'Exception\' state is set when the related sales order is set as exception. \ diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 847e2e8f463..c5b3323b0d6 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -280,7 +280,7 @@ - + @@ -434,7 +434,7 @@ - + @@ -463,7 +463,7 @@ - + diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 63706a940e6..e8edc1665a1 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -143,7 +143,7 @@ Lot - State + Status Location @@ -240,7 +240,7 @@ Lot - State + Status Location diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index da6be7873c3..99e5e6fa4a2 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -42,7 +42,7 @@ class report_stock_move(osv.osv): 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."), 'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."), 'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."), - 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True), + 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True), 'product_qty':fields.integer('Quantity',readonly=True), 'categ_id': fields.many2one('product.category', 'Product Category', ), 'product_qty_in':fields.integer('In Qty',readonly=True), @@ -162,7 +162,7 @@ class report_stock_inventory(osv.osv): 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'product_qty':fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), readonly=True), 'value' : fields.float('Total Value', digits_compute=dp.get_precision('Account'), required=True), - 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True, + 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True, 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 picking it done the state is \'Done\'.\ \nThe state is \'Waiting\' if the move is waiting for another one.'), 'location_type': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True), diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 01ef4a70289..e460736addb 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -123,7 +123,7 @@ - + @@ -245,7 +245,7 @@ - + diff --git a/addons/stock/stock.py b/addons/stock/stock.py index dee8e2a6c25..9cde40be431 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -634,7 +634,7 @@ class stock_picking(osv.osv): ('assigned', 'Ready to Process'), ('done', 'Done'), ('cancel', 'Cancelled'), - ], 'State', readonly=True, select=True, + ], 'Status', readonly=True, select=True, help="* Draft: not confirmed yet and will not be scheduled until confirmed\n"\ "* Confirmed: still waiting for the availability of products\n"\ "* Available: products reserved, simply waiting for confirmation.\n"\ @@ -1630,7 +1630,7 @@ class stock_move(osv.osv): 'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'), 'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}), 'note': fields.text('Notes'), - 'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True, + 'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True, help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\ \nThe state is \'Waiting\' if the move is waiting for another one.'), 'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"), @@ -2656,7 +2656,7 @@ class stock_inventory(osv.osv): 'date_done': fields.datetime('Date done'), 'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}), 'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'), - 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'State', readonly=True, select=True), + 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'Status', readonly=True, select=True), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}), } @@ -2782,7 +2782,7 @@ class stock_inventory_line(osv.osv): 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')), 'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True, readonly=True), 'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"), - 'state': fields.related('inventory_id','state',type='char',string='State',readonly=True), + 'state': fields.related('inventory_id','state',type='char',string='Status',readonly=True), } def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False): diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 09b61d98328..e07287484d1 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -82,7 +82,7 @@ - + @@ -1035,7 +1035,7 @@ - + @@ -1248,7 +1248,7 @@ - + @@ -1307,7 +1307,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1674,7 +1674,7 @@ - + @@ -1705,7 +1705,7 @@ - + diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py index d104d57c62b..8f1bb69588d 100644 --- a/addons/stock_planning/stock_planning.py +++ b/addons/stock_planning/stock_planning.py @@ -47,7 +47,7 @@ class stock_period(osv.osv): 'name': fields.char('Period Name', size=64, required=True), 'date_start': fields.datetime('Start Date', required=True), 'date_stop': fields.datetime('End Date', required=True), - 'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State'), + 'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'Status'), } _defaults = { 'state': 'draft' @@ -92,7 +92,7 @@ class stock_sale_forecast(osv.osv): 'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoS Category'), # Invisible field for product_uos domain # Field used in onchange_uom to check what uom was before change and recalculate quantities according to old uom (active_uom) and new uom. 'active_uom': fields.many2one('product.uom', string = "Active UoM"), - 'state': fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True), + 'state': fields.selection([('draft','Draft'),('validated','Validated')],'Status',readonly=True), 'analyzed_period1_id': fields.many2one('stock.period', 'Period1', readonly=True, states={'draft':[('readonly',False)]},), 'analyzed_period2_id': fields.many2one('stock.period', 'Period2', readonly=True, states={'draft':[('readonly',False)]},), 'analyzed_period3_id': fields.many2one('stock.period', 'Period3', readonly=True, states={'draft':[('readonly',False)]},), @@ -447,7 +447,7 @@ class stock_planning(osv.osv): _columns = { 'company_id': fields.many2one('res.company', 'Company', required = True), 'history': fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."), - 'state' : fields.selection([('draft','Draft'),('done','Done')],'State',readonly=True), + 'state' : fields.selection([('draft','Draft'),('done','Done')],'Status',readonly=True), 'period_id': fields.many2one('stock.period' , 'Period', required=True, \ help = 'Period for this planning. Requisition will be created for beginning of the period.', select=True), 'warehouse_id': fields.many2one('stock.warehouse','Warehouse', required=True), diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index b29eb7baace..1a8e09e8cf4 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -17,7 +17,7 @@ - +