diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2018-01-07 19:28:03 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2018-01-07 19:28:03 +0100 |
| commit | b341b5ca73dafa94a305f8be82a5dd5d9ed3fe1e (patch) | |
| tree | 1fa61c811d5b5b8de6ee58a26fbb6e7e03399123 /odoo/addons/base | |
| parent | 4ae5a3affa1d9ba61cec6e1a84e00db32ba26d39 (diff) | |
| parent | 564988f58db57209365767314e17df20a3c21422 (diff) | |
[IMP] Remove duplicate fields names
Diffstat (limited to 'odoo/addons/base')
| -rw-r--r-- | odoo/addons/base/models/ir_actions.py | 4 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_sequence.py | 4 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_ui_view.py | 4 | ||||
| -rw-r--r-- | odoo/addons/base/models/res_partner.py | 1 | ||||
| -rw-r--r-- | odoo/addons/base/views/ir_sequence_views.xml | 6 | ||||
| -rw-r--r-- | odoo/addons/base/views/ir_ui_view_views.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/base/wizard/base_module_uninstall_views.xml | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/odoo/addons/base/models/ir_actions.py b/odoo/addons/base/models/ir_actions.py index 776a098e453..dc5336fce12 100644 --- a/odoo/addons/base/models/ir_actions.py +++ b/odoo/addons/base/models/ir_actions.py @@ -173,7 +173,7 @@ class IrActionsActWindow(models.Model): help="View type: Tree type to use for the tree view, set to 'tree' for a hierarchical tree view, or 'form' for a regular list view") usage = fields.Char(string='Action Usage', help="Used to filter menu and home actions from the user form.") - view_ids = fields.One2many('ir.actions.act_window.view', 'act_window_id', string='Views') + view_ids = fields.One2many('ir.actions.act_window.view', 'act_window_id', string='No of Views') views = fields.Binary(compute='_compute_views', help="This function field computes the ordered list of views that should be enabled " \ "when displaying the result of an action, federating view mode, views and " \ @@ -358,7 +358,7 @@ class IrActionsServer(models.Model): "based on the sequence. Low number means high priority.") model_id = fields.Many2one('ir.model', string='Model', required=True, ondelete='cascade', help="Model on which the server action runs.") - model_name = fields.Char(related='model_id.model', readonly=True, store=True) + model_name = fields.Char(related='model_id.model', string='Model Name', readonly=True, store=True) # Python code code = fields.Text(string='Python Code', groups='base.group_system', default=DEFAULT_PYTHON_CODE, diff --git a/odoo/addons/base/models/ir_sequence.py b/odoo/addons/base/models/ir_sequence.py index 3f370f3fb4c..6a23b0e3f00 100644 --- a/odoo/addons/base/models/ir_sequence.py +++ b/odoo/addons/base/models/ir_sequence.py @@ -126,7 +126,7 @@ class IrSequence(models.Model): suffix = fields.Char(help="Suffix value of the record for the sequence", trim=False) number_next = fields.Integer(string='Next Number', required=True, default=1, help="Next number of this sequence") number_next_actual = fields.Integer(compute='_get_number_next_actual', inverse='_set_number_next_actual', - string='Next Number', + string='Actual Next Number', help="Next number that will be used. This number can be incremented " "frequently so the displayed value might already be obsolete") number_increment = fields.Integer(string='Step', required=True, default=1, @@ -340,7 +340,7 @@ class IrSequenceDateRange(models.Model): sequence_id = fields.Many2one("ir.sequence", string='Main Sequence', required=True, ondelete='cascade') number_next = fields.Integer(string='Next Number', required=True, default=1, help="Next number of this sequence") number_next_actual = fields.Integer(compute='_get_number_next_actual', inverse='_set_number_next_actual', - string='Next Number', + string='Actual Next Number', help="Next number that will be used. This number can be incremented " "frequently so the displayed value might already be obsolete") diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py index 70094f476d1..ee810c95fe1 100644 --- a/odoo/addons/base/models/ir_ui_view.py +++ b/odoo/addons/base/models/ir_ui_view.py @@ -195,7 +195,7 @@ class View(models.Model): ('search', 'Search'), ('qweb', 'QWeb')], string='View Type') arch = fields.Text(compute='_compute_arch', inverse='_inverse_arch', string='View Architecture', nodrop=True) - arch_base = fields.Text(compute='_compute_arch_base', inverse='_inverse_arch_base', string='View Architecture') + arch_base = fields.Text(compute='_compute_arch_base', inverse='_inverse_arch_base', string='Base View Architecture') arch_db = fields.Text(string='Arch Blob', translate=xml_translate, oldname='arch') arch_fs = fields.Char(string='Arch Filename') inherit_id = fields.Many2one('ir.ui.view', string='Inherited View', ondelete='restrict', index=True) @@ -207,7 +207,7 @@ class View(models.Model): help="ID of the view defined in xml file") groups_id = fields.Many2many('res.groups', 'ir_ui_view_group_rel', 'view_id', 'group_id', string='Groups', help="If this field is empty, the view applies to all users. Otherwise, the view applies to the users of those groups only.") - model_ids = fields.One2many('ir.model.data', 'res_id', domain=[('model', '=', 'ir.ui.view')], auto_join=True) + model_ids = fields.One2many('ir.model.data', 'res_id', string="Models", domain=[('model', '=', 'ir.ui.view')], auto_join=True) create_date = fields.Datetime(readonly=True) write_date = fields.Datetime(string='Last Modification Date', readonly=True) diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py index 996efde0721..67a9be62cf7 100644 --- a/odoo/addons/base/models/res_partner.py +++ b/odoo/addons/base/models/res_partner.py @@ -213,7 +213,6 @@ class Partner(models.Model): # technical field used for managing commercial fields commercial_partner_id = fields.Many2one('res.partner', compute='_compute_commercial_partner', string='Commercial Entity', store=True, index=True) - commercial_partner_country_id = fields.Many2one('res.country', related='commercial_partner_id.country_id', store=True) commercial_company_name = fields.Char('Company Name Entity', compute='_compute_commercial_company_name', store=True) company_name = fields.Char('Company Name') diff --git a/odoo/addons/base/views/ir_sequence_views.xml b/odoo/addons/base/views/ir_sequence_views.xml index 9bfaf30850c..d53570cc79a 100644 --- a/odoo/addons/base/views/ir_sequence_views.xml +++ b/odoo/addons/base/views/ir_sequence_views.xml @@ -28,14 +28,14 @@ <group> <field name="padding"/> <field name="number_increment"/> - <field name="number_next_actual" attrs="{'invisible': [('use_date_range', '=', True)]}"/> + <field name="number_next_actual" string="Next Number" attrs="{'invisible': [('use_date_range', '=', True)]}"/> </group> </group> <field name="date_range_ids" attrs="{'invisible': [('use_date_range', '=', False)]}"> <tree string="Sequences" editable="top"> <field name="date_from"/> <field name="date_to"/> - <field name="number_next_actual"/> + <field name="number_next_actual" string="Next Number"/> </tree> </field> <group col="3" string="Legend (for prefix, suffix)"> @@ -78,7 +78,7 @@ <field name="prefix"/> <field name="padding"/> <field name="company_id" groups="base.group_multi_company"/> - <field name="number_next_actual"/> + <field name="number_next_actual" string="Next Number"/> <field name="number_increment"/> <field name="implementation"/> </tree> diff --git a/odoo/addons/base/views/ir_ui_view_views.xml b/odoo/addons/base/views/ir_ui_view_views.xml index 58f3a70fd42..256b85cf918 100644 --- a/odoo/addons/base/views/ir_ui_view_views.xml +++ b/odoo/addons/base/views/ir_ui_view_views.xml @@ -26,7 +26,7 @@ <page string="Architecture"> <button type="object" name="open_translations" string="Edit Translations" class="oe_link oe_right"/> - <field name="arch_base" widget="ace" options="{'mode': 'xml'}"/> + <field name="arch_base" string="View Architecture" widget="ace" options="{'mode': 'xml'}"/> </page> <page string="Access Rights"> <field name="groups_id"/> diff --git a/odoo/addons/base/wizard/base_module_uninstall_views.xml b/odoo/addons/base/wizard/base_module_uninstall_views.xml index 43da6a2bcde..aa945029b00 100644 --- a/odoo/addons/base/wizard/base_module_uninstall_views.xml +++ b/odoo/addons/base/wizard/base_module_uninstall_views.xml @@ -34,7 +34,7 @@ </kanban> </field> <h3>The following documents will be permanently lost</h3> - <field name="model_ids"> + <field name="model_ids" string="Models"> <tree string="Models"> <field name="name" string="Document"/> <field name="count"/> |
