diff --git a/addons/account/account.py b/addons/account/account.py index cd9fb5d2213..e3dd07fed42 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1545,7 +1545,7 @@ class account_model_line(osv.osv): 'ref': fields.char('Ref.', size=16), - 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optionnal other currency."), + 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."), 'currency_id': fields.many2one('res.currency', 'Currency'), 'partner_id': fields.many2one('res.partner', 'Partner Ref.'), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 354f721db5a..46af2bd289a 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -348,8 +348,8 @@ class account_move_line(osv.osv): 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1), 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2), 'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2), - 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optionnal other currency if it is a multi-currency entry."), - 'currency_id': fields.many2one('res.currency', 'Currency', help="The optionnal other currency if it is a multi-currency entry."), + 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry."), + 'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."), 'period_id': fields.many2one('account.period', 'Period', required=True, select=2), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1), diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 21adff82f3d..f06fe81dfa7 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -124,7 +124,7 @@ class res_partner_job(osv.osv): 'phone': fields.char('Phone', size=64), 'fax': fields.char('Fax', size=64), 'extension': fields.char('Extension', size=64, help='Internal/External extension phone number'), - 'other': fields.char('Other', size=64, help='Additionnal phone field'), + 'other': fields.char('Other', size=64, help='Additional phone field'), 'date_start' : fields.date('Date Start'), 'date_stop' : fields.date('Date Stop'), 'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True), diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py index a9e410fbcb1..0ded3cda606 100644 --- a/addons/crm/crm_segmentation.py +++ b/addons/crm/crm_segmentation.py @@ -40,7 +40,7 @@ class crm_segmentation(osv.osv): 'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution Status', readonly=True), 'partner_id': fields.integer('Max Partner ID processed'), 'segmentation_line': fields.one2many('crm.segmentation.line', 'segmentation_id', 'Criteria', required=True), - 'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionnality for recurring businesses."), + 'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."), 'som_interval_max': fields.integer('Max Interval', help="The computation is made on all events that occured during this interval, the past X periods."), 'som_interval_decrease': fields.float('Decrease (0>1)', help="If the partner has not purchased (or buied) during a period, decrease the state of mind by this factor. It\'s a multiplication"), 'som_interval_default': fields.float('Default (0=None)', help="Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."), @@ -102,7 +102,7 @@ class crm_segmentation_line(osv.osv): 'expr_name': fields.selection([('sale','Sale Amount'),('som','State of Mind'),('purchase','Purchase Amount')], 'Control Variable', size=64, required=True), 'expr_operator': fields.selection([('<','<'),('=','='),('>','>')], 'Operator', required=True), 'expr_value': fields.float('Value', required=True), - 'operator': fields.selection([('and','Mandatory Expression'),('or','Optional Expression')],'Mandatory / Optionnal', required=True), + 'operator': fields.selection([('and','Mandatory Expression'),('or','Optional Expression')],'Mandatory / Optional', required=True), } _defaults = { 'expr_name': lambda *a: 'sale',