diff --git a/addons/account/account.py b/addons/account/account.py
index 75936320e58..7f08538b97d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1928,7 +1928,7 @@ class account_tax(osv.osv):
'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
'python_compute':fields.text('Python Code'),
'python_compute_inv':fields.text('Python Code (reverse)'),
- 'python_applicable':fields.text('Python Code'),
+ 'python_applicable':fields.text('Applicable Code'),
#
# Fields used for the Tax declaration
@@ -1942,8 +1942,8 @@ class account_tax(osv.osv):
'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."),
'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."),
- 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
- 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+ 'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1."),
+ 'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1."),
'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
'company_id': fields.many2one('res.company', 'Company', required=True),
'description': fields.char('Tax Code'),
@@ -2833,7 +2833,7 @@ class account_tax_template(osv.osv):
'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
'python_compute':fields.text('Python Code'),
'python_compute_inv':fields.text('Python Code (reverse)'),
- 'python_applicable':fields.text('Python Code'),
+ 'python_applicable':fields.text('Applicable Code'),
#
# Fields used for the Tax declaration
@@ -2847,8 +2847,8 @@ class account_tax_template(osv.osv):
'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."),
'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."),
- 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
- 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+ 'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1."),
+ 'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1."),
'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
'description': fields.char('Internal Name'),
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,),
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 397bd193757..9396c89e776 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -425,6 +425,7 @@ property or property parameter."),
if event_obj.rrule:
event.add('rrule').value = event_obj.rrule
if event_obj.organizer:
+ # deprecated: will be removed with OpenERP v8: use organizer_id instead
event_org = event.add('organizer')
event_org.params['CN'] = [event_obj.organizer]
event_org.value = 'MAILTO:' + (event_obj.organizer)
@@ -1037,7 +1038,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
'recurrent_id_date': fields.datetime('Recurrent ID date'),
'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'),
'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
- 'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent.
+ 'organizer': fields.char("Organizer (deprecated)", size=256, states={'done': [('readonly', True)]},
+ deprecated='Will be removed with OpenERP v8; use organizer_id field instead'), # Map with organizer attribute of VEvent.
'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
@@ -1112,6 +1114,10 @@ rule or repeating pattern of time to exclude from the recurring rule."),
return True
def default_organizer(self, cr, uid, context=None):
+ """
+ .. deprecated:: 8.0
+ Use organizer_id field and its default value instead.
+ """
user_pool = self.pool.get('res.users')
user = user_pool.browse(cr, uid, uid, context=context)
res = user.name
@@ -1130,7 +1136,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
'interval': 1,
'active': 1,
'user_id': lambda self, cr, uid, ctx: uid,
- 'organizer': default_organizer,
}
def _check_closing_date(self, cr, uid, ids, context=None):
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 2c3bb40c9c2..9ef8bee6e3b 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -71,7 +71,6 @@
-
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 483f989fcde..854bd043869 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -160,8 +160,8 @@ class fleet_vehicle_model(osv.Model):
'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'),
'image': fields.related('brand_id', 'image', type="binary", string="Logo"),
- 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo"),
- 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo"),
+ 'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo (medium)"),
+ 'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo (small)"),
}
@@ -354,8 +354,8 @@ class fleet_vehicle(osv.Model):
'power': fields.integer('Power', help='Power in kW of the vehicle'),
'co2': fields.float('CO2 Emissions', help='CO2 emissions of the vehicle'),
'image': fields.related('model_id', 'image', type="binary", string="Logo"),
- 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo"),
- 'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo"),
+ 'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo (medium)"),
+ 'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo (small)"),
'contract_renewal_due_soon': fields.function(_get_contract_reminder_fnc, fnct_search=_search_contract_renewal_due_soon, type="boolean", string='Has Contracts to renew', multi='contract_info'),
'contract_renewal_overdue': fields.function(_get_contract_reminder_fnc, fnct_search=_search_get_overdue_contract_reminder, type="boolean", string='Has Contracts Overdued', multi='contract_info'),
'contract_renewal_name': fields.function(_get_contract_reminder_fnc, type="text", string='Name of contract to renew soon', multi='contract_info'),
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index e7d4cef594a..3c0f5cc6e4a 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -260,7 +260,7 @@ class hr_payslip(osv.osv):
_columns = {
'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True, states={'draft': [('readonly', False)]}, help='Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn\'t mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period'),
- 'name': fields.char('Description', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
+ 'name': fields.char('Payslip Name', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
'number': fields.char('Reference', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
'employee_id': fields.many2one('hr.employee', 'Employee', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'date_from': fields.date('Date From', readonly=True, states={'draft': [('readonly', False)]}, required=True),
@@ -281,7 +281,7 @@ class hr_payslip(osv.osv):
'worked_days_line_ids': fields.one2many('hr.payslip.worked_days', 'payslip_id', 'Payslip Worked Days', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
- 'note': fields.text('Description', readonly=True, states={'draft':[('readonly',False)]}),
+ 'note': fields.text('Internal Note', readonly=True, states={'draft':[('readonly',False)]}),
'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'),
'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 97d2842d15c..1eacb902e0f 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -64,7 +64,7 @@ class mail_alias(osv.Model):
return dict.fromkeys(ids, domain or "")
_columns = {
- 'alias_name': fields.char('Alias',
+ 'alias_name': fields.char('Alias Name',
help="The name of the email alias, e.g. 'jobs' if you want to catch emails for ",),
'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade",
help="The model (OpenERP Document Kind) to which this alias "
diff --git a/addons/product/product.py b/addons/product/product.py
index 71f1eeffaf3..b1657590d05 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -135,7 +135,7 @@ class product_uom(osv.osv):
'1 * (reference unit) = ratio * (this unit)'),
'factor_inv': fields.function(_factor_inv, digits=(12,12),
fnct_inv=_factor_inv_write,
- string='Ratio',
+ string='Bigger Ratio',
help='How many times this Unit of Measure is bigger than the reference Unit of Measure in this category:\n'\
'1 * (this unit) = ratio * (reference unit)', required=True),
'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product Unit of Measure'), required=True,
diff --git a/addons/project/project.py b/addons/project/project.py
index a8f198cac3d..4e2b6c6b17b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -237,7 +237,9 @@ class project(osv.osv):
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
'analytic_account_id': fields.many2one('account.analytic.account', 'Contract/Analytic', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
- 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
+ 'priority': fields.integer('Sequence (deprecated)',
+ deprecated='Will be removed with OpenERP v8; use sequence field instead',
+ help="Gives the sequence order when displaying the list of projects"),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
@@ -294,7 +296,6 @@ class project(osv.osv):
'active': True,
'type': 'contract',
'state': 'open',
- 'priority': 1,
'sequence': 10,
'type_ids': _get_type_common,
'alias_model': 'project.task',
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 12e373642fd..c58c61448c2 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -60,7 +60,7 @@
- 10
+ 10
E-Learning Integration
@@ -74,7 +74,7 @@
- 20
+ 20
Website Design Templates
@@ -89,7 +89,7 @@
- 2
+ 2
Data Import/Export Plugin
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d86f635d749..5015d80e01f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -158,7 +158,7 @@
-
+
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 3e90a2a43d6..445cdd17ee6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -312,7 +312,7 @@
{'on_change': 'on_change_use_tasks_or_issues(use_tasks, use_issues)'}
-
+
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 98e1d78b3be..8ccb792ef47 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -61,7 +61,7 @@ class subscription_subscription(osv.osv):
'name': fields.char('Name', size=60, required=True),
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the subscription without removing it."),
'partner_id': fields.many2one('res.partner', 'Partner'),
- 'notes': fields.text('Notes'),
+ 'notes': fields.text('Internal Notes'),
'user_id': fields.many2one('res.users', 'User', required=True),
'interval_number': fields.integer('Interval Qty'),
'interval_type': fields.selection([('days', 'Days'), ('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3ae9f896256..0504017e991 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -34,7 +34,7 @@
-
+