diff --git a/account_usability/__init__.py b/account_usability/__init__.py index f5d69b9..9b42961 100644 --- a/account_usability/__init__.py +++ b/account_usability/__init__.py @@ -1,4 +1,2 @@ -from . import account -#from . import account_invoice_report -from . import partner +from . import models from . import wizard diff --git a/account_usability/__manifest__.py b/account_usability/__manifest__.py index 9e81177..7a576d3 100644 --- a/account_usability/__manifest__.py +++ b/account_usability/__manifest__.py @@ -1,10 +1,10 @@ -# Copyright 2015-2019 Akretion (http://www.akretion.com) +# Copyright 2015-2020 Akretion (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Account Usability', - 'version': '12.0.1.0.0', + 'version': '14.0.1.0.0', 'category': 'Accounting & Finance', 'license': 'AGPL-3', 'summary': 'Small usability enhancements in account module', @@ -17,12 +17,18 @@ # in v12, I may create a module only for group_nobody ], 'data': [ - 'account_view.xml', - 'account_report.xml', - 'account_invoice_report_view.xml', - 'partner_view.xml', + 'views/account_account_type.xml', + 'views/account_account.xml', + 'views/account_bank_statement.xml', + 'views/account_invoice_report.xml', + 'views/account_journal.xml', + 'views/account_menu.xml', + 'views/account_tax.xml', + 'views/res_config_settings.xml', + 'views/res_partner.xml', + 'views/account_report.xml', 'wizard/account_invoice_mark_sent_view.xml', - 'report/invoice_report.xml', + 'security/ir.model.access.csv', ], - 'installable': False, + 'installable': True, } diff --git a/account_usability/account_invoice_report.py b/account_usability/account_invoice_report.py deleted file mode 100644 index 566ca5c..0000000 --- a/account_usability/account_invoice_report.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2018-2019 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import models, fields - - -class AccountInvoiceReport(models.Model): - _inherit = 'account.invoice.report' - - number = fields.Char(string="Number", readonly=True) - - def _sub_select(self): - select_str = super(AccountInvoiceReport, self)._sub_select() - select_str += ", ai.number" - return select_str - - def _select(self): - select_str = super(AccountInvoiceReport, self)._select() - select_str += ", sub.number" - return select_str - - def _group_by(self): - group_by_str = super(AccountInvoiceReport, self)._group_by() - group_by_str += ", ai.number" - return group_by_str diff --git a/account_usability/account_report.xml b/account_usability/account_report.xml deleted file mode 100644 index fc82136..0000000 --- a/account_usability/account_report.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - (object.type in ('out_invoice', 'out_refund')) and (object.state in ('open','in_payment','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf') - - - diff --git a/account_usability/account_view.xml b/account_usability/account_view.xml deleted file mode 100644 index e9ce5fc..0000000 --- a/account_usability/account_view.xml +++ /dev/null @@ -1,619 +0,0 @@ - - - - - - - - account_usability.supplier.invoice.form - account.invoice - - - - selection - - - selection - - -