diff --git a/addons/account/account.py b/addons/account/account.py index 3e07f151de3..c9dd1950347 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1007,7 +1007,7 @@ class account_period(osv.osv): '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','Open'), ('done','Closed')], 'Status', readonly=True, - help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), + help='When monthly periods are created. The status is \'Draft\'. At the end of monthly period it is in \'Done\' status.'), 'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) } _defaults = { @@ -1134,7 +1134,7 @@ class account_journal_period(osv.osv): 'icon': fields.function(_icon_get, string='Icon', type='char', size=32), 'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."), 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', 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.'), + help='When journal period is created. The status is \'Draft\'. If a report is printed it comes to \'Printed\' status. When all transactions are done, it comes in \'Done\' status.'), 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'), 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) } @@ -1282,7 +1282,7 @@ class account_move(osv.osv): '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','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True, - help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), + help='All manually created new journal entries are usually in the status \'Unposted\', but you can set the option to skip that status on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' status.'), 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 549363ce269..48082451f35 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -123,8 +123,8 @@ class account_bank_statement(osv.osv): ('open','Open'), # used by cash statements ('confirm', 'Closed')], 'Status', required=True, readonly="1", - 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.'), + help='When new statement is created the status will be \'Draft\'.\n' + 'And after getting confirmation from the bank it will be in \'Confirmed\' status.'), 'currency': fields.function(_currency, string='Currency', type='many2one', relation='res.currency'), 'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'), diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 0508a7cadfe..fb15b7c3e82 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -207,12 +207,12 @@ class account_invoice(osv.osv): ('open','Open'), ('paid','Paid'), ('cancel','Cancelled'), - ],'State', select=True, readonly=True, - help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \ - \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \ - \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \ - \n* The \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \ - \n* The \'Cancelled\' state is used when user cancel invoice.'), + ],'Status', select=True, readonly=True, + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed Invoice. \ + \n* The \'Pro-forma\' when invoice is in Pro-forma status,invoice does not have an invoice number. \ + \n* The \'Open\' status is used when user create invoice,a invoice number is generated.Its in open status till user does not pay invoice. \ + \n* The \'Paid\' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \ + \n* The \'Cancelled\' status is used when user cancel invoice.'), 'sent': fields.boolean('Sent', readonly=True, help="It indicates that the invoice has been sent."), 'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"), 'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 745795452d3..d9e95f15079 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1862,7 +1862,7 @@ - + diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 00d5e520c42..fa2d071695b 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -91,7 +91,7 @@ class account_invoice_report(osv.osv): ('open','Open'), ('paid','Done'), ('cancel','Cancelled') - ], 'Invoice State', readonly=True), + ], 'Invoice Status', readonly=True), 'date_due': fields.date('Due Date', readonly=True), 'account_id': fields.many2one('account.account', 'Account',readonly=True), 'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True), diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 4c6f9b7a637..585798a5235 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -226,9 +226,9 @@ class account_asset_asset(osv.osv): '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')], '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."), + help="When an asset is created, the status is 'Draft'.\n" \ + "If the asset is confirmed, the status 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 status."), 'active': fields.boolean('Active'), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}), 'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\ diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index fceff99b3f2..0f6dca56d15 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -95,7 +95,7 @@ class payment_order(osv.osv): ('cancel', 'Cancelled'), ('open', 'Confirmed'), ('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\'.'), + help='When an order is placed the status is \'Draft\'.\n Once the bank is confirmed the status is set to \'Confirmed\'.\n Then the order is paid the status is \'Done\'.'), 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}), 'total': fields.function(_total, string="Total", type='float'), 'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}), diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 3ae421308b5..f25318727df 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -293,10 +293,10 @@ class account_voucher(osv.osv): ('proforma','Pro-forma'), ('posted','Posted') ], '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 \ - \n* The \'Cancelled\' state is used when user cancel voucher.'), + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed Voucher. \ + \n* The \'Pro-forma\' when voucher is in Pro-forma status,voucher does not have an voucher number. \ + \n* The \'Posted\' status is used when user create voucher,a voucher number is generated and voucher entries are created in account \ + \n* The \'Cancelled\' status is used when user cancel voucher.'), 'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}), 'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}), 'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."), diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index 53aa5cd4a0d..fdadfc6bc94 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -52,7 +52,7 @@ class sale_receipt_report(osv.osv): ('proforma','Pro-forma'), ('posted','Posted'), ('cancel','Cancelled') - ], 'Voucher State', readonly=True), + ], 'Voucher Status', readonly=True), 'pay_now':fields.selection([ ('pay_now','Pay Directly'), ('pay_later','Pay Later or Group Funds'), diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 59196c4da87..69eee4f18e0 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -138,7 +138,7 @@ class res_users(osv.Model): for user in self.browse(cr, uid, ids, context)) _columns = { - 'state': fields.function(_get_state, string='State', type='selection', + 'state': fields.function(_get_state, string='Status', type='selection', selection=[('new', 'New'), ('active', 'Active'), ('reset', 'Resetting Password')]), } diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index f5fb3dbd051..cbdc43b23af 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1023,10 +1023,10 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'rrule': fields.function(_get_rulestring, type='char', size=124, \ fnct_inv=_rrule_write, store=True, string='Recurrent Rule'), 'rrule_type': fields.selection([ - ('daily', 'Daily'), - ('weekly', 'Weekly'), - ('monthly', 'Monthly'), - ('yearly', 'Yearly') + ('daily', 'Day(s)'), + ('weekly', 'Week(s)'), + ('monthly', 'Month(s)'), + ('yearly', 'Year(s)') ], 'Recurrency', states={'done': [('readonly', True)]}, help="Let the event automatically repeat at that interval"), 'alarm_id': fields.many2one('res.alarm', 'Reminder', states={'done': [('readonly', True)]}, diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 9dd37afa3d6..760a47d3796 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -86,7 +86,7 @@ - + diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml index ec98b7922de..6d15099dc5a 100644 --- a/addons/base_vat/base_vat_view.xml +++ b/addons/base_vat/base_vat_view.xml @@ -11,7 +11,7 @@ diff --git a/addons/crm/crm.py b/addons/crm/crm.py index d5f5b2511d1..eb602b98c09 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -77,7 +77,7 @@ class crm_case_stage(osv.osv): help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."), 'state': fields.selection(AVAILABLE_STATES, 'Related Status', required=True, help="The status of your document will automatically change regarding the selected stage. " \ - "For example, if a stage is related to the state 'Close', when your document reaches this stage, it is automatically closed."), + "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."), 'case_default': fields.boolean('Common to All Teams', help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."), 'fold': fields.boolean('Hide in Views when Empty', diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index fbe47c08dca..9ee5aeb2301 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -223,11 +223,11 @@ class crm_lead(base_stage, format_address, osv.osv): 'day_close': fields.function(_compute_day, string='Days to Close', \ multi='day_close', type="float", store=True), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=crm.AVAILABLE_STATES, string="State", 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 \ + selection=crm.AVAILABLE_STATES, string="Status", readonly=True, + help='The Status is set to \'Draft\', when a case is created.\ + If the case is in progress the Status is set to \'Open\'.\ + When the case is over, the Status is set to \'Done\'.\ + If the case needs to be reviewed then the Status is \ set to \'Pending\'.'), # Only used for type opportunity diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 44894fc881d..bac33815794 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -50,10 +50,10 @@ class crm_phonecall(base_state, osv.osv): ('cancel', 'Cancelled'), ('done', 'Held'),], string='Status', size=16, readonly=True, - help='The state is set to \'Todo\', when a case is created.\ - If the case is in progress the state is set to \'Open\'.\ - When the call is over, the state is set to \'Held\'.\ - If the call needs to be done then the state is set to \'Not Held\'.'), + help='The status is set to \'Todo\', when a case is created.\ + If the case is in progress the status is set to \'Open\'.\ + When the call is over, the status is set to \'Held\'.\ + If the call needs to be done then the status is set to \'Not Held\'.'), 'email_from': fields.char('Email', size=128, help="These people will receive email."), 'date_open': fields.datetime('Opened', readonly=True), # phonecall fields diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index 60cde56ae1d..d6f0ed883c8 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -50,7 +50,7 @@ class crm_claim_stage(osv.osv): 'sequence': fields.integer('Sequence', help="Used to order stages. Lower is better."), 'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections', help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."), - 'state': fields.selection(crm.AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. For example, if a stage is related to the state 'Close', when your document reaches this stage, it will be automatically have the 'closed' state."), + 'state': fields.selection(crm.AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it will be automatically have the 'closed' status."), 'case_refused': fields.boolean('Refused stage', help='Refused stages are specific stages for done.'), 'case_default': fields.boolean('Common to All Teams', @@ -108,11 +108,11 @@ class crm_claim(base_stage, osv.osv): domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"), 'cause': fields.text('Root Cause'), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=crm.AVAILABLE_STATES, string="State", 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 \ + selection=crm.AVAILABLE_STATES, string="Status", readonly=True, + help='The status is set to \'Draft\', when a case is created.\ + If the case is in progress the status is set to \'Open\'.\ + When the case is over, the status is set to \'Done\'.\ + If the case needs to be reviewed then the status is \ set to \'Pending\'.'), } diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index ceffd282aa8..ddf624c03ac 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -73,10 +73,10 @@ class crm_helpdesk(base_state, base_stage, osv.osv): ('object_id.model', '=', 'crm.helpdesk')]"), 'duration': fields.float('Duration', states={'done': [('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\'.\ - \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), + help='The status is set to \'Draft\', when a case is created.\ + \nIf the case is in progress the status is set to \'Open\'.\ + \nWhen the case is over, the status is set to \'Done\'.\ + \nIf the case needs to be reviewed then the status is set to \'Pending\'.'), } _defaults = { diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py index 9134f427c5d..69b2ba406ca 100644 --- a/addons/crm_partner_assign/partner_geo_assign.py +++ b/addons/crm_partner_assign/partner_geo_assign.py @@ -87,7 +87,7 @@ class res_partner(osv.osv): help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"), 'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\ 'Assigned Opportunities'), - 'grade_id': fields.many2one('res.partner.grade', 'Partner Grade'), + 'grade_id': fields.many2one('res.partner.grade', 'Partner Level'), 'activation' : fields.many2one('res.partner.activation', 'Activation', select=1), 'date_partnership' : fields.date('Partnership Date'), 'date_review' : fields.date('Latest Partner Review'), diff --git a/addons/event/event.py b/addons/event/event.py index e30dda7be8d..399d3d66616 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -201,7 +201,7 @@ class event_event(osv.osv): ('confirm', 'Confirmed'), ('done', 'Done')], 'Status', 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 status is \'Draft\'.If event is confirmed for the particular dates the status is set to \'Confirmed\'. If the event is over, the status is set to \'Done\'.If event is cancelled the status is set to \'Cancelled\'.'), 'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'), 'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."), 'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."), diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 487e4f58782..ca2c689c512 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -233,7 +233,7 @@ hr_expense_expense() class product_product(osv.osv): _inherit = "product.product" _columns = { - 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."), + 'hr_expense_ok': fields.boolean('Can be Expensed', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."), } def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok): diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index b48f0786704..0977f3729b4 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -115,10 +115,10 @@ class hr_holidays(osv.osv): _columns = { 'name': fields.char('Description', size=64), 'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')], - 'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\ - \nThe state is \'To Approve\', 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.'), + 'Status', readonly=True, help='The status is set to \'To Submit\', when a holiday request is created.\ + \nThe status is \'To Approve\', when holiday request is confirmed by user.\ + \nThe status is \'Refused\', when holiday request is refused by manager.\ + \nThe status is \'Approved\', when holiday request is approved by manager.'), 'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True), 'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True), 'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index b56b49d3d99..d1f38ad4a0f 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -272,10 +272,10 @@ class hr_payslip(osv.osv): ('done', 'Done'), ('cancel', 'Rejected'), ], '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\'.\ - \n* When user cancel payslip the state is \'Rejected\'.'), + help='* When the payslip is created the status is \'Draft\'.\ + \n* If the payslip is under verification, the status is \'Waiting\'. \ + \n* If the payslip is confirmed then status is set to \'Done\'.\ + \n* When user cancel payslip the status is \'Rejected\'.'), # 'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 56c517620e0..049cb93ca1e 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -62,7 +62,7 @@ class hr_recruitment_stage(osv.osv): 'name': fields.char('Name', size=64, required=True, translate=True), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."), 'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."), - 'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change according to the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."), + 'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."), 'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."), 'requirements': fields.text('Requirements'), } @@ -189,11 +189,11 @@ class hr_applicant(base_stage, osv.Model): 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=AVAILABLE_STATES, string="State", 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 \ + selection=AVAILABLE_STATES, string="Status", readonly=True, + help='The status is set to \'Draft\', when a case is created.\ + If the case is in progress the status is set to \'Open\'.\ + When the case is over, the status is set to \'Done\'.\ + If the case needs to be reviewed then the status is \ set to \'Pending\'.'), 'categ_ids': fields.many2many('hr.applicant_category', string='Tags'), 'company_id': fields.many2one('res.company', 'Company'), diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index e888da9ead7..d3faa3f37be 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 Applications', 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_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index 031a17baee0..3991696b331 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -33,7 +33,7 @@ class hr_so_project(osv.osv_memory): 'date': fields.datetime('Closing Date'), 'analytic_amount': fields.float('Minimum Analytic Amount'), 'name': fields.char('Employees name', size=32, required=True, readonly=True), - 'state': fields.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True), + 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'server_date': fields.datetime('Current Date', required=True, readonly=True), 'emp_id': fields.many2one('hr.employee', 'Employee ID') } @@ -111,7 +111,7 @@ class hr_si_project(osv.osv_memory): _description = 'Sign In By Project' _columns = { 'name': fields.char('Employees name', size=32, readonly=True), - 'state': fields.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True), + 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'date': fields.datetime('Starting Date'), 'server_date': fields.datetime('Current Date', readonly=True), 'emp_id': fields.many2one('hr.employee', 'Employee ID') diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index e62134ee38a..f54ea1a4f18 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -206,9 +206,9 @@ class hr_timesheet_sheet(osv.osv): ('draft','Open'), ('confirm','Waiting Approval'), ('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.'), + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed timesheet. \ + \n* The \'Confirmed\' status is used for to confirm the timesheet by user. \ + \n* The \'Done\' status is used when users timesheet is accepted by his/her senior.'), 'state_attendance' : fields.related('employee_id', 'state', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Current Status', readonly=True), 'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total"), 'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total"), diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py index 085a2679db2..b7c3926d727 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py @@ -65,7 +65,7 @@ class payroll_advice(osv.osv): ('draft', 'Draft'), ('confirm', 'Confirmed'), ('cancel', 'Cancelled'), - ], 'State', select=True, readonly=True), + ], 'Status', select=True, readonly=True), 'number':fields.char('Reference', size=16, readonly=True), 'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True), 'chaque_nos':fields.char('Cheque Numbers', size=256), diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py index 838334913a5..a264368be94 100644 --- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py +++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py @@ -38,7 +38,7 @@ class payment_advice_report(osv.osv): ('draft', 'Draft'), ('confirm', 'Confirmed'), ('cancel', 'Cancelled'), - ], 'State', select=True, readonly=True), + ], 'Status', select=True, readonly=True), 'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True), 'nbr': fields.integer('# Payment Lines', readonly=True), 'number':fields.char('Number', size=16, readonly=True), diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py index b688af4329b..a78d9850667 100644 --- a/addons/l10n_in_hr_payroll/report/payslip_report.py +++ b/addons/l10n_in_hr_payroll/report/payslip_report.py @@ -39,7 +39,7 @@ class payslip_report(osv.osv): ('draft', 'Draft'), ('done', 'Done'), ('cancel', 'Rejected'), - ], 'State', readonly=True), + ], 'Status', readonly=True), 'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True), 'nbr': fields.integer('# Payslip lines', readonly=True), 'number': fields.char('Number', size=16, readonly=True), diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 87af723f2f9..5e3816419f8 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -150,11 +150,11 @@ class membership_line(osv.osv): 'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True), 'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True), 'state': fields.function(_state, - string='Membership State', type='selection', + string='Membership Status', type='selection', selection=STATE, store = { 'account.invoice': (_get_membership_lines, ['state'], 10), 'res.partner': (_get_partners, ['membership_state'], 12), - }, help="""It indicates the membership state. + }, help="""It indicates the membership status. -Non Member: A member who has not applied for any membership. -Cancelled Member: A member who has cancelled his membership. -Old Member: A member whose membership date has expired. @@ -323,7 +323,7 @@ class Partner(osv.osv): help = 'The price negotiated by the partner'), 'membership_state': fields.function( __get_membership_state, - string = 'Current Membership State', type = 'selection', + string = 'Current Membership Status', type = 'selection', selection = STATE, store = { 'account.invoice': (_get_invoice_partner, ['state'], 10), diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 3ae27bf2c41..f8b53583a8c 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -499,12 +499,12 @@ class mrp_production(osv.osv): [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Waiting Goods'), ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')], string='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'.\n\ - If 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'."), + help="When the production order is created the status is set to 'Draft'.\n\ + If the order is confirmed the status is set to 'Waiting Goods'.\n\ + If any exceptions are there, the status is set to 'Picking Exception'.\n\ + If the stock is available then the status is set to 'Ready to Produce'.\n\ + When the production gets started then the status is set to 'In Production'.\n\ + When the production is over, the status is set to 'Done'."), 'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True), 'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True), 'user_id':fields.many2one('res.users', 'Responsible'), diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 9f6671c3b2b..90330c4c988 100644 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -87,11 +87,11 @@ class mrp_production_workcenter_line(osv.osv): _columns = { 'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('pause','Pending'),('startworking', 'In Progress'),('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" \ - "* When the user cancels the work order it will be set in 'Canceled' state.\n" \ - "* When order is completely processed that time it is set in 'Finished' state."), + help="* When a work order is created it is set in 'Draft' status.\n" \ + "* When user sets work order in start mode that time it will be set in 'In Progress' status.\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' status.\n" \ + "* When the user cancels the work order it will be set in 'Canceled' status.\n" \ + "* When order is completely processed that time it is set in 'Finished' status."), 'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'), 'date_planned': fields.datetime('Scheduled Date', select=True), 'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'), diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index c1ac8f809ce..60fc34a972a 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -131,12 +131,12 @@ class mrp_repair(osv.osv): ('invoice_except','Invoice Exception'), ('done','Repaired') ], '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. \ - \n* The \'To be Invoiced\' state is used to generate the invoice before or after repairing done. \ - \n* The \'Done\' state is set when repairing is completed.\ - \n* The \'Cancelled\' state is used when user cancel repair order.'), + help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed repair order. \ + \n* The \'Confirmed\' status is used when a user confirms the repair order. \ + \n* The \'Ready to Repair\' status is used to start to repairing, user can start repairing only after repair order is confirmed. \ + \n* The \'To be Invoiced\' status is used to generate the invoice before or after repairing done. \ + \n* The \'Done\' status is set when repairing is completed.\ + \n* The \'Cancelled\' status is used when user cancel repair order.'), 'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)]}), 'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}), 'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}), @@ -707,10 +707,10 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): ('confirmed','Confirmed'), ('done','Done'), ('cancel','Cancelled')], '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.\ - \n* The \'Cancelled\' state is set automatically when user cancel repair order.'), + help=' * The \'Draft\' status is set automatically as draft when repair order in draft status. \ + \n* The \'Confirmed\' status is set automatically as confirm when repair order in confirm status. \ + \n* The \'Done\' status is set automatically when repair order is completed.\ + \n* The \'Cancelled\' status is set automatically when user cancel repair order.'), } _defaults = { 'state': lambda *a: 'draft', diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 788c301a04f..f219f4111ca 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -66,7 +66,7 @@ class pos_config(osv.osv): 'iface_vkeyboard' : fields.boolean('Virtual KeyBoard Interface'), 'iface_print_via_proxy' : fields.boolean('Print via Proxy'), - 'state' : fields.selection(POS_CONFIG_STATE, 'State', required=True, readonly=True), + 'state' : fields.selection(POS_CONFIG_STATE, 'Status', required=True, readonly=True), 'sequence_id' : fields.many2one('ir.sequence', 'Order IDs Sequence', readonly=True, help="This sequence is automatically created by OpenERP but you can change it "\ "to customize the reference numbers of your orders."), @@ -197,7 +197,7 @@ class pos_session(osv.osv): 'start_at' : fields.datetime('Opening Date', readonly=True), 'stop_at' : fields.datetime('Closing Date', readonly=True), - 'state' : fields.selection(POS_SESSION_STATE, 'State', + 'state' : fields.selection(POS_SESSION_STATE, 'Status', required=True, readonly=True, select=1), diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 66b7e3b6eb5..1ee55f736aa 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -1039,7 +1039,7 @@ - + diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py index 4e7965f8e97..7c88986169e 100644 --- a/addons/point_of_sale/wizard/pos_session_opening.py +++ b/addons/point_of_sale/wizard/pos_session_opening.py @@ -16,8 +16,8 @@ class pos_session_opening(osv.osv_memory): 'pos_state' : fields.related('pos_session_id', 'state', type='selection', selection=pos_session.POS_SESSION_STATE, - string='Session State', readonly=True), - 'pos_state_str' : fields.char('State', 32, readonly=True), + string='Session Status', readonly=True), + 'pos_state_str' : fields.char('Status', 32, readonly=True), 'show_config' : fields.boolean('Show Config', readonly=True), 'pos_session_name' : fields.related('pos_session_id', 'name', type='char', size=64, readonly=True), diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index b21cef30773..55a291bd3c2 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -113,8 +113,8 @@ class procurement_order(osv.osv): ('ready','Ready'), ('done','Done'), ('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.'), + help='When a procurement is created the status is set to \'Draft\'.\n If the procurement is confirmed, the status is set to \'Confirmed\'.\ + \nAfter confirming the status is set to \'Running\'.\n If any exception arises in the order then the status is set to \'Exception\'.\n Once the exception is removed the status becomes \'Ready\'.\n It is in \'Waiting\'. status when the procurement is waiting for another one to finish.'), 'note': fields.text('Note'), 'company_id': fields.many2one('res.company','Company',required=True), } diff --git a/addons/project/project.py b/addons/project/project.py index 56d7fef0e49..3b0057c67b7 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -721,11 +721,11 @@ class task(base_stage, osv.osv): 'stage_id': fields.many2one('project.task.type', 'Stage', domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=_TASK_STATE, string="State", 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 \ + selection=_TASK_STATE, string="Status", readonly=True, + help='The status is set to \'Draft\', when a case is created.\ + If the case is in progress the status is set to \'Open\'.\ + When the case is over, the status is set to \'Done\'.\ + If the case needs to be reviewed then the status is \ set to \'Pending\'.'), 'categ_ids': fields.many2many('project.category', string='Tags'), 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 6c86fbbb198..1467ce55fab 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -77,7 +77,7 @@ - +