Merge 70a5466 into 3ff2d93

OCA · Aug 4, 2016 · 4cdd2b0 · 4cdd2b0
2 parents 3ff2d93 + 70a5466
commit 4cdd2b0
Show file tree

Hide file tree

Showing 16 changed files with 290 additions and 151 deletions.
diff --git a/sale_cancel_reason/README.rst b/sale_cancel_reason/README.rst
@@ -0,0 +1,76 @@
+.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg
+   :target: https://www.gnu.org/licenses/agpl.html
+   :alt: License: AGPL-3
+
+Sale Cancel Reason
+======================
+
+This module introduce the following features:
+
+* This module allows cancel sale order and reason must be given.
+
+* It is chosen from a configured list.
+
+Installation
+=============
+
+ No external library is used.
+
+Configuration
+=============
+
+* To configure this module, you need to:
+
+* You can configure cancel reason from Sale -> Configuration -> Sale Order Cancel Reason.
+
+Usage
+=====
+
+To use this module, you need to:
+
+ * Go to ...
+
+For further information, please visit:
+
+ * https://www.odoo.com/forum/help-1
+
+
+Known issues / Roadmap
+======================
+
+* ...
+
+
+Bug Tracker
+===========
+
+* Bugs are tracked on `GitHub Issues <https://github.com/OCA/sale-workflow/issues>`_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale-workflow%0Aversion:%209.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/sale-workflow/blob/9.0/sale_cancel_reason/static/description/icon.png>`_.
+
+Contributors
+------------
+
+* Camptocamp, Odoo Community Association (OCA)
+* Serpent Consulting Services Pvt. Ltd.
+
+
+Maintainer
+----------
+
+.. image:: http://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: http://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/sale_cancel_reason/__init__.py b/sale_cancel_reason/__init__.py
@@ -1,8 +1,9 @@
-# -*- coding: utf-8 -*-
+#  -*- coding: utf-8 -*-
 #
 #
 #    Author: Guewen Baconnier
 #    Copyright 2013 Camptocamp SA
+#    Copyright 2016 Serpent Consulting Services Pvt. Ltd.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,4 +21,4 @@
 #
 
 from . import wizard
-from . import model
+from . import models
diff --git a/sale_cancel_reason/__openerp__.py b/sale_cancel_reason/__openerp__.py
@@ -3,6 +3,7 @@
 #
 #    Author: Guewen Baconnier
 #    Copyright 2013 Camptocamp SA
+#    Copyright 2016 Serpent Consulting Services Pvt. Ltd.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,32 +20,24 @@
 #
 #
 
-{'name': 'Sale Cancel Reason',
- 'version': '8.0.1.1',
- 'author': "Camptocamp,Odoo Community Association (OCA)",
- 'category': 'Sale',
- 'license': 'AGPL-3',
- 'complexity': 'normal',
- 'images': [],
- 'website': "http://www.camptocamp.com",
- 'description': """
-Sale Cancel Reason
-==================
-
-When a sale order is canceled, a reason must be given,
-it is chosen from a configured list.
-
-""",
- 'depends': ['sale',
+{
+    'name': 'Sale Cancel Reason',
+    'version': '9.0.1.0.0',
+    'author': 'Camptocamp, Odoo Community Association (OCA), '
+            'Serpent Consulting Services Pvt. Ltd.',
+    'category': 'Sale',
+    'license': 'AGPL-3',
+    'complexity': 'normal',
+    'images': [],
+    'website': "http://www.camptocamp.com",
+    'depends': ['sale'],
+    'data': ['wizard/cancel_reason_view.xml',
+             'views/sale_view.xml',
+             'security/ir.model.access.csv',
+             'data/sale_order_cancel_reason.xml',
              ],
- 'demo': [],
- 'data': ['wizard/cancel_reason_view.xml',
-          'view/sale_view.xml',
-          'security/ir.model.access.csv',
-          'data/sale_order_cancel_reason.xml',
-          ],
- 'auto_install': False,
- 'test': ['test/sale_order_cancel.yml',
-          ],
- 'installable': False,
- }
+    'test': ['test/sale_order_cancel.yml'],
+    'installable': True,
+    'application': True,
+    'auto_install': False,
+}
diff --git a/sale_cancel_reason/data/sale_order_cancel_reason.xml b/sale_cancel_reason/data/sale_order_cancel_reason.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="cancel_reason_only_quotation" model="sale.order.cancel.reason">
-            <field name="name">Just for Quotation</field>
-        </record>
-        <record id="cancel_reason_no_service_needed" model="sale.order.cancel.reason">
-            <field name="name">Service no longer needed</field>
-        </record>
-        <record id="cancel_reason_other_provider" model="sale.order.cancel.reason">
-            <field name="name">Other Service Provider selected</field>
-        </record>
-    </data>
-</openerp>
+<data noupdate="1">
+    <record id="cancel_reason_only_quotation" model="sale.order.cancel.reason">
+        <field name="name">Just for Quotation</field>
+    </record>
+    <record id="cancel_reason_no_service_needed" model="sale.order.cancel.reason">
+        <field name="name">Service no longer needed</field>
+    </record>
+    <record id="cancel_reason_other_provider" model="sale.order.cancel.reason">
+        <field name="name">Other Service Provider selected</field>
+    </record>
+</data>
diff --git a/sale_cancel_reason/model/__init__.py → sale_cancel_reason/models/__init__.py b/sale_cancel_reason/model/__init__.py → sale_cancel_reason/models/__init__.py
@@ -3,6 +3,7 @@
 #
 #    Author: Guewen Baconnier
 #    Copyright 2013 Camptocamp SA
+#    Copyright 2016 Serpent Consulting Services Pvt. Ltd.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

diff --git a/sale_cancel_reason/model/sale.py → sale_cancel_reason/models/sale.py b/sale_cancel_reason/model/sale.py → sale_cancel_reason/models/sale.py
@@ -3,6 +3,7 @@
 #
 #    Author: Guewen Baconnier
 #    Copyright 2013 Camptocamp SA
+#    Copyright 2016 Serpent Consulting Services Pvt. Ltd.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -28,8 +29,7 @@ class SaleOrder(models.Model):
     cancel_reason_id = fields.Many2one(
         'sale.order.cancel.reason',
         string="Reason for cancellation",
-        readonly=True,
-        ondelete="restrict")
+        readonly=True)
 
 
 class SaleOrderCancelReason(models.Model):

diff --git a/sale_cancel_reason/static/description/1configuration.png b/sale_cancel_reason/static/description/1configuration.png
diff --git a/sale_cancel_reason/static/description/2sale_order.png b/sale_cancel_reason/static/description/2sale_order.png
diff --git a/sale_cancel_reason/static/description/3reason.png b/sale_cancel_reason/static/description/3reason.png
diff --git a/sale_cancel_reason/static/description/4cancel_reason_so.png b/sale_cancel_reason/static/description/4cancel_reason_so.png
diff --git a/sale_cancel_reason/static/description/index.html b/sale_cancel_reason/static/description/index.html
@@ -0,0 +1,75 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Sale Cancel Reason</h2>
+            <h3 class="oe_slogan">When a sale order is canceled, a reason must be given<h3/>
+            <h3 class="oe_slogan">It is chosen from a configured list</h3>
+            <div class="oe_span6">
+               <p class="oe_mt32">
+                    1) Sale Order Configuretion.
+                </p>
+            </div>
+            <div class="oe_span6">
+                <div class="oe_demo oe_picture oe_screenshot">
+                    <img src="1configuration.png" style="width:775px;height:400px;">
+                </div>
+            </div>
+            <div class="oe_span6">
+                <p class='oe_mt32'>
+                    You can configure cancel reason from Sale Order Cancel Reason.
+                </p>
+            </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <div class="oe_span6">
+            	<p class="oe_mt32">
+				2) Sale order cancel.
+				</p>
+        	</div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+				<img src="2sale_order.png" style="width:775px;height:400px;">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <div class="oe_span6">
+            	<p class="oe_mt32">
+				3) Pop-up cancellation reason.
+				</p>
+        	</div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+            	<img src="3reason.png" style="width:575px;height:200px;">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <div class="oe_span6">
+            	<p class="oe_mt32">
+				4)Show reason in sale order.
+				</p>
+        	</div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+				<img src="4cancel_reason_so.png" style="width:775px;height:400px;">
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/sale_cancel_reason/view/sale_view.xml b/sale_cancel_reason/view/sale_view.xml