[11.0][MIG] sale_exception

OCA · Dec 5, 2017 · f06fd06 · f06fd06
1 parent 5b42371
commit f06fd06
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 25 deletions.
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
@@ -0,0 +1 @@
+server-tools
diff --git a/sale_exception/README.rst b/sale_exception/README.rst
@@ -9,7 +9,7 @@ Sale Exception
 This module allows you attach several customizable exceptions to your
 sale order in a way that you can filter orders by exceptions type and fix them.
 
-This is especially useful in an scenario for mass sales order import such as 
+This is especially useful in an scenario for mass sales order import such as
 with the base_sale_multi_channels module, because it's likely some orders have
 errors when you import them (like product not found in Odoo, wrong line
 format etc.)
@@ -44,6 +44,7 @@ Contributors
 * Sébastien BEAU <[email protected]>
 * Guewen Baconnier <[email protected]>
 * Yannick Vaucher <[email protected]>
+* Simone Orsi <[email protected]>
 * SodexisTeam <[email protected]>
 * Mourad EL HADJ MIMOUNE <[email protected]>
 

diff --git a/sale_exception/__init__.py b/sale_exception/__init__.py
@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
-# © 2011 Raphaël Valyi, Renato Lima, Guewen Baconnier, Sodexis
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from . import models, wizard
+from . import models
+from . import wizard
diff --git a/sale_exception/__openerp__.py → sale_exception/__manifest__.py b/sale_exception/__openerp__.py → sale_exception/__manifest__.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-# © 2011 Raphaël Valyi, Renato Lima, Guewen Baconnier, Sodexis
+# Copyright 2011 Akretion, Camptocamp, Sodexis
+# Copyright 2017 Akretion, Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {'name': 'Sale Exception',
  'summary': 'Custom exceptions on sale order',
- 'version': '10.0.2.0.0',
+ 'version': '11.0.1.0.0',
  'category': 'Generic Modules/Sale',
  'author': "Akretion, Sodexis, Camptocamp, Odoo Community Association (OCA)",
  'website': 'http://www.akretion.com',
@@ -15,6 +16,4 @@
      'wizard/sale_exception_confirm_view.xml',
      'views/sale_view.xml',
  ],
- 'images': [],
- 'installable': True,
  }
diff --git a/sale_exception/data/sale_exception_data.xml b/sale_exception/data/sale_exception_data.xml
@@ -4,18 +4,18 @@
 
         <record forcecreate="True" id="ir_cron_test_orders" model="ir.cron">
             <field name="name">Test Draft Orders</field>
-            <field eval="False" name="active"/>
+            <field name="active" eval="False"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
-            <field eval="'sale.order'" name="model"/>
-            <field eval="'test_all_draft_orders'" name="function"/>
-            <field eval="'()'" name="args"/>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="state">code</field>
+            <field name="code">model.test_all_draft_orders()</field>
         </record>
 
-        <record id ="excep_no_zip" model="exception.rule">
+        <record id="excep_no_zip" model="exception.rule">
             <field name="name">No ZIP code on destination</field>
             <field name="description">No ZIP code on destination</field>
             <field name="sequence">50</field>
@@ -26,7 +26,7 @@
             <field name="active" eval="False"/>
         </record>
 
-        <record id ="excep_no_stock" model="exception.rule">
+        <record id="excep_no_stock" model="exception.rule">
             <field name="name">Not Enough Virtual Stock</field>
             <field name="description">Not Enough Virtual Stock</field>
             <field name="sequence">50</field>

diff --git a/sale_exception/models/__init__.py b/sale_exception/models/__init__.py
@@ -1,5 +1,2 @@
 # -*- coding: utf-8 -*-
-# © 2011 Raphaël Valyi, Renato Lima, Guewen Baconnier, Sodexis
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
 from . import sale
diff --git a/sale_exception/models/sale.py b/sale_exception/models/sale.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# © 2011 Raphaël Valyi, Renato Lima, Guewen Baconnier, Sodexis
+# Copyright 2011 Akretion, Camptocamp, Sodexis
+# Copyright 2017 Akretion, Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import api, models, fields

diff --git a/sale_exception/tests/test_sale_exception.py b/sale_exception/tests/test_sale_exception.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# Copyright 2011 Akretion, Camptocamp, Sodexis
+# Copyright 2017 Akretion, Camptocamp
 
 from odoo.exceptions import ValidationError
 from odoo.addons.sale.tests.test_sale_order import TestSaleOrder

diff --git a/sale_exception/wizard/__init__.py b/sale_exception/wizard/__init__.py
@@ -1,5 +1,2 @@
 # -*- coding: utf-8 -*-
-# © 2011 Raphaël Valyi, Renato Lima, Guewen Baconnier, Sodexis
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
 from . import sale_exception_confirm
diff --git a/sale_exception/wizard/sale_exception_confirm.py b/sale_exception/wizard/sale_exception_confirm.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
-# © 2011 Raphaël Valyi, Renato Lima, Guewen Baconnier, Sodexis
-# © 2017 Mourad EL HADJ MIMOUNE, Akretion
+# Copyright 2011 Akretion, Camptocamp, Sodexis
+# Copyright 2017 Akretion, Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
 from odoo import api, fields, models