diff --git a/sale_exceptions_ignore_approve/README.rst b/sale_exceptions_ignore_approve/README.rst index 5d5aff954..b88113630 100644 --- a/sale_exceptions_ignore_approve/README.rst +++ b/sale_exceptions_ignore_approve/README.rst @@ -1,5 +1,13 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html +.. |company| replace:: ADHOC SA + +.. |company_logo| image:: https://raw.githubusercontent.com/ingadhoc/maintainer-tools/master/resources/adhoc-logo.png + :alt: ADHOC SA + :target: https://www.adhoc.com.ar + +.. |icon| image:: https://raw.githubusercontent.com/ingadhoc/maintainer-tools/master/resources/adhoc-icon.png + +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl :alt: License: AGPL-3 ======================================= @@ -13,37 +21,26 @@ Installation To install this module, you need to: -#. Just install this module - +#. Only need to install the module Configuration ============= To configure this module, you need to: -#. No configuration needed - +#. Nothing to configure Usage ===== To use this module, you need to: -#. When Ignoring a sale Exception, approve directly the sale order - +#. When Ignoring a sale Exception, approve directly the sale order. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot :target: http://runbot.adhoc.com.ar/ -.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt -.. branch is "8.0" for example - -Known issues / Roadmap -====================== - -* ... - Bug Tracker =========== @@ -58,19 +55,16 @@ Credits Images ------ -* ADHOC SA: `Icon `_. +* |company| |icon| Contributors ------------ - Maintainer ---------- -.. image:: http://fotos.subefotos.com/83fed853c1e15a8023b86b2b22d6145bo.png - :alt: Odoo Community Association - :target: https://www.adhoc.com.ar +|company_logo| -This module is maintained by the ADHOC SA. +This module is maintained by the |company|. To contribute to this module, please visit https://www.adhoc.com.ar. diff --git a/sale_exceptions_ignore_approve/__init__.py b/sale_exceptions_ignore_approve/__init__.py index 9a79b5977..c72130af5 100644 --- a/sale_exceptions_ignore_approve/__init__.py +++ b/sale_exceptions_ignore_approve/__init__.py @@ -2,4 +2,4 @@ # For copyright and license notices, see __manifest__.py file in module root # directory ############################################################################## -from . import wizard +from . import wizards diff --git a/sale_exceptions_ignore_approve/__manifest__.py b/sale_exceptions_ignore_approve/__manifest__.py index 30d78d436..bf4824200 100644 --- a/sale_exceptions_ignore_approve/__manifest__.py +++ b/sale_exceptions_ignore_approve/__manifest__.py @@ -19,26 +19,25 @@ ############################################################################## { 'name': 'Sale Exceptions Ingore Approve Directly', - 'version': '9.0.1.1.0', - 'category': 'Product', + 'version': '11.0.1.0.0', + 'category': 'Sale', 'sequence': 14, 'author': 'ADHOC SA', 'website': 'www.adhoc.com.ar', 'license': 'AGPL-3', - 'summary': 'Allow to define purchase prices on different currencies using' - 'replenishment cost field', + 'summary': '', 'depends': [ 'sale_exception', ], 'external_dependencies': { }, 'data': [ - 'wizard/sale_exception_confirm_view.xml', - 'views/sale_view.xml', + 'wizards/sale_exception_confirm_views.xml', + 'views/sale_order_views.xml', ], 'demo': [ ], - 'installable': False, + 'installable': True, 'auto_install': False, 'application': False, } diff --git a/sale_exceptions_ignore_approve/views/sale_order_views.xml b/sale_exceptions_ignore_approve/views/sale_order_views.xml new file mode 100644 index 000000000..a0c472458 --- /dev/null +++ b/sale_exceptions_ignore_approve/views/sale_order_views.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/sale_exceptions_ignore_approve/views/sale_view.xml b/sale_exceptions_ignore_approve/views/sale_view.xml deleted file mode 100644 index 679d090ec..000000000 --- a/sale_exceptions_ignore_approve/views/sale_view.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/sale_exceptions_ignore_approve/wizard/sale_exception_confirm_view.xml b/sale_exceptions_ignore_approve/wizard/sale_exception_confirm_view.xml deleted file mode 100644 index 1a694780f..000000000 --- a/sale_exceptions_ignore_approve/wizard/sale_exception_confirm_view.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Sale Exceptions - sale.exception.confirm - - - - - - - diff --git a/sale_exceptions_ignore_approve/wizard/__init__.py b/sale_exceptions_ignore_approve/wizards/__init__.py similarity index 100% rename from sale_exceptions_ignore_approve/wizard/__init__.py rename to sale_exceptions_ignore_approve/wizards/__init__.py diff --git a/sale_exceptions_ignore_approve/wizard/sale_exception_confirm.py b/sale_exceptions_ignore_approve/wizards/sale_exception_confirm.py similarity index 87% rename from sale_exceptions_ignore_approve/wizard/sale_exception_confirm.py rename to sale_exceptions_ignore_approve/wizards/sale_exception_confirm.py index c6851cd06..3e0e803d8 100644 --- a/sale_exceptions_ignore_approve/wizard/sale_exception_confirm.py +++ b/sale_exceptions_ignore_approve/wizards/sale_exception_confirm.py @@ -6,12 +6,11 @@ class SaleExceptionConfirm(models.TransientModel): - _inherit = 'sale.exception.confirm' - @api.one + @api.multi def action_confirm(self): res = super(SaleExceptionConfirm, self).action_confirm() if self.ignore: - return self.sale_id.action_confirm() + return self.related_model_id.action_confirm() return res diff --git a/sale_exceptions_ignore_approve/wizards/sale_exception_confirm_views.xml b/sale_exceptions_ignore_approve/wizards/sale_exception_confirm_views.xml new file mode 100644 index 000000000..049d423f1 --- /dev/null +++ b/sale_exceptions_ignore_approve/wizards/sale_exception_confirm_views.xml @@ -0,0 +1,13 @@ + + + + Sale Exceptions Inherit + sale.exception.confirm + + + + + +