-
+
Get warnings when invoicing specific customers
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index 0ea2c6e55c5..00f04b61329 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -20,8 +20,8 @@ class AccountingReport(models.TransientModel):
account_report_id = fields.Many2one('account.financial.report', string='Account Reports', required=True, default=_get_account_report)
label_filter = fields.Char(string='Column Label', help="This label will be displayed on report to show the balance computed for the given comparison filter.")
filter_cmp = fields.Selection([('filter_no', 'No Filters'), ('filter_date', 'Date')], string='Filter by', required=True, default='filter_no')
- date_from_cmp = fields.Date(string='Start Date')
- date_to_cmp = fields.Date(string='End Date')
+ date_from_cmp = fields.Date(string='Start Date Comparison')
+ date_to_cmp = fields.Date(string='End Date Comparison')
debit_credit = fields.Boolean(string='Display Debit/Credit Columns', help="This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison.")
def _build_comparison_context(self, data):
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 098b173157b..ea6aa9caae4 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -9,7 +9,7 @@ class AccountMoveLineReconcile(models.TransientModel):
_name = 'account.move.line.reconcile'
_description = 'Account move line reconcile'
- trans_nbr = fields.Integer(string='# of Transaction', readonly=True)
+ trans_nbr = fields.Integer(string='Transaction Count', readonly=True)
credit = fields.Float(string='Credit amount', readonly=True, digits=0)
debit = fields.Float(string='Debit amount', readonly=True, digits=0)
writeoff = fields.Float(string='Write-Off amount', readonly=True, digits=0)
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 540d7880f3f..0b577215f56 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -18,8 +18,8 @@ class AssetAssetReport(models.Model):
depreciation_value = fields.Float(string='Amount of Depreciation Lines', readonly=True)
installment_value = fields.Float(string='Amount of Installment Lines', readonly=True)
move_check = fields.Boolean(string='Posted', readonly=True)
- installment_nbr = fields.Integer(string='# of Installment Lines', readonly=True)
- depreciation_nbr = fields.Integer(string='# of Depreciation Lines', readonly=True)
+ installment_nbr = fields.Integer(string='Installment Count', readonly=True)
+ depreciation_nbr = fields.Integer(string='Depreciation Count', readonly=True)
gross_value = fields.Float(string='Gross Amount', readonly=True)
posted_value = fields.Float(string='Posted Amount', readonly=True)
unposted_value = fields.Float(string='Unposted Amount', readonly=True)
diff --git a/addons/anonymization/models/anonymization.py b/addons/anonymization/models/anonymization.py
index a0c90382938..3d82981a226 100644
--- a/addons/anonymization/models/anonymization.py
+++ b/addons/anonymization/models/anonymization.py
@@ -144,5 +144,5 @@ class IrModelFieldsAnonymizationMigrationFix(models.Model):
model_name = fields.Char('Model')
field_name = fields.Char('Field')
query = fields.Text()
- query_type = fields.Selection(selection=[('sql', 'sql'), ('python', 'python')], string='Query')
+ query_type = fields.Selection(selection=[('sql', 'sql'), ('python', 'python')], string='Query Type')
sequence = fields.Integer()
diff --git a/addons/base_address_city/models/res_partner.py b/addons/base_address_city/models/res_partner.py
index 27b08b5a2a3..dff5de888c7 100644
--- a/addons/base_address_city/models/res_partner.py
+++ b/addons/base_address_city/models/res_partner.py
@@ -9,7 +9,7 @@ class Partner(models.Model):
_inherit = 'res.partner'
country_enforce_cities = fields.Boolean(related='country_id.enforce_cities')
- city_id = fields.Many2one('res.city', string='City')
+ city_id = fields.Many2one('res.city', string='City of Address')
@api.onchange('city_id')
def _onchange_city_id(self):
@@ -29,7 +29,7 @@ class Partner(models.Model):
-
+
"""
city_id_node = etree.fromstring(replacement_xml)
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index 32946bf4a59..e925bac6a05 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -28,7 +28,7 @@ class ResConfigSettings(models.TransientModel):
help="Share your partners to all companies defined in your instance.\n"
" * Checked : Partners are visible for every companies, even if a company is defined on the partner.\n"
" * Unchecked : Each company can see only its partner (partners where company is defined). Partners not related to a company are visible for all companies.")
- default_custom_report_footer = fields.Boolean("Custom Report Footer")
+ default_custom_report_footer = fields.Boolean("Default Custom Report Footer")
report_footer = fields.Text(related="company_id.report_footer", string='Custom Report Footer', help="Footer text displayed at the bottom of all reports.")
group_multi_currency = fields.Boolean(string='Multi-Currencies',
implied_group='base.group_multi_currency',
diff --git a/addons/base_vat/models/res_partner.py b/addons/base_vat/models/res_partner.py
index 2d2b37c939b..778cf9c31d6 100644
--- a/addons/base_vat/models/res_partner.py
+++ b/addons/base_vat/models/res_partner.py
@@ -116,7 +116,7 @@ class ResPartner(models.Model):
vat = country_code + vat
return vat
- @api.constrains('vat', 'commercial_partner_country_id')
+ @api.constrains('vat')
def check_vat(self):
if self.env.context.get('company_id'):
company = self.env['res.company'].browse(self.env.context['company_id'])
diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index 97676349df9..0d32bd038c6 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -816,7 +816,7 @@ class Meeting(models.Model):
('-1', 'Last')
], string='By day')
final_date = fields.Date('Repeat Until')
- user_id = fields.Many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}, default=lambda self: self.env.user)
+ user_id = fields.Many2one('res.users', 'Owner', states={'done': [('readonly', True)]}, default=lambda self: self.env.user)
partner_id = fields.Many2one('res.partner', string='Responsible', related='user_id.partner_id', readonly=True)
active = fields.Boolean('Active', default=True, help="If the active field is set to false, it will allow you to hide the event alarm information without removing it.")
categ_ids = fields.Many2many('calendar.event.type', 'meeting_category_rel', 'event_id', 'type_id', 'Tags')
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index 932a8ec5bcd..18e0826af80 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -72,7 +72,7 @@ class Lead(models.Model):
team_id = fields.Many2one('crm.team', string='Sales Channel', oldname='section_id', default=lambda self: self.env['crm.team'].sudo()._get_default_team_id(user_id=self.env.uid),
index=True, track_visibility='onchange', help='When sending mails, the default email address is taken from the sales channel.')
kanban_state = fields.Selection([('grey', 'No next activity planned'), ('red', 'Next activity late'), ('green', 'Next activity is planned')],
- string='Activity State', compute='_compute_kanban_state')
+ string='Kanban State', compute='_compute_kanban_state')
email_cc = fields.Text('Global CC', help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma")
description = fields.Text('Notes')
create_date = fields.Datetime('Create Date', readonly=True)
diff --git a/addons/crm/models/crm_team.py b/addons/crm/models/crm_team.py
index cddad92eea1..d3efe7fc25b 100644
--- a/addons/crm/models/crm_team.py
+++ b/addons/crm/models/crm_team.py
@@ -23,7 +23,7 @@ class Team(models.Model):
string='Number of open opportunities', readonly=True)
opportunities_amount = fields.Integer(
compute='_compute_opportunities',
- string='Amount of quotations to invoice', readonly=True)
+ string='Opportunities Revenues', readonly=True)
dashboard_graph_model = fields.Selection(selection_add=[('crm.opportunity.report', 'Pipeline')])
dashboard_graph_period_pipeline = fields.Selection([
('week', 'Within a Week'),
@@ -37,7 +37,7 @@ class Team(models.Model):
('month', 'Expected Closing Month'),
('user', 'Salesperson'),
('stage', 'Stage'),
- ], string='Group by', default='day', help="How this channel's dashboard graph will group the results.")
+ ], string='Grouping Method', default='day', help="How this channel's dashboard graph will group the results.")
def _compute_unassigned_leads_count(self):
leads_data = self.env['crm.lead'].read_group([
diff --git a/addons/fetchmail/views/fetchmail_views.xml b/addons/fetchmail/views/fetchmail_views.xml
index 1112fbbb2c1..beb6b838c2d 100644
--- a/addons/fetchmail/views/fetchmail_views.xml
+++ b/addons/fetchmail/views/fetchmail_views.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py
index 508e5bfe836..da5d9fb69b1 100644
--- a/addons/fleet/models/fleet_vehicle.py
+++ b/addons/fleet/models/fleet_vehicle.py
@@ -27,9 +27,9 @@ class FleetVehicle(models.Model):
log_services = fields.One2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs')
log_contracts = fields.One2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts')
cost_count = fields.Integer(compute="_compute_count_all", string="Costs")
- contract_count = fields.Integer(compute="_compute_count_all", string='Contracts')
+ contract_count = fields.Integer(compute="_compute_count_all", string='Contract Count')
service_count = fields.Integer(compute="_compute_count_all", string='Services')
- fuel_logs_count = fields.Integer(compute="_compute_count_all", string='Fuel Logs')
+ fuel_logs_count = fields.Integer(compute="_compute_count_all", string='Fuel Log Count')
odometer_count = fields.Integer(compute="_compute_count_all", string='Odometer')
acquisition_date = fields.Date('Immatriculation Date', required=False, help='Date when the vehicle has been immatriculated')
color = fields.Char(help='Color of the vehicle')
diff --git a/addons/google_spreadsheet/models/res_config_settings.py b/addons/google_spreadsheet/models/res_config_settings.py
index 86649bae17d..ee47df724de 100644
--- a/addons/google_spreadsheet/models/res_config_settings.py
+++ b/addons/google_spreadsheet/models/res_config_settings.py
@@ -7,4 +7,4 @@ from odoo import fields, models
class ResConfigSettings(models.TransientModel):
_inherit = "res.config.settings"
- google_drive_uri_copy = fields.Char(related='google_drive_uri', string='URI', help="The URL to generate the authorization code from Google")
+ google_drive_uri_copy = fields.Char(related='google_drive_uri', string='URI Copy', help="The URL to generate the authorization code from Google")
diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index 7eab0eedf64..3f7eee536cf 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -25,7 +25,7 @@ class HrEmployee(models.Model):
attendance_ids = fields.One2many('hr.attendance', 'employee_id', help='list of attendances for the employee')
last_attendance_id = fields.Many2one('hr.attendance', compute='_compute_last_attendance_id', store=True)
- attendance_state = fields.Selection(string="Attendance", compute='_compute_attendance_state', selection=[('checked_out', "Checked out"), ('checked_in', "Checked in")])
+ attendance_state = fields.Selection(string="Attendance Status", compute='_compute_attendance_state', selection=[('checked_out', "Checked out"), ('checked_in', "Checked in")])
manual_attendance = fields.Boolean(string='Manual Attendance', compute='_compute_manual_attendance', inverse='_inverse_manual_attendance',
help='The employee will have access to the "My Attendances" menu to check in and out from his session')
diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py
index c58b5d2a917..59db788acdf 100644
--- a/addons/hr_contract/models/hr_contract.py
+++ b/addons/hr_contract/models/hr_contract.py
@@ -21,7 +21,7 @@ class Employee(models.Model):
string='Home-Work Dist.', help="In kilometers", groups="hr.group_hr_user")
contract_ids = fields.One2many('hr.contract', 'employee_id', string='Contracts')
contract_id = fields.Many2one('hr.contract', compute='_compute_contract_id', string='Current Contract', help='Latest contract of the employee')
- contracts_count = fields.Integer(compute='_compute_contracts_count', string='Contracts')
+ contracts_count = fields.Integer(compute='_compute_contracts_count', string='Contract Count')
def _compute_contract_id(self):
""" get the lastest contract """
diff --git a/addons/hr_expense_check/models/payment.py b/addons/hr_expense_check/models/payment.py
index d2609d63181..857ac4a030d 100644
--- a/addons/hr_expense_check/models/payment.py
+++ b/addons/hr_expense_check/models/payment.py
@@ -14,6 +14,7 @@ class HrExpenseRegisterPaymentWizard(models.TransientModel):
"you can manage the numbering in the journal configuration page.")
payment_method_code_2 = fields.Char(related='payment_method_id.code',
help="Technical field used to adapt the interface to the payment type selected.",
+ string="Payment Method Code 2",
readonly=True)
@api.onchange('journal_id')
diff --git a/addons/hr_payroll/models/hr_employee.py b/addons/hr_payroll/models/hr_employee.py
index 6d1283e7346..0d5a88d2ccd 100644
--- a/addons/hr_payroll/models/hr_employee.py
+++ b/addons/hr_payroll/models/hr_employee.py
@@ -9,7 +9,7 @@ class HrEmployee(models.Model):
_description = 'Employee'
slip_ids = fields.One2many('hr.payslip', 'employee_id', string='Payslips', readonly=True)
- payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslips', groups="hr_payroll.group_hr_payroll_user")
+ payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslip Count', groups="hr_payroll.group_hr_payroll_user")
@api.multi
def _compute_payslip_count(self):
diff --git a/addons/hr_recruitment/models/hr_job.py b/addons/hr_recruitment/models/hr_job.py
index a5c69d18226..7f1510c19c3 100644
--- a/addons/hr_recruitment/models/hr_job.py
+++ b/addons/hr_recruitment/models/hr_job.py
@@ -15,15 +15,15 @@ class Job(models.Model):
'res.partner', "Job Location", default=_default_address_id,
help="Address where employees are working")
application_ids = fields.One2many('hr.applicant', 'job_id', "Applications")
- application_count = fields.Integer(compute='_compute_application_count', string="Applications")
+ application_count = fields.Integer(compute='_compute_application_count', string="Application Count")
manager_id = fields.Many2one(
'hr.employee', related='department_id.manager_id', string="Department Manager",
readonly=True, store=True)
user_id = fields.Many2one('res.users', "Recruitment Responsible", track_visibility='onchange')
hr_responsible_id = fields.Many2one('res.users', "HR Responsible", track_visibility='onchange',
help="Person responsible of validating the employee's contracts.")
- document_ids = fields.One2many('ir.attachment', compute='_compute_document_ids', string="Applications")
- documents_count = fields.Integer(compute='_compute_document_ids', string="Documents")
+ document_ids = fields.One2many('ir.attachment', compute='_compute_document_ids', string="Documents")
+ documents_count = fields.Integer(compute='_compute_document_ids', string="Document Count")
alias_id = fields.Many2one(
'mail.alias', "Alias", ondelete="restrict", required=True,
help="Email alias for this job position. New emails will automatically create new applicants for this job position.")
diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
index 1b9835b1624..8665d2bdc46 100644
--- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
@@ -36,7 +36,7 @@ class HrContract(models.Model):
company_car_total_depreciated_cost = fields.Monetary()
public_transport_reimbursed_amount = fields.Monetary(string='Reimbursed amount',
compute='_compute_public_transport_reimbursed_amount', readonly=False, store=True)
- others_reimbursed_amount = fields.Monetary(string='Reimbursed amount')
+ others_reimbursed_amount = fields.Monetary(string='Other Reimbursed amount')
transport_employer_cost = fields.Monetary(compute='_compute_transport_employer_cost', string="Employer cost from employee transports")
warrants_cost = fields.Monetary(compute='_compute_warrants_cost')
diff --git a/addons/l10n_ch/models/account_invoice.py b/addons/l10n_ch/models/account_invoice.py
index 928e5887415..6b2b4d7fdf7 100644
--- a/addons/l10n_ch/models/account_invoice.py
+++ b/addons/l10n_ch/models/account_invoice.py
@@ -26,7 +26,7 @@ class AccountInvoice(models.Model):
l10n_ch_isr_valid = fields.Boolean(compute='_compute_l10n_ch_isr_valid', help='Boolean value. True iff all the data required to generate the ISR are present')
l10n_ch_isr_sent = fields.Boolean(defaut=False, help="Boolean value telling whether or not the ISR corresponding to this invoice has already been printed or sent by mail.")
- l10n_ch_currency_name = fields.Char(related='currency_id.name', help="The name of this invoice's currency") #This field is used in the "invisible" condition field of the 'Print ISR' button.
+ l10n_ch_currency_name = fields.Char(related='currency_id.name', string="Currency Name", help="The name of this invoice's currency") #This field is used in the "invisible" condition field of the 'Print ISR' button.
@api.depends('partner_bank_id.bank_id.l10n_ch_postal_eur', 'partner_bank_id.bank_id.l10n_ch_postal_chf')
def _compute_l10n_ch_isr_postal(self):
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 2f53fe3fe72..2670d8b25ac 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -70,7 +70,7 @@ class MailActivity(models.Model):
# owner
res_id = fields.Integer('Related Document ID', index=True, required=True)
res_model_id = fields.Many2one(
- 'ir.model', 'Related Document Model',
+ 'ir.model', 'Document Model',
index=True, ondelete='cascade', required=True)
res_model = fields.Char(
'Related Document Model',
@@ -299,13 +299,13 @@ class MailActivityMixin(models.AbstractModel):
activity_state = fields.Selection([
('overdue', 'Overdue'),
('today', 'Today'),
- ('planned', 'Planned')], string='State',
+ ('planned', 'Planned')], string='Activity State',
compute='_compute_activity_state',
groups="base.group_user",
help='Status based on activities\nOverdue: Due date is already passed\n'
'Today: Activity date is today\nPlanned: Future activities.')
activity_user_id = fields.Many2one(
- 'res.users', 'Responsible',
+ 'res.users', 'Responsible User',
related='activity_ids.user_id',
search='_search_activity_user_id',
groups="base.group_user")
diff --git a/addons/maintenance/models/maintenance.py b/addons/maintenance/models/maintenance.py
index c3109a2c45b..f17f7a0714e 100644
--- a/addons/maintenance/models/maintenance.py
+++ b/addons/maintenance/models/maintenance.py
@@ -37,7 +37,7 @@ class MaintenanceEquipmentCategory(models.Model):
equipment_ids = fields.One2many('maintenance.equipment', 'category_id', string='Equipments', copy=False)
equipment_count = fields.Integer(string="Equipment", compute='_compute_equipment_count')
maintenance_ids = fields.One2many('maintenance.request', 'category_id', copy=False)
- maintenance_count = fields.Integer(string="Maintenance", compute='_compute_maintenance_count')
+ maintenance_count = fields.Integer(string="Maintenance Count", compute='_compute_maintenance_count')
alias_id = fields.Many2one(
'mail.alias', 'Alias', ondelete='restrict', required=True,
help="Email alias for this equipment category. New emails will automatically "
@@ -137,7 +137,7 @@ class MaintenanceEquipment(models.Model):
color = fields.Integer('Color Index')
scrap_date = fields.Date('Scrap Date')
maintenance_ids = fields.One2many('maintenance.request', 'equipment_id')
- maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Maintenance", store=True)
+ maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Maintenance Count", store=True)
maintenance_open_count = fields.Integer(compute='_compute_maintenance_count', string="Current Maintenance", store=True)
period = fields.Integer('Days between each preventive maintenance')
next_action_date = fields.Date(compute='_compute_next_maintenance', string='Date of the next preventive maintenance', store=True)
@@ -275,7 +275,7 @@ class MaintenanceRequest(models.Model):
description = fields.Text('Description')
request_date = fields.Date('Request Date', track_visibility='onchange', default=fields.Date.context_today,
help="Date requested for the maintenance to happen")
- owner_user_id = fields.Many2one('res.users', string='Created by', default=lambda s: s.env.uid)
+ owner_user_id = fields.Many2one('res.users', string='Created by User', default=lambda s: s.env.uid)
category_id = fields.Many2one('maintenance.equipment.category', related='equipment_id.category_id', string='Category', store=True, readonly=True)
equipment_id = fields.Many2one('maintenance.equipment', string='Equipment', index=True)
technician_user_id = fields.Many2one('res.users', string='Owner', track_visibility='onchange', oldname='user_id')
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 8708dd9a098..8f28f6b5244 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -10,7 +10,7 @@ class MailComposeMessage(models.TransientModel):
mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign')
mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing', ondelete='cascade')
- mass_mailing_name = fields.Char(string='Mass Mailing')
+ mass_mailing_name = fields.Char(string='Mass Mailing Name')
mailing_list_ids = fields.Many2many('mail.mass_mailing.list', string='Mailing List')
@api.multi
diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py
index 431f65a2145..7a255dcc994 100644
--- a/addons/mrp/models/mrp_workcenter.py
+++ b/addons/mrp/models/mrp_workcenter.py
@@ -36,14 +36,14 @@ class MrpWorkcenter(models.Model):
workorder_count = fields.Integer('# Work Orders', compute='_compute_workorder_count')
workorder_ready_count = fields.Integer('# Read Work Orders', compute='_compute_workorder_count')
workorder_progress_count = fields.Integer('Total Running Orders', compute='_compute_workorder_count')
- workorder_pending_count = fields.Integer('Total Running Orders', compute='_compute_workorder_count')
+ workorder_pending_count = fields.Integer('Total Pending Orders', compute='_compute_workorder_count')
workorder_late_count = fields.Integer('Total Late Orders', compute='_compute_workorder_count')
time_ids = fields.One2many('mrp.workcenter.productivity', 'workcenter_id', 'Time Logs')
working_state = fields.Selection([
('normal', 'Normal'),
('blocked', 'Blocked'),
- ('done', 'In Progress')], 'Status', compute="_compute_working_state", store=True)
+ ('done', 'In Progress')], 'Workcenter Status', compute="_compute_working_state", store=True)
blocked_time = fields.Float(
'Blocked Time', compute='_compute_blocked_time',
help='Blocked hour(s) over the last month', digits=(16, 2))
diff --git a/addons/mrp/models/mrp_workorder.py b/addons/mrp/models/mrp_workorder.py
index 90980117b29..9a3f093a87d 100644
--- a/addons/mrp/models/mrp_workorder.py
+++ b/addons/mrp/models/mrp_workorder.py
@@ -113,7 +113,6 @@ class MrpWorkorder(models.Model):
final_lot_id = fields.Many2one(
'stock.production.lot', 'Lot/Serial Number', domain="[('product_id', '=', product_id)]",
states={'done': [('readonly', True)], 'cancel': [('readonly', True)]})
- tracking = fields.Selection(related='production_id.product_id.tracking')
time_ids = fields.One2many(
'mrp.workcenter.productivity', 'workorder_id')
is_user_working = fields.Boolean(
diff --git a/addons/mrp/models/res_config_settings.py b/addons/mrp/models/res_config_settings.py
index d7ae6ee4ee6..730252cb1e3 100644
--- a/addons/mrp/models/res_config_settings.py
+++ b/addons/mrp/models/res_config_settings.py
@@ -16,7 +16,7 @@ class ResConfigSettings(models.TransientModel):
module_mrp_workorder = fields.Boolean("Work Orders")
module_mrp_repair = fields.Boolean("Repair")
module_quality_control = fields.Boolean("Quality")
- group_mrp_routings = fields.Boolean("Work Orders",
+ group_mrp_routings = fields.Boolean("MRP Work Orders",
implied_group='mrp.group_mrp_routings')
@api.model
diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index 87256906259..2381b925e3b 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -17,7 +17,7 @@
-
+
Get warnings in orders for products or vendors
diff --git a/addons/rating/models/rating.py b/addons/rating/models/rating.py
index 67360ffd3d3..ca87b54793c 100644
--- a/addons/rating/models/rating.py
+++ b/addons/rating/models/rating.py
@@ -42,7 +42,7 @@ class Rating(models.Model):
parent_res_id = fields.Integer('Parent Document', index=True)
rated_partner_id = fields.Many2one('res.partner', string="Rated person", help="Owner of the rated resource")
partner_id = fields.Many2one('res.partner', string='Customer', help="Author of the rating")
- rating = fields.Float(string="Rating", group_operator="avg", default=0, help="Rating value: 0=Unhappy, 10=Happy")
+ rating = fields.Float(string="Rating Number", group_operator="avg", default=0, help="Rating value: 0=Unhappy, 10=Happy")
rating_image = fields.Binary('Image', compute='_compute_rating_image')
rating_text = fields.Selection([
('satisfied', 'Satisfied'),
diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index 06cbc88432f..9e5493354a1 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -16,19 +16,19 @@ class ResConfigSettings(models.TransientModel):
group_discount_per_so_line = fields.Boolean("Discounts", implied_group='sale.group_discount_per_so_line')
module_sale_margin = fields.Boolean("Margins")
group_sale_layout = fields.Boolean("Sections on Sales Orders", implied_group='sale.group_sale_layout')
- group_warning_sale = fields.Boolean("Warnings", implied_group='sale.group_warning_sale')
+ group_warning_sale = fields.Boolean("Sale Order Warnings", implied_group='sale.group_warning_sale')
portal_confirmation = fields.Boolean('Online Signature & Payment')
portal_confirmation_options = fields.Selection([
('sign', 'Signature'),
('pay', 'Payment')], string="Online Signature & Payment options")
- module_sale_payment = fields.Boolean("Online Signature & Payment", help='Technical field implied by user choice of online_confirmation')
+ module_sale_payment = fields.Boolean("Sale Payment", help='Technical field implied by user choice of online_confirmation')
module_website_quote = fields.Boolean("Quotations Templates")
group_sale_delivery_address = fields.Boolean("Customer Addresses", implied_group='sale.group_delivery_invoice_address')
multi_sales_price = fields.Boolean("Multiple Sales Prices per Product")
multi_sales_price_method = fields.Selection([
('percentage', 'Multiple prices per product (e.g. customer segments, currencies)'),
('formula', 'Prices computed from formulas (discounts, margins, roundings)')
- ], default='percentage', string="Pricelists")
+ ], default='percentage', string="Pricelists Method")
sale_pricelist_setting = fields.Selection([
('fixed', 'A single sales price per product'),
('percentage', 'Multiple prices per product (e.g. customer segments, currencies)'),
@@ -60,7 +60,7 @@ class ResConfigSettings(models.TransientModel):
domain="[('type', '=', 'service')]",
oldname='deposit_product_id_setting',
help='Default product used for payment advances')
- auto_done_setting = fields.Boolean("Lock Confirmed Orders")
+ auto_done_setting = fields.Boolean("Lock Confirmed Sales")
module_website_sale_digital = fields.Boolean("Sell digital products - provide downloadable content on your customer portal")
auth_signup_uninvited = fields.Selection([
diff --git a/addons/sale/models/res_partner.py b/addons/sale/models/res_partner.py
index acafadb8da6..c77bb965620 100644
--- a/addons/sale/models/res_partner.py
+++ b/addons/sale/models/res_partner.py
@@ -8,9 +8,9 @@ from odoo.addons.base.models.res_partner import WARNING_MESSAGE, WARNING_HELP
class ResPartner(models.Model):
_inherit = 'res.partner'
- sale_order_count = fields.Integer(compute='_compute_sale_order_count', string='# of Sales Order')
+ sale_order_count = fields.Integer(compute='_compute_sale_order_count', string='Sale Order Count')
sale_order_ids = fields.One2many('sale.order', 'partner_id', 'Sales Order')
- sale_warn = fields.Selection(WARNING_MESSAGE, 'Sales Order', default='no-message', help=WARNING_HELP)
+ sale_warn = fields.Selection(WARNING_MESSAGE, 'Sales Warnings', default='no-message', help=WARNING_HELP)
sale_warn_msg = fields.Text('Message for Sales Order')
def _compute_sale_order_count(self):
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 0647e383dcd..de2307e9140 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -142,7 +142,7 @@ class SaleOrder(models.Model):
order_line = fields.One2many('sale.order.line', 'order_id', string='Order Lines', states={'cancel': [('readonly', True)], 'done': [('readonly', True)]}, copy=True, auto_join=True)
- invoice_count = fields.Integer(string='# of Invoices', compute='_get_invoiced', readonly=True)
+ invoice_count = fields.Integer(string='Invoice Count', compute='_get_invoiced', readonly=True)
invoice_ids = fields.Many2many("account.invoice", string='Invoices', compute="_get_invoiced", readonly=True, copy=False)
invoice_status = fields.Selection([
('upselling', 'Upselling Opportunity'),
@@ -843,7 +843,7 @@ class SaleOrderLine(models.Model):
price_unit = fields.Float('Unit Price', required=True, digits=dp.get_precision('Product Price'), default=0.0)
price_subtotal = fields.Monetary(compute='_compute_amount', string='Subtotal', readonly=True, store=True)
- price_tax = fields.Float(compute='_compute_amount', string='Taxes', readonly=True, store=True)
+ price_tax = fields.Float(compute='_compute_amount', string='Total Tax', readonly=True, store=True)
price_total = fields.Monetary(compute='_compute_amount', string='Total', readonly=True, store=True)
price_reduce = fields.Float(compute='_get_price_reduce', string='Price Reduce', digits=dp.get_precision('Product Price'), readonly=True, store=True)
@@ -855,7 +855,7 @@ class SaleOrderLine(models.Model):
product_id = fields.Many2one('product.product', string='Product', domain=[('sale_ok', '=', True)], change_default=True, ondelete='restrict', required=True)
product_updatable = fields.Boolean(compute='_compute_product_updatable', string='Can Edit Product', readonly=True, default=True)
- product_uom_qty = fields.Float(string='Quantity', digits=dp.get_precision('Product Unit of Measure'), required=True, default=1.0)
+ product_uom_qty = fields.Float(string='Ordered Quantity', digits=dp.get_precision('Product Unit of Measure'), required=True, default=1.0)
product_uom = fields.Many2one('product.uom', string='Unit of Measure', required=True)
# Non-stored related field to allow portal user to see the image of the product he has ordered
product_image = fields.Binary('Product Image', related="product_id.image", store=False)
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 651c9cf5909..58e3909a720 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -219,7 +219,7 @@
-
+
Get warnings in orders for products or customers
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index c3b236b12ae..6a0fb56c42e 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -48,7 +48,7 @@ class SaleAdvancePaymentInv(models.TransientModel):
], string='What do you want to invoice?', default=_get_advance_payment_method, required=True)
product_id = fields.Many2one('product.product', string='Down Payment Product', domain=[('type', '=', 'service')],
default=_default_product_id)
- count = fields.Integer(default=_count, string='# of Orders')
+ count = fields.Integer(default=_count, string='Order Count')
amount = fields.Float('Down Payment Amount', digits=dp.get_precision('Account'), help="The amount to be invoiced in advance, taxes excluded.")
deposit_account_id = fields.Many2one("account.account", string="Income Account", domain=[('deprecated', '=', False)],
help="Account used for deposits", default=_default_deposit_account_id)
diff --git a/addons/sale_stock/models/res_config_settings.py b/addons/sale_stock/models/res_config_settings.py
index a6e006caec2..fba1d57e4f2 100644
--- a/addons/sale_stock/models/res_config_settings.py
+++ b/addons/sale_stock/models/res_config_settings.py
@@ -19,7 +19,7 @@ class ResConfigSettings(models.TransientModel):
default_picking_policy = fields.Selection([
('direct', 'Ship products as soon as available, with back orders'),
('one', 'Ship all products at once')
- ], "Shipping Management", default='direct', default_model="sale.order", required=True)
+ ], "Picking Policy", default='direct', default_model="sale.order", required=True)
@api.onchange('use_security_lead')
def _onchange_use_security_lead(self):
diff --git a/addons/sales_team/models/res_users.py b/addons/sales_team/models/res_users.py
index 325664abae6..d5e657f2ce5 100644
--- a/addons/sales_team/models/res_users.py
+++ b/addons/sales_team/models/res_users.py
@@ -8,7 +8,7 @@ class ResUsers(models.Model):
_inherit = 'res.users'
sale_team_id = fields.Many2one(
- 'crm.team', 'Sales Channel',
+ 'crm.team', 'Sales Team',
help='Sales Channel the user is member of. Used to compute the members of a sales channel through the inverse one2many')
@api.model
diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py
index 79adb8fb349..281b1bd8ea5 100644
--- a/addons/stock/models/res_config_settings.py
+++ b/addons/stock/models/res_config_settings.py
@@ -23,8 +23,8 @@ class ResConfigSettings(models.TransientModel):
group_stock_adv_location = fields.Boolean("Multi-Step Routes",
implied_group='stock.group_adv_location',
help="Add and customize route operations to process product moves in your warehouse(s): e.g. unload > quality control > stock for incoming products, pick > pack > ship for outgoing products. \n You can also set putaway strategies on warehouse locations in order to send incoming products into specific child locations straight away (e.g. specific bins, racks).")
- group_warning_stock = fields.Boolean("Warnings", implied_group='stock.group_warning_stock')
- propagation_minimum_delta = fields.Integer(related='company_id.propagation_minimum_delta', string="No Rescheduling Propagation")
+ group_warning_stock = fields.Boolean("Warnings for Stock", implied_group='stock.group_warning_stock')
+ propagation_minimum_delta = fields.Integer(related='company_id.propagation_minimum_delta', string="Minimum Delta for Propagation")
use_propagation_minimum_delta = fields.Boolean(
string="No Rescheduling Propagation",
oldname='default_new_propagation_minimum_delta',
diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py
index 0544501cb11..9a706eb342a 100644
--- a/addons/stock/models/stock_inventory.py
+++ b/addons/stock/models/stock_inventory.py
@@ -336,7 +336,7 @@ class InventoryLine(models.Model):
'Theoretical Quantity', compute='_compute_theoretical_qty',
digits=dp.get_precision('Product Unit of Measure'), readonly=True, store=True)
inventory_location_id = fields.Many2one(
- 'stock.location', 'Location', related='inventory_id.location_id', related_sudo=False)
+ 'stock.location', 'Inventory Location', related='inventory_id.location_id', related_sudo=False)
@api.one
@api.depends('location_id', 'product_id', 'package_id', 'product_uom_id', 'company_id', 'prod_lot_id', 'partner_id')
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 63aa5467458..77ca65baefd 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -52,7 +52,7 @@