Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MIG] base_usability to v14

Browse Source
This commit is contained in:
Alexis de Lattre
2020-12-01 23:38:42 +01:00
parent 9592097487
commit f3782cfa2b
18 changed files with 135 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
base_usability/__manifest__.py
View File

@@ -1,10 +1,10 @@
# © 2014-2016 Akretion (http://www.akretion.com)
# Copyright 2014-2020 Akretion France (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
'name': 'Base Usability',
'version': '12.0.0.1.0',
'version': '14.0.1.0.0',
'category': 'Partner',
'license': 'AGPL-3',
'summary': 'Better usability in base module',
@@ -13,12 +13,11 @@
'depends': ['base'],
'data': [
'security/group.xml',
'views/partner_view.xml',
'views/partner_bank_view.xml',
'views/users_view.xml',
'views/country_view.xml',
'views/module_view.xml',
'views/base_view.xml',
'views/res_partner.xml',
'views/res_partner_bank.xml',
'views/res_country.xml',
'views/ir_module.xml',
'views/ir_sequence.xml',
],
'installable': False,
'installable': True,
}

12
base_usability/fix-odoo-base-multi-company-partners-not-shared.diff
View File

@@ -1,19 +1,19 @@
diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py
index 083607f9..99ae8857 100644
index a3baf47c615..e546d450107 100644
--- a/odoo/addons/base/models/res_users.py
+++ b/odoo/addons/base/models/res_users.py
@@ -426,7 +426,13 @@ class Users(models.Model):
@@ -544,7 +544,13 @@ class Users(models.Model):
for user in users:
user.partner_id.active = user.active
# if partner is global we keep it that way
if user.partner_id.company_id:
- user.partner_id.write({'company_id': user.company_id.id})
- user.partner_id.company_id = user.company_id
+ # AKRETION HACK: if you have a multi-company setup where
+ # partners are NOT shared between companies, having
+ # company_id=False on partners related to users
+ # avoids a lot of trouble (you should also disable 'read'
+ # on the ir.rule 'user rule' (XMLID base.res_users_rule)
+ # user.partner_id.write({'company_id': user.company_id.id})
+ # user.partner_id.company_id = user.company_id
+ user.partner_id.write({'company_id': False})
user.partner_id.active = user.active
return users
@api.multi

11
base_usability/models/__init__.py
View File

@@ -1,6 +1,7 @@
from . import users
from . import partner
from . import company
from . import mail
from . import misc
from . import res_users
from . import res_partner
from . import res_partner_bank
from . import res_partner_category
from . import res_company
from . import ir_mail_server
from . import ir_model

7
base_usability/models/mail.py → base_usability/models/ir_mail_server.py
View File

@@ -1,7 +1,8 @@
# © 2015-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2015-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, api
from odoo import api, models
from odoo.addons.base.models.ir_mail_server import extract_rfc2822_addresses
import logging
@@ -27,7 +28,7 @@ class IrMailServer(models.Model):
"with subject '%s'",
smtp_from, message.get('To'), message.get('Cc'),
message.get('Bcc'), message.get('Subject'))
return super(IrMailServer, self).send_email(
return super().send_email(
message, mail_server_id=mail_server_id,
smtp_server=smtp_server, smtp_port=smtp_port,
smtp_user=smtp_user, smtp_password=smtp_password,

19
base_usability/models/misc.py
View File

@@ -1,19 +0,0 @@
# © 2015-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, fields, api
from odoo.tools import misc
from odoo.tools import float_compare
class BaseLanguageExport(models.TransientModel):
_inherit = 'base.language.export'
# Default format for language files = format used by OpenERP modules
format = fields.Selection(default='po')
class BaseLanguageInstall(models.TransientModel):
_inherit = 'base.language.install'
overwrite = fields.Boolean(default=True)

7
base_usability/models/company.py → base_usability/models/res_company.py
View File

@@ -1,7 +1,8 @@
# © 2015-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2015-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, api, _
from odoo import api, models, _
class ResCompany(models.Model):
@@ -31,7 +32,6 @@ class ResCompany(models.Model):
line = separator.join(content)
return line
@api.multi
def _prepare_header_options(self):
self.ensure_one()
options = {
@@ -61,7 +61,6 @@ class ResCompany(models.Model):
return self.name
# for reports
@api.multi
def _display_report_header(
self, line_details=[['phone', 'website'], ['vat']],
icon=True, line_separator=' - '):

77
base_usability/models/partner.py → base_usability/models/res_partner.py
View File

@@ -1,4 +1,5 @@
# © 2015-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2015-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, fields, api, _
@@ -10,30 +11,27 @@ class ResPartner(models.Model):
# track_visibility is handled in the 'mail' module, and base_usability
# doesn't depend on 'mail', but that doesn't hurt, it will just be
# ignored if mail is not installed
name = fields.Char(track_visibility='onchange')
parent_id = fields.Many2one(track_visibility='onchange')
ref = fields.Char(track_visibility='onchange', copy=False)
lang = fields.Selection(track_visibility='onchange')
user_id = fields.Many2one(track_visibility='onchange')
vat = fields.Char(track_visibility='onchange')
customer = fields.Boolean(track_visibility='onchange')
supplier = fields.Boolean(track_visibility='onchange')
type = fields.Selection(track_visibility='onchange')
street = fields.Char(track_visibility='onchange')
street2 = fields.Char(track_visibility='onchange')
zip = fields.Char(track_visibility='onchange')
city = fields.Char(track_visibility='onchange')
state_id = fields.Many2one(track_visibility='onchange')
country_id = fields.Many2one(track_visibility='onchange')
email = fields.Char(track_visibility='onchange')
is_company = fields.Boolean(track_visibility='onchange')
active = fields.Boolean(track_visibility='onchange')
company_id = fields.Many2one(track_visibility='onchange')
# TODO move to mail module
# name = fields.Char(tracking=True)
# parent_id = fields.Many2one(tracking=True)
# ref = fields.Char(tracking=True)
# lang = fields.Selection(tracking=True)
# user_id = fields.Many2one(tracking=True)
# vat = fields.Char(tracking=True)
# street = fields.Char(tracking=True)
# street2 = fields.Char(tracking=True)
# zip = fields.Char(tracking=True)
# city = fields.Char(tracking=True)
# state_id = fields.Many2one(tracking=True)
# country_id = fields.Many2one(tracking=True)
# is_company = fields.Boolean(tracking=True)
# active = fields.Boolean(tracking=True)
# company_id = fields.Many2one(tracking=True)
ref = fields.Char(copy=False)
# For reports
name_title = fields.Char(
compute='_compute_name_title', string='Name with Title')
@api.multi
@api.depends('name', 'title')
def _compute_name_title(self):
for partner in self:
@@ -49,17 +47,14 @@ class ResPartner(models.Model):
name_title = ' '.join([title, name_title])
partner.name_title = name_title
@api.multi
def _display_address(self, without_company=False):
'''Remove empty lines'''
res = super(ResPartner, self)._display_address(
without_company=without_company)
res = super()._display_address(without_company=without_company)
while "\n\n" in res:
res = res.replace('\n\n', '\n')
return res
# for reports
@api.multi
def _display_full_address(
self, details=[
'company', 'name', 'address', 'phone',
@@ -72,10 +67,16 @@ class ResPartner(models.Model):
if self.is_company:
company = self.name
name = False
name_no_title = False
title = False
title_short = False
else:
name = self.name_title
company = self.parent_id and self.parent_id.is_company and\
self.parent_id.name or False
name = self.name_title
name_no_title = self.name
title = self.title.name
title_short = self.title.shortcut
options = {
'name': {
'value': name,
@@ -83,6 +84,15 @@ class ResPartner(models.Model):
'company': {
'value': company,
},
'title': {
'value': title,
},
'title_short': {
'value': title_short,
},
'name_no_title': {
'value': name_no_title,
},
'phone': {
'value': self.phone,
# http://www.fileformat.info/info/unicode/char/1f4de/index.htm
@@ -122,18 +132,3 @@ class ResPartner(models.Model):
res.append('%s' % entry['value'])
res = '\n'.join(res)
return res
class ResPartnerCategory(models.Model):
_inherit = 'res.partner.category'
name = fields.Char(translate=False)
class ResPartnerBank(models.Model):
_inherit = 'res.partner.bank'
# In the 'base' module, they didn't put any string, so the bank name is
# displayed as 'Name', which the string of the related field it
# points to
bank_name = fields.Char(string='Bank Name')

14
base_usability/models/res_partner_bank.py Normal file
View File

@@ -0,0 +1,14 @@
# Copyright 2015-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class ResPartnerBank(models.Model):
_inherit = 'res.partner.bank'
# In the 'base' module, they didn't put any string, so the bank name is
# displayed as 'Name', which the string of the related field it
# points to
bank_name = fields.Char(string='Bank Name')

11
base_usability/models/res_partner_category.py Normal file
View File

@@ -0,0 +1,11 @@
# Copyright 2015-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class ResPartnerCategory(models.Model):
_inherit = 'res.partner.category'
name = fields.Char(translate=False)

27
base_usability/models/res_users.py Normal file
View File

@@ -0,0 +1,27 @@
# Copyright 2018-2020 Akretion France (http://www.akretion.com/)
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, models, SUPERUSER_ID
import logging
logger = logging.getLogger(__name__)
class ResUsers(models.Model):
_inherit = 'res.users'
@api.model
def _script_partners_linked_to_users_no_company(self):
if self.env.user.id != SUPERUSER_ID:
self = self.sudo()
logger.info(
'START to set company_id=False on partners related to users')
users = self.with_context(active_test=False).search([])
for user in users:
if user.partner_id.company_id:
user.partner_id.write({'company_id': False})
logger.info(
'Wrote company_id=False on user %s ID %d',
user.login, user.id)
logger.info(
'END setting company_id=False on partners related to users')

40
base_usability/models/users.py
View File

@@ -1,40 +0,0 @@
# Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, api, SUPERUSER_ID, _
from odoo.exceptions import UserError
import logging
logger = logging.getLogger(__name__)
class ResUsers(models.Model):
_inherit = 'res.users'
@api.model
def default_get(self, fields_list):
res = super(ResUsers, self).default_get(fields_list)
# For a new partner auto-created when you create a new user, we prefer
# customer=False and supplier=True by default
res.update({
'customer': False,
'supplier': True,
})
return res
@api.model
def _script_partners_linked_to_users_no_company(self):
if self.env.user.id != SUPERUSER_ID:
raise UserError(_('You must run this script as admin user'))
logger.info(
'START to set company_id=False on partners related to users')
users = self.search(
['|', ('active', '=', True), ('active', '=', False)])
for user in users:
if user.partner_id.company_id:
user.partner_id.company_id = False
logger.info(
'Wrote company_id=False on user %s ID %d',
user.login, user.id)
logger.info(
'END setting company_id=False on partners related to users')
return True

3
base_usability/security/group.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
© 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
Copyright 2016-2020 Akretion France (http://www.akretion.com/)
@author: Alexis de Lattre <alexis.delattre@akretion.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->

15
base_usability/views/module_view.xml → base_usability/views/ir_module.xml
View File

@@ -1,22 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2015-2019 Akretion France (http://www.akretion.com/)
Copyright 2015-2020 Akretion France (http://www.akretion.com/)
@author: Alexis de Lattre <alexis.delattre@akretion.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="module_view_kanban" model="ir.ui.view">
<field name="name">Better display of module technical name</field>
<field name="model">ir.module.module</field>
<field name="inherit_id" ref="base.module_view_kanban"/>
<field name="arch" type="xml">
<xpath expr="//h4[hasclass('o_kanban_record_title')]/code[@groups='base.group_no_one']" position="before">
<br/>
</xpath>
</field>
</record>
<record id="view_module_filter" model="ir.ui.view">
<field name="model">ir.module.module</field>
@@ -25,9 +15,6 @@
<xpath expr="//filter[@name='extra']" position="after">
<filter name="installable" string="Installable" domain="[('state', '!=', 'uninstallable')]"/>
</xpath>
<group expand="0" position="inside">
<filter name="state_groupby" string="State" context="{'group_by': 'state'}"/>
</group>
</field>
</record>

10
base_usability/views/base_view.xml → base_usability/views/ir_sequence.xml
View File

@@ -2,16 +2,6 @@
<odoo>
<record id="ir_cron_view_tree" model="ir.ui.view">
<field name="model">ir.cron</field>
<field name="inherit_id" ref="base.ir_cron_view_tree"/>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="model_id"/>
</field>
</field>
</record>
<record id="view_sequence_search" model="ir.ui.view">
<field name="model">ir.sequence</field>
<field name="inherit_id" ref="base.view_sequence_search"/>

17
base_usability/views/country_view.xml → base_usability/views/res_country.xml
View File

@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
© 2015-2016 Akretion (http://www.akretion.com/)
Copyright 2015-2020 Akretion France (http://www.akretion.com/)
@author: Alexis de Lattre <alexis.delattre@akretion.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="res_country_state_search" model="ir.ui.view">
<record id="view_country_state_search" model="ir.ui.view">
<field name="name">base_usability.res.country.state.search</field>
<field name="model">res.country.state</field>
<field name="inherit_id" ref="base.view_country_state_search"/>
<field name="arch" type="xml">
<search string="Search States">
<field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', '=', self)]" string="Name or Code"/>
<field name="name" position="attributes">
<attribute name="filter_domain">['|', ('name', 'ilike', self), ('code', '=', self)]</attribute>
</field>
<field name="name" position="after">
<field name="code"/>
<field name="country_id"/>
<group string="Group By" name="groupby">
<filter name="country_groupby" string="Country" context="{'group_by': 'country_id'}"/>
</group>
</search>
</field>
</field>
</record>

13
base_usability/views/partner_view.xml → base_usability/views/res_partner.xml
View File

@@ -12,9 +12,6 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='child_ids']/form//field[@name='email']" position="attributes">
<attribute name="widget">email</attribute>
</xpath>
<!-- Show title not only on Contacts -->
<xpath expr="//field[@name='child_ids']/form//field[@name='title']" position="attributes">
<attribute name="attrs"></attribute>
@@ -38,11 +35,8 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_tree"/>
<field name="arch" type="xml">
<field name="country_id" position="attributes">
<attribute name="invisible">0</attribute>
</field>
<field name="country_id" position="before">
<field name="city"/>
<field name="phone" position="after">
<field name="mobile" optional="show" widget="phone" class="o_force_ltr"/>
</field>
</field>
</record>
@@ -57,9 +51,6 @@
<!-- for 'ref', change '=' to 'start with' -->
<attribute name="filter_domain">['|','|',('display_name','ilike',self),('ref','=ilike',self + '%'),('email','ilike',self)]</attribute>
</field>
<filter name="inactive" position="before">
<separator/>
</filter>
</field>
</record>

13
base_usability/views/partner_bank_view.xml → base_usability/views/res_partner_bank.xml
View File

@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Akretion (http://www.akretion.com/)
Copyright 2018-2020 Akretion (http://www.akretion.com/)
@author: Alexis de Lattre <alexis.delattre@akretion.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="view_partner_bank_tree" model="ir.ui.view">
<field name="name">base_usability.res.partner.bank.tree</field>
<field name="model">res.partner.bank</field>
<field name="inherit_id" ref="base.view_partner_bank_tree"/>
<field name="arch" type="xml">
<field name="sequence" position="attributes">
<attribute name="invisible">0</attribute>
<attribute name="widget">handle</attribute>
<field name="bank_name" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="bank_name" position="after">
<field name="bank_id"/>
</field>
</field>
</record>
</odoo>

21
base_usability/views/users_view.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Akretion (http://www.akretion.com/)
@author: Alexis de Lattre <alexis.delattre@akretion.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="view_users_tree" model="ir.ui.view">
<field name="name">base_usability.res.users.tree</field>
<field name="model">res.users</field>
<field name="inherit_id" ref="base.view_users_tree"/>
<field name="arch" type="xml">
<field name="login_date" position="after">
<field name="company_id" groups="base.group_multi_company"/>
</field>
</field>
</record>
</odoo>