[REL] Migration sale_exceptions_ignore_approve to 11.0 (#146)

* [FIX] Update Readme and manifest * [FIX] change the .xml view files * [FIX] the action_confirm method
ingadhoc · Aug 7, 2018 · d939132 · d939132
1 parent 5bcb78c
commit d939132
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 57 deletions.
diff --git 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 <http://fotos.subefotos.com/83fed853c1e15a8023b86b2b22d6145bo.png>`_.
+* |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
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<odoo>
+    <!-- disable main excpetion on tree view -->
+    <record id="sale_exception.view_order_tree" model="ir.ui.view">
+        <field name="active" eval="False"/>
+    </record>
+</odoo>
diff --git a/sale_exceptions_ignore_approve/views/sale_view.xml b/sale_exceptions_ignore_approve/views/sale_view.xml
diff --git a/sale_exceptions_ignore_approve/wizard/sale_exception_confirm_view.xml b/sale_exceptions_ignore_approve/wizard/sale_exception_confirm_view.xml
diff --git a/...eptions_ignore_approve/wizard/__init__.py → ...ptions_ignore_approve/wizards/__init__.py b/...eptions_ignore_approve/wizard/__init__.py → ...ptions_ignore_approve/wizards/__init__.py
diff --git a/..._approve/wizard/sale_exception_confirm.py → ...approve/wizards/sale_exception_confirm.py b/..._approve/wizard/sale_exception_confirm.py → ...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
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="view_sale_exception_confirm" model="ir.ui.view">
+        <field name="name">Sale Exceptions Inherit</field>
+        <field name="model">sale.exception.confirm</field>
+        <field name="inherit_id" ref="sale_exception.view_sale_exception_confirm"/>
+        <field name="arch" type="xml">
+            <button name="action_confirm" position="attributes">
+                <attribute name="string">Confirm</attribute>
+            </button>
+        </field>
+    </record>
+</odoo>